From 00df29e0993759b33ee613fa1ab2205bb691e614 Mon Sep 17 00:00:00 2001
From: Vincent <vigromfe@microsoft.com>
Date: Tue, 24 Mar 2020 17:40:29 +0100
Subject: [PATCH 001/595] removed bindable attribute

---
 Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs   | 1 -
 .../Converters/DoubleToVisibilityConverter.cs                    | 1 -
 Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs       | 1 -
 Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs           | 1 -
 4 files changed, 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
index cadeeae4043..0c8e82a9029 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
@@ -15,7 +15,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// Otherwise the logic looks for the value to be GreaterThan or LessThan the specified value.
     /// The ConverterParameter can be used to invert the logic.
     /// </summary>
-    [Bindable]
     public class DoubleToObjectConverter : DependencyObject, IValueConverter
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToVisibilityConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToVisibilityConverter.cs
index 9a88789b784..faabec3f372 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToVisibilityConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToVisibilityConverter.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// <summary>
     /// This class converts a double value into a Visibility enumeration.
     /// </summary>
-    [Bindable]
     public class DoubleToVisibilityConverter : DoubleToObjectConverter
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs
index cb1831ea4ab..3c30a52d843 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs
@@ -16,7 +16,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
     /// Custom <see cref="MarkupExtension"/> which can provide nullable bool values.
     /// See https://wpdev.uservoice.com/forums/110705-universal-windows-platform/suggestions/17767198-nullable-dependency-properties.
     /// </summary>
-    [Bindable]
     [MarkupExtensionReturnType(ReturnType = typeof(bool?))]
     public class NullableBool : MarkupExtension
     {
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs
index 21fdf480344..3f2e9578816 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs
@@ -19,7 +19,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions.Markup
     ///                xmlns:helpers="using:Microsoft.Toolkit.Uwp.UI.Extensions.Markup" />
     /// </code>
     /// </example>
-    [Bindable]
     public class OnDevice : MarkupExtension
     {
         /// <summary>

From 834995db9519f39b6b073e76823148fc1855de68 Mon Sep 17 00:00:00 2001
From: Vincent <vigromfe@microsoft.com>
Date: Tue, 24 Mar 2020 17:50:48 +0100
Subject: [PATCH 002/595] removed remaining bindable attributes

---
 Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs   | 1 -
 UnitTests/Extensions/Helpers/ObjectWithNullableBoolProperty.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
index cdc7bc9a4b9..306e3159fe3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
@@ -17,7 +17,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// The UniformGrid control presents information within a Grid with even spacing.
     /// </summary>
-    [Bindable]
     public partial class UniformGrid : Grid
     {
         // Guard for 15063 as Grid Spacing only works on 16299+.
diff --git a/UnitTests/Extensions/Helpers/ObjectWithNullableBoolProperty.cs b/UnitTests/Extensions/Helpers/ObjectWithNullableBoolProperty.cs
index 47911801ea8..30c26cefb37 100644
--- a/UnitTests/Extensions/Helpers/ObjectWithNullableBoolProperty.cs
+++ b/UnitTests/Extensions/Helpers/ObjectWithNullableBoolProperty.cs
@@ -7,7 +7,6 @@
 
 namespace UnitTests.Extensions.Helpers
 {
-    [Bindable]
     public class ObjectWithNullableBoolProperty : DependencyObject
     {
         public bool? NullableBool

From 6cd8bcee4448c10c9c65574b4def9ba11e95775f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 16:34:50 +0200
Subject: [PATCH 003/595] Added IoC class

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 164 +++++++++++++++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 Microsoft.Toolkit/Helpers/Ioc.cs

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
new file mode 100644
index 00000000000..2023ea7c4c9
--- /dev/null
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+
+#nullable enable
+
+namespace Microsoft.Toolkit
+{
+    /// <summary>
+    /// An Inversion of Control container that can be used to register and access instances of types providing services.
+    /// It is focused on performance, and offers the ability to register service providers either through eagerly
+    /// produced instances, or by using the factory pattern. Accessing services is also thread-safe.
+    /// In order to use this helper, first define a service and a service provider, like so:
+    /// <code>
+    /// public interface ILogger
+    /// {
+    ///     void Log(string text);
+    /// }
+    ///
+    /// public class ConsoleLogger : ILogger
+    /// {
+    ///     void Log(string text) => Console.WriteLine(text);
+    /// }
+    /// </code>
+    /// Then, register your services at startup, or at some time before using them:
+    /// <code>
+    /// IoC.Register&lt;ILogger, ConsoleLogger>();
+    /// </code>
+    /// Finally, use the <see cref="Ioc"/> type to retrieve service instances to use:
+    /// <code>
+    /// IoC.Resolve&lt;ILogger>().Log("Hello world!");
+    /// </code>
+    /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
+    /// throw an exception in case the requested service has not been registered yet.
+    /// </summary>
+    public static class Ioc
+    {
+        /// <summary>
+        /// Internal container type for services of type <typeparamref name="T"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of services to store in this type.</typeparam>
+        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Public fields for performance reasons")]
+        private static class Container<T>
+            where T : class
+        {
+            /// <summary>
+            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Lazy"/> and <see cref="Instance"/> fields.
+            /// </summary>
+            public static readonly object Lock = new object();
+
+            /// <summary>
+            /// The optional <see cref="Lazy{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
+            /// </summary>
+            public static Lazy<T>? Lazy;
+
+            /// <summary>
+            /// The current <typeparamref name="T"/> instance being produced, if available.
+            /// </summary>
+            public static T? Instance;
+        }
+
+        /// <summary>
+        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
+        /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
+        public static void Register<TService, TProvider>()
+            where TService : class
+            where TProvider : class, TService, new()
+        {
+            Register<TService, TProvider>(new TProvider());
+        }
+
+        /// <summary>
+        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
+        /// <param name="provider">The <typeparamref name="TProvider"/> instance to register.</param>
+        public static void Register<TService, TProvider>(TProvider provider)
+            where TService : class
+            where TProvider : class, TService
+        {
+            Container<TService>.Instance = provider;
+        }
+
+        /// <summary>
+        /// Registers a service <typeparamref name="TService"/> through a <see cref="Func{TResult}"/> factory.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> contract to use.</param>
+        public static void Register<TService>(Func<TService> factory)
+            where TService : class
+        {
+            Container<TService>.Lazy = new Lazy<TService>(factory);
+        }
+
+        /// <summary>
+        /// Registers a service <typeparamref name="TService"/> through a <see cref="Lazy{T}"/> instance.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <param name="lazy">The <see cref="Lazy{T}"/> instance used to create instances implementing the <typeparamref name="TService"/> contract.</param>
+        public static void Register<TService>(Lazy<TService> lazy)
+            where TService : class
+        {
+            Container<TService>.Lazy = lazy;
+        }
+
+        /// <summary>
+        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> contract.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static TService Resolve<TService>()
+            where TService : class
+        {
+            TService? service = Container<TService>.Instance;
+
+            if (service is null)
+            {
+                return ResolveOrThrow<TService>();
+            }
+
+            return service;
+        }
+
+        /// <summary>
+        /// Tries to resolve a <typeparamref name="TService"/> instance with additional checks.
+        /// This method implements the slow path for <see cref="Resolve{TService}"/>, locking
+        /// to ensure thread-safety and invoking the available factory, if possible.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static TService ResolveOrThrow<TService>()
+            where TService : class
+        {
+            lock (Container<TService>.Lock)
+            {
+                TService? service = Container<TService>.Instance;
+
+                // Check the instance field again for race conditions
+                if (!(service is null))
+                {
+                    return service;
+                }
+
+                Lazy<TService>? lazy = Container<TService>.Lazy;
+
+                // If no factory is available, the service hasn't been registered yet
+                if (lazy is null)
+                {
+                    throw new InvalidOperationException($"Service {typeof(TService)} not initialized");
+                }
+
+                return Container<TService>.Instance = lazy.Value;
+            }
+        }
+    }
+}

From 8c25f0c22504c9be5bd1e292bee695bfdadb257d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 16:54:33 +0200
Subject: [PATCH 004/595] Improved IoC thread-safety

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 2023ea7c4c9..a8a5a996c44 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit
     /// <summary>
     /// An Inversion of Control container that can be used to register and access instances of types providing services.
     /// It is focused on performance, and offers the ability to register service providers either through eagerly
-    /// produced instances, or by using the factory pattern. Accessing services is also thread-safe.
+    /// produced instances, or by using the factory pattern. The type is also fully thread-safe.
     /// In order to use this helper, first define a service and a service provider, like so:
     /// <code>
     /// public interface ILogger
@@ -83,7 +83,10 @@ public static void Register<TService, TProvider>(TProvider provider)
             where TService : class
             where TProvider : class, TService
         {
-            Container<TService>.Instance = provider;
+            lock (Container<TService>.Lock)
+            {
+                Container<TService>.Instance = provider;
+            }
         }
 
         /// <summary>
@@ -94,7 +97,7 @@ public static void Register<TService, TProvider>(TProvider provider)
         public static void Register<TService>(Func<TService> factory)
             where TService : class
         {
-            Container<TService>.Lazy = new Lazy<TService>(factory);
+            Register(new Lazy<TService>(factory));
         }
 
         /// <summary>
@@ -105,7 +108,10 @@ public static void Register<TService>(Func<TService> factory)
         public static void Register<TService>(Lazy<TService> lazy)
             where TService : class
         {
-            Container<TService>.Lazy = lazy;
+            lock (Container<TService>.Lock)
+            {
+                Container<TService>.Lazy = lazy;
+            }
         }
 
         /// <summary>

From 2c349636eed25247dff38c6af6fe043af47a9489 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 16:56:28 +0200
Subject: [PATCH 005/595] Minor code refactoring

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index a8a5a996c44..90b405fcbd2 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -70,18 +70,16 @@ public static void Register<TService, TProvider>()
             where TService : class
             where TProvider : class, TService, new()
         {
-            Register<TService, TProvider>(new TProvider());
+            Register<TService>(new TProvider());
         }
 
         /// <summary>
-        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
+        /// Registers a singleton instance of service <typeparamref name="TService"/>.
         /// </summary>
         /// <typeparam name="TService">The type of contract to register.</typeparam>
-        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
-        /// <param name="provider">The <typeparamref name="TProvider"/> instance to register.</param>
-        public static void Register<TService, TProvider>(TProvider provider)
+        /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
+        public static void Register<TService>(TService provider)
             where TService : class
-            where TProvider : class, TService
         {
             lock (Container<TService>.Lock)
             {

From 1a72762e35734ef48448e8f018506a067c63d7b2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 17:01:03 +0200
Subject: [PATCH 006/595] Added IoC.IsRegistered<TService>() API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 90b405fcbd2..ad65724be52 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -60,6 +60,29 @@ private static class Container<T>
             public static T? Instance;
         }
 
+        /// <summary>
+        /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
+        /// </summary>
+        /// <typeparam name="TService">The type of contract to check for registration.</typeparam>
+        /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
+        [Pure]
+        public static bool IsRegistered<TService>()
+            where TService : class
+        {
+            if (!(Container<TService>.Instance is null) ||
+                !(Container<TService>.Lazy is null))
+            {
+                return true;
+            }
+
+            lock (Container<TService>.Lock)
+            {
+                return
+                    !(Container<TService>.Instance is null) ||
+                    !(Container<TService>.Lazy is null);
+            }
+        }
+
         /// <summary>
         /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
         /// </summary>

From 52a79f23f849af708eaa55e47c573ef59f66a803 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 17:26:48 +0200
Subject: [PATCH 007/595] Minor bug fixes

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

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index ad65724be52..78a090b0097 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -106,6 +106,7 @@ public static void Register<TService>(TService provider)
         {
             lock (Container<TService>.Lock)
             {
+                Container<TService>.Lazy = null;
                 Container<TService>.Instance = provider;
             }
         }
@@ -132,6 +133,7 @@ public static void Register<TService>(Lazy<TService> lazy)
             lock (Container<TService>.Lock)
             {
                 Container<TService>.Lazy = lazy;
+                Container<TService>.Instance = null;
             }
         }
 

From 9dcca03451649da831a7840a4e308aa8e5f87058 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 17:45:33 +0200
Subject: [PATCH 008/595] Added Ioc.GetAllRegisteredServices() API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 78a090b0097..b5df91f5059 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Runtime.CompilerServices;
 
 #nullable enable
@@ -36,6 +38,17 @@ namespace Microsoft.Toolkit
     /// </summary>
     public static class Ioc
     {
+        /// <summary>
+        /// The collection of currently registered service types.
+        /// </summary>
+        /// <remarks>
+        /// This list is not used when retrieving registered instances through
+        /// the <see cref="Resolve{TService}"/> method, so it has no impact on
+        /// performances there. This is only used to allow users to retrieve all
+        /// the registered instances at any given time, or to unregister them all.
+        /// </remarks>
+        private static readonly HashSet<Type> RegisteredTypes = new HashSet<Type>();
+
         /// <summary>
         /// Internal container type for services of type <typeparamref name="T"/>.
         /// </summary>
@@ -104,8 +117,11 @@ public static void Register<TService, TProvider>()
         public static void Register<TService>(TService provider)
             where TService : class
         {
+            lock (RegisteredTypes)
             lock (Container<TService>.Lock)
             {
+                RegisteredTypes.Add(typeof(TService));
+
                 Container<TService>.Lazy = null;
                 Container<TService>.Instance = provider;
             }
@@ -130,13 +146,37 @@ public static void Register<TService>(Func<TService> factory)
         public static void Register<TService>(Lazy<TService> lazy)
             where TService : class
         {
+            lock (RegisteredTypes)
             lock (Container<TService>.Lock)
             {
+                RegisteredTypes.Add(typeof(TService));
+
                 Container<TService>.Lazy = lazy;
                 Container<TService>.Instance = null;
             }
         }
 
+        /// <summary>
+        /// Gets all the currently registered services.
+        /// </summary>
+        /// <returns>A collection of all the currently registered services.</returns>
+        /// <remarks>
+        /// This will also cause the <see cref="Ioc"/> service to resolve instances of
+        /// registered services that were setup to use lazy initialization.
+        /// </remarks>
+        [Pure]
+        public static IReadOnlyCollection<object> GetAllRegisteredServices()
+        {
+            lock (RegisteredTypes)
+            {
+                return (
+                    from Type serviceType in RegisteredTypes
+                    let resolver = typeof(Ioc).GetMethod(nameof(Resolve))
+                    let service = resolver.Invoke(null, null)
+                    select service).ToArray();
+            }
+        }
+
         /// <summary>
         /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> contract.
         /// </summary>

From bfb8ccb9b082c9154a4646b982a146a615230b4e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 17:45:53 +0200
Subject: [PATCH 009/595] Minor code refactoring

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index b5df91f5059..c90c89a8c77 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -49,30 +49,6 @@ public static class Ioc
         /// </remarks>
         private static readonly HashSet<Type> RegisteredTypes = new HashSet<Type>();
 
-        /// <summary>
-        /// Internal container type for services of type <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of services to store in this type.</typeparam>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Public fields for performance reasons")]
-        private static class Container<T>
-            where T : class
-        {
-            /// <summary>
-            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Lazy"/> and <see cref="Instance"/> fields.
-            /// </summary>
-            public static readonly object Lock = new object();
-
-            /// <summary>
-            /// The optional <see cref="Lazy{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
-            /// </summary>
-            public static Lazy<T>? Lazy;
-
-            /// <summary>
-            /// The current <typeparamref name="T"/> instance being produced, if available.
-            /// </summary>
-            public static T? Instance;
-        }
-
         /// <summary>
         /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
         /// </summary>
@@ -229,5 +205,29 @@ private static TService ResolveOrThrow<TService>()
                 return Container<TService>.Instance = lazy.Value;
             }
         }
+
+        /// <summary>
+        /// Internal container type for services of type <typeparamref name="T"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of services to store in this type.</typeparam>
+        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Public fields for performance reasons")]
+        private static class Container<T>
+            where T : class
+        {
+            /// <summary>
+            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Lazy"/> and <see cref="Instance"/> fields.
+            /// </summary>
+            public static readonly object Lock = new object();
+
+            /// <summary>
+            /// The optional <see cref="Lazy{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
+            /// </summary>
+            public static Lazy<T>? Lazy;
+
+            /// <summary>
+            /// The current <typeparamref name="T"/> instance being produced, if available.
+            /// </summary>
+            public static T? Instance;
+        }
     }
 }

From a58ecdde49b3be878b050d3e6a2d8845a6c1d922 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 17:47:42 +0200
Subject: [PATCH 010/595] Added Ioc.Unregister<TService>() API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 37 +++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index c90c89a8c77..36e2ecf3d40 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -52,7 +52,7 @@ public static class Ioc
         /// <summary>
         /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to check for registration.</typeparam>
+        /// <typeparam name="TService">The type of service to check for registration.</typeparam>
         /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
         [Pure]
         public static bool IsRegistered<TService>()
@@ -75,7 +75,7 @@ public static bool IsRegistered<TService>()
         /// <summary>
         /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
         /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
         /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
         public static void Register<TService, TProvider>()
@@ -88,7 +88,7 @@ public static void Register<TService, TProvider>()
         /// <summary>
         /// Registers a singleton instance of service <typeparamref name="TService"/>.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to register.</typeparam>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
         /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
         public static void Register<TService>(TService provider)
             where TService : class
@@ -106,8 +106,8 @@ public static void Register<TService>(TService provider)
         /// <summary>
         /// Registers a service <typeparamref name="TService"/> through a <see cref="Func{TResult}"/> factory.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to register.</typeparam>
-        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> contract to use.</param>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
+        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
         public static void Register<TService>(Func<TService> factory)
             where TService : class
         {
@@ -117,8 +117,8 @@ public static void Register<TService>(Func<TService> factory)
         /// <summary>
         /// Registers a service <typeparamref name="TService"/> through a <see cref="Lazy{T}"/> instance.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to register.</typeparam>
-        /// <param name="lazy">The <see cref="Lazy{T}"/> instance used to create instances implementing the <typeparamref name="TService"/> contract.</param>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
+        /// <param name="lazy">The <see cref="Lazy{T}"/> instance used to create instances implementing the <typeparamref name="TService"/> service.</param>
         public static void Register<TService>(Lazy<TService> lazy)
             where TService : class
         {
@@ -132,6 +132,23 @@ public static void Register<TService>(Lazy<TService> lazy)
             }
         }
 
+        /// <summary>
+        /// Unregisters a service of a specified type.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to unregister.</typeparam>
+        public static void Unregister<TService>()
+            where TService : class
+        {
+            lock (RegisteredTypes)
+            lock (Container<TService>.Lock)
+            {
+                RegisteredTypes.Remove(typeof(TService));
+
+                Container<TService>.Lazy = null;
+                Container<TService>.Instance = null;
+            }
+        }
+
         /// <summary>
         /// Gets all the currently registered services.
         /// </summary>
@@ -154,9 +171,9 @@ from Type serviceType in RegisteredTypes
         }
 
         /// <summary>
-        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> contract.
+        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to look for.</typeparam>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -178,7 +195,7 @@ public static TService Resolve<TService>()
         /// This method implements the slow path for <see cref="Resolve{TService}"/>, locking
         /// to ensure thread-safety and invoking the available factory, if possible.
         /// </summary>
-        /// <typeparam name="TService">The type of contract to look for.</typeparam>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static TService ResolveOrThrow<TService>()

From 4554d3a0a0d1c0d41d07e47edca70d4f154132e8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 18:00:01 +0200
Subject: [PATCH 011/595] Added Ioc.Reset() API, minor bug fixes

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 36e2ecf3d40..7ecef6a53f7 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 #nullable enable
@@ -149,6 +150,32 @@ public static void Unregister<TService>()
             }
         }
 
+        /// <summary>
+        /// Resets the internal state of the <see cref="Ioc"/> type and unregisters all services.
+        /// </summary>
+        public static void Reset()
+        {
+            lock (RegisteredTypes)
+            {
+                foreach (Type serviceType in RegisteredTypes)
+                {
+                    Type containerType = typeof(Container<>).MakeGenericType(serviceType);
+                    FieldInfo
+                        lockField = containerType.GetField(nameof(Container<object>.Lock)),
+                        lazyField = containerType.GetField(nameof(Container<object>.Lazy)),
+                        instanceField = containerType.GetField(nameof(Container<object>.Instance));
+
+                    lock (lockField.GetValue(null))
+                    {
+                        lazyField.SetValue(null, null);
+                        instanceField.SetValue(null, null);
+                    }
+                }
+
+                RegisteredTypes.Clear();
+            }
+        }
+
         /// <summary>
         /// Gets all the currently registered services.
         /// </summary>
@@ -165,7 +192,8 @@ public static IReadOnlyCollection<object> GetAllRegisteredServices()
                 return (
                     from Type serviceType in RegisteredTypes
                     let resolver = typeof(Ioc).GetMethod(nameof(Resolve))
-                    let service = resolver.Invoke(null, null)
+                    let resolverOfT = resolver.MakeGenericMethod(serviceType)
+                    let service = resolverOfT.Invoke(null, null)
                     select service).ToArray();
             }
         }

From 2cb2675ed7f80454c432255c16744203d7eb6501 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 18:48:18 +0200
Subject: [PATCH 012/595] Added tests for the Ioc class

---
 UnitTests/Helpers/Test_Ioc.cs | 67 +++++++++++++++++++++++++++++++++++
 UnitTests/UnitTests.csproj    |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 UnitTests/Helpers/Test_Ioc.cs

diff --git a/UnitTests/Helpers/Test_Ioc.cs b/UnitTests/Helpers/Test_Ioc.cs
new file mode 100644
index 00000000000..8ab87d361b1
--- /dev/null
+++ b/UnitTests/Helpers/Test_Ioc.cs
@@ -0,0 +1,67 @@
+// 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.Linq;
+using Microsoft.Toolkit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Helpers
+{
+    [TestClass]
+    public class Test_Ioc
+    {
+        [TestCategory("Helpers")]
+        [TestMethod]
+        public void Test_Ioc_SampleUsage()
+        {
+            Assert.IsFalse(Ioc.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+
+            Ioc.Register<INameService, BobService>();
+
+            Assert.IsTrue(Ioc.IsRegistered<INameService>());
+
+            var services = Ioc.GetAllRegisteredServices();
+
+            Assert.AreEqual(services.Count, 1);
+            Assert.IsInstanceOfType(services.First(), typeof(INameService));
+            Assert.IsInstanceOfType(services.First(), typeof(BobService));
+
+            Ioc.Unregister<INameService>();
+
+            Assert.IsFalse(Ioc.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+
+            Ioc.Register<INameService>(() => new AliceService());
+
+            Assert.IsTrue(Ioc.IsRegistered<INameService>());
+
+            services = Ioc.GetAllRegisteredServices();
+
+            Assert.AreEqual(services.Count, 1);
+            Assert.IsInstanceOfType(services.First(), typeof(INameService));
+            Assert.IsInstanceOfType(services.First(), typeof(AliceService));
+
+            Ioc.Reset();
+
+            Assert.IsFalse(Ioc.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+        }
+
+        public interface INameService
+        {
+            string GetName();
+        }
+
+        public class BobService : INameService
+        {
+            public string GetName() => "Bob";
+        }
+
+        public class AliceService : INameService
+        {
+            public string GetName() => "Alice";
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 45aec0e7e7c..96a02c7afcb 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
+    <Compile Include="Helpers\Test_Ioc.cs" />
     <Compile Include="Helpers\Test_ColorHelper.cs" />
     <Compile Include="Helpers\Test_ConnectionHelper.cs" />
     <Compile Include="Helpers\Test_ScreenUnitHelper.cs" />

From f337280a409d77448f45d1640f0b1bd999bbef73 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 19:33:44 +0200
Subject: [PATCH 013/595] Added Ioc.GetAllCreatedServices() API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 7ecef6a53f7..9f40969530e 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -185,7 +185,7 @@ public static void Reset()
         /// registered services that were setup to use lazy initialization.
         /// </remarks>
         [Pure]
-        public static IReadOnlyCollection<object> GetAllRegisteredServices()
+        public static IReadOnlyCollection<object> GetAllServices()
         {
             lock (RegisteredTypes)
             {
@@ -198,6 +198,25 @@ from Type serviceType in RegisteredTypes
             }
         }
 
+        /// <summary>
+        /// Gets all the currently registered and instantiated services.
+        /// </summary>
+        /// <returns>A collection of all the currently registered and instantiated services.</returns>
+        [Pure]
+        public static IReadOnlyCollection<object> GetAllCreatedServices()
+        {
+            lock (RegisteredTypes)
+            {
+                return (
+                    from Type serviceType in RegisteredTypes
+                    let containerType = typeof(Container<>).MakeGenericType(serviceType)
+                    let field = containerType.GetField(nameof(Container<object>.Instance))
+                    let instance = field.GetValue(null)
+                    where !(instance is null)
+                    select instance).ToArray();
+            }
+        }
+
         /// <summary>
         /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>

From 4f65e956e129f1b530b719f0d16fead484c6c240 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 20:18:00 +0200
Subject: [PATCH 014/595] Minor code refactoring

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 33 +++++++++++---------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 9f40969530e..3221f99d230 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -60,7 +60,7 @@ public static bool IsRegistered<TService>()
             where TService : class
         {
             if (!(Container<TService>.Instance is null) ||
-                !(Container<TService>.Lazy is null))
+                !(Container<TService>.Factory is null))
             {
                 return true;
             }
@@ -69,7 +69,7 @@ public static bool IsRegistered<TService>()
             {
                 return
                     !(Container<TService>.Instance is null) ||
-                    !(Container<TService>.Lazy is null);
+                    !(Container<TService>.Factory is null);
             }
         }
 
@@ -99,7 +99,7 @@ public static void Register<TService>(TService provider)
             {
                 RegisteredTypes.Add(typeof(TService));
 
-                Container<TService>.Lazy = null;
+                Container<TService>.Factory = null;
                 Container<TService>.Instance = provider;
             }
         }
@@ -111,24 +111,13 @@ public static void Register<TService>(TService provider)
         /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
         public static void Register<TService>(Func<TService> factory)
             where TService : class
-        {
-            Register(new Lazy<TService>(factory));
-        }
-
-        /// <summary>
-        /// Registers a service <typeparamref name="TService"/> through a <see cref="Lazy{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <param name="lazy">The <see cref="Lazy{T}"/> instance used to create instances implementing the <typeparamref name="TService"/> service.</param>
-        public static void Register<TService>(Lazy<TService> lazy)
-            where TService : class
         {
             lock (RegisteredTypes)
             lock (Container<TService>.Lock)
             {
                 RegisteredTypes.Add(typeof(TService));
 
-                Container<TService>.Lazy = lazy;
+                Container<TService>.Factory = factory;
                 Container<TService>.Instance = null;
             }
         }
@@ -145,7 +134,7 @@ public static void Unregister<TService>()
             {
                 RegisteredTypes.Remove(typeof(TService));
 
-                Container<TService>.Lazy = null;
+                Container<TService>.Factory = null;
                 Container<TService>.Instance = null;
             }
         }
@@ -162,7 +151,7 @@ public static void Reset()
                     Type containerType = typeof(Container<>).MakeGenericType(serviceType);
                     FieldInfo
                         lockField = containerType.GetField(nameof(Container<object>.Lock)),
-                        lazyField = containerType.GetField(nameof(Container<object>.Lazy)),
+                        lazyField = containerType.GetField(nameof(Container<object>.Factory)),
                         instanceField = containerType.GetField(nameof(Container<object>.Instance));
 
                     lock (lockField.GetValue(null))
@@ -258,15 +247,15 @@ private static TService ResolveOrThrow<TService>()
                     return service;
                 }
 
-                Lazy<TService>? lazy = Container<TService>.Lazy;
+                Func<TService>? factory = Container<TService>.Factory;
 
                 // If no factory is available, the service hasn't been registered yet
-                if (lazy is null)
+                if (factory is null)
                 {
                     throw new InvalidOperationException($"Service {typeof(TService)} not initialized");
                 }
 
-                return Container<TService>.Instance = lazy.Value;
+                return Container<TService>.Instance = factory();
             }
         }
 
@@ -284,9 +273,9 @@ private static class Container<T>
             public static readonly object Lock = new object();
 
             /// <summary>
-            /// The optional <see cref="Lazy{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
+            /// The optional <see cref="Func{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
             /// </summary>
-            public static Lazy<T>? Lazy;
+            public static Func<T>? Factory;
 
             /// <summary>
             /// The current <typeparamref name="T"/> instance being produced, if available.

From df973eadeb7fa5774e390bd15c623b968e083253 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 20:21:16 +0200
Subject: [PATCH 015/595] Added Ioc.GetInstanceWithoutCaching<TService() API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 3221f99d230..884c92fab3d 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -259,6 +259,36 @@ private static TService ResolveOrThrow<TService>()
             }
         }
 
+        /// <summary>
+        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static TService GetInstanceWithoutCaching<TService>()
+            where TService : class
+        {
+            lock (Container<TService>.Lock)
+            {
+                Func<TService>? factory = Container<TService>.Factory;
+
+                if (!(factory is null))
+                {
+                    return factory();
+                }
+
+                TService? service = Container<TService>.Instance;
+
+                if (!(service is null))
+                {
+                    return (TService)Activator.CreateInstance(service.GetType());
+                }
+
+                throw new InvalidOperationException($"Service {typeof(TService)} not initialized");
+            }
+        }
+
         /// <summary>
         /// Internal container type for services of type <typeparamref name="T"/>.
         /// </summary>

From ce4b023cbcb57831c700fcd206d6d61076902ce1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 20:47:41 +0200
Subject: [PATCH 016/595] Minor code refactorings

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 884c92fab3d..49572b0d193 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -32,7 +32,7 @@ namespace Microsoft.Toolkit
     /// </code>
     /// Finally, use the <see cref="Ioc"/> type to retrieve service instances to use:
     /// <code>
-    /// IoC.Resolve&lt;ILogger>().Log("Hello world!");
+    /// IoC.GetInstance&lt;ILogger>().Log("Hello world!");
     /// </code>
     /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
     /// throw an exception in case the requested service has not been registered yet.
@@ -44,7 +44,7 @@ public static class Ioc
         /// </summary>
         /// <remarks>
         /// This list is not used when retrieving registered instances through
-        /// the <see cref="Resolve{TService}"/> method, so it has no impact on
+        /// the <see cref="GetInstance{TService}"/> method, so it has no impact on
         /// performances there. This is only used to allow users to retrieve all
         /// the registered instances at any given time, or to unregister them all.
         /// </remarks>
@@ -180,7 +180,7 @@ public static IReadOnlyCollection<object> GetAllServices()
             {
                 return (
                     from Type serviceType in RegisteredTypes
-                    let resolver = typeof(Ioc).GetMethod(nameof(Resolve))
+                    let resolver = typeof(Ioc).GetMethod(nameof(GetInstance))
                     let resolverOfT = resolver.MakeGenericMethod(serviceType)
                     let service = resolverOfT.Invoke(null, null)
                     select service).ToArray();
@@ -213,14 +213,14 @@ from Type serviceType in RegisteredTypes
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService Resolve<TService>()
+        public static TService GetInstance<TService>()
             where TService : class
         {
             TService? service = Container<TService>.Instance;
 
             if (service is null)
             {
-                return ResolveOrThrow<TService>();
+                return GetInstanceOrThrow<TService>();
             }
 
             return service;
@@ -228,13 +228,13 @@ public static TService Resolve<TService>()
 
         /// <summary>
         /// Tries to resolve a <typeparamref name="TService"/> instance with additional checks.
-        /// This method implements the slow path for <see cref="Resolve{TService}"/>, locking
+        /// This method implements the slow path for <see cref="GetInstance{TService}"/>, locking
         /// to ensure thread-safety and invoking the available factory, if possible.
         /// </summary>
         /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private static TService ResolveOrThrow<TService>()
+        private static TService GetInstanceOrThrow<TService>()
             where TService : class
         {
             lock (Container<TService>.Lock)

From 155b9decbb793b8f46b6da418a86ff5867892ece Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 20:55:34 +0200
Subject: [PATCH 017/595] Fixed an XML comment

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 49572b0d193..98e5642173d 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -298,7 +298,7 @@ private static class Container<T>
             where T : class
         {
             /// <summary>
-            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Lazy"/> and <see cref="Instance"/> fields.
+            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Factory"/> and <see cref="Instance"/> fields.
             /// </summary>
             public static readonly object Lock = new object();
 

From e409d94c7434234b3a1e0df0ef94c4aa19d1507d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Apr 2020 22:47:08 +0200
Subject: [PATCH 018/595] Fixed refactoring bugs

---
 UnitTests/Helpers/Test_Ioc.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UnitTests/Helpers/Test_Ioc.cs b/UnitTests/Helpers/Test_Ioc.cs
index 8ab87d361b1..b52709711a8 100644
--- a/UnitTests/Helpers/Test_Ioc.cs
+++ b/UnitTests/Helpers/Test_Ioc.cs
@@ -16,13 +16,13 @@ public class Test_Ioc
         public void Test_Ioc_SampleUsage()
         {
             Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
 
             Ioc.Register<INameService, BobService>();
 
             Assert.IsTrue(Ioc.IsRegistered<INameService>());
 
-            var services = Ioc.GetAllRegisteredServices();
+            var services = Ioc.GetAllServices();
 
             Assert.AreEqual(services.Count, 1);
             Assert.IsInstanceOfType(services.First(), typeof(INameService));
@@ -31,13 +31,13 @@ public void Test_Ioc_SampleUsage()
             Ioc.Unregister<INameService>();
 
             Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
 
             Ioc.Register<INameService>(() => new AliceService());
 
             Assert.IsTrue(Ioc.IsRegistered<INameService>());
 
-            services = Ioc.GetAllRegisteredServices();
+            services = Ioc.GetAllServices();
 
             Assert.AreEqual(services.Count, 1);
             Assert.IsInstanceOfType(services.First(), typeof(INameService));
@@ -46,7 +46,7 @@ public void Test_Ioc_SampleUsage()
             Ioc.Reset();
 
             Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllRegisteredServices().Count, 0);
+            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
         }
 
         public interface INameService

From 46473303bbd1d515cf3385d1674be4f650687a77 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Apr 2020 13:02:56 +0200
Subject: [PATCH 019/595] Speed optimizations to
 Ioc.GetInstanceWithoutCaching<TService>()

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 98e5642173d..8b7041054d1 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
@@ -282,7 +283,14 @@ public static TService GetInstanceWithoutCaching<TService>()
 
                 if (!(service is null))
                 {
-                    return (TService)Activator.CreateInstance(service.GetType());
+                    Type serviceType = service.GetType();
+                    Expression[] expressions = { Expression.New(serviceType) };
+                    Expression body = Expression.Block(serviceType, expressions);
+                    factory = Expression.Lambda<Func<TService>>(body).Compile();
+
+                    Container<TService>.Factory = factory;
+
+                    return factory();
                 }
 
                 throw new InvalidOperationException($"Service {typeof(TService)} not initialized");

From 1c7cfe7ef3c5320151c1321b04985810bfb306a7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Apr 2020 13:26:07 +0200
Subject: [PATCH 020/595] Added Ioc.TryGetInstance<TService> API

---
 Microsoft.Toolkit/Helpers/Ioc.cs | 37 ++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Helpers/Ioc.cs
index 8b7041054d1..e4e2d7d34e8 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Helpers/Ioc.cs
@@ -60,12 +60,6 @@ public static class Ioc
         public static bool IsRegistered<TService>()
             where TService : class
         {
-            if (!(Container<TService>.Instance is null) ||
-                !(Container<TService>.Factory is null))
-            {
-                return true;
-            }
-
             lock (Container<TService>.Lock)
             {
                 return
@@ -207,6 +201,37 @@ from Type serviceType in RegisteredTypes
             }
         }
 
+        /// <summary>
+        /// Tries to resolve an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
+        [Pure]
+        public static bool TryGetInstance<TService>(out TService? service)
+            where TService : class
+        {
+            lock (Container<TService>.Lock)
+            {
+                service = Container<TService>.Instance;
+
+                if (!(service is null))
+                {
+                    return true;
+                }
+
+                Func<TService>? factory = Container<TService>.Factory;
+
+                if (factory is null)
+                {
+                    return false;
+                }
+
+                service = Container<TService>.Instance = factory();
+
+                return true;
+            }
+        }
+
         /// <summary>
         /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>

From 6969545e58f115dc58a87e6bb420e6f056ef3073 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Apr 2020 13:27:38 +0200
Subject: [PATCH 021/595] Minor code refactoring

---
 Microsoft.Toolkit/{Helpers => Mvvm}/Ioc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename Microsoft.Toolkit/{Helpers => Mvvm}/Ioc.cs (99%)

diff --git a/Microsoft.Toolkit/Helpers/Ioc.cs b/Microsoft.Toolkit/Mvvm/Ioc.cs
similarity index 99%
rename from Microsoft.Toolkit/Helpers/Ioc.cs
rename to Microsoft.Toolkit/Mvvm/Ioc.cs
index e4e2d7d34e8..8a2cc3d14f9 100644
--- a/Microsoft.Toolkit/Helpers/Ioc.cs
+++ b/Microsoft.Toolkit/Mvvm/Ioc.cs
@@ -9,7 +9,7 @@
 
 #nullable enable
 
-namespace Microsoft.Toolkit
+namespace Microsoft.Toolkit.Mvvm
 {
     /// <summary>
     /// An Inversion of Control container that can be used to register and access instances of types providing services.

From 5c88279629b94d53d923b4a28be0281748db3e15 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Apr 2020 13:34:30 +0200
Subject: [PATCH 022/595] Fixed unit tests

---
 UnitTests/{Helpers => Mvvm}/Test_Ioc.cs | 6 +++---
 UnitTests/UnitTests.csproj              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename UnitTests/{Helpers => Mvvm}/Test_Ioc.cs (95%)

diff --git a/UnitTests/Helpers/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
similarity index 95%
rename from UnitTests/Helpers/Test_Ioc.cs
rename to UnitTests/Mvvm/Test_Ioc.cs
index b52709711a8..45b56d7657f 100644
--- a/UnitTests/Helpers/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -3,15 +3,15 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
-using Microsoft.Toolkit;
+using Microsoft.Toolkit.Mvvm;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests.Helpers
+namespace UnitTests.Mvvm
 {
     [TestClass]
     public class Test_Ioc
     {
-        [TestCategory("Helpers")]
+        [TestCategory("Mvvm")]
         [TestMethod]
         public void Test_Ioc_SampleUsage()
         {
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 96a02c7afcb..094aa2cd257 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,7 +139,7 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
-    <Compile Include="Helpers\Test_Ioc.cs" />
+    <Compile Include="Mvvm\Test_Ioc.cs" />
     <Compile Include="Helpers\Test_ColorHelper.cs" />
     <Compile Include="Helpers\Test_ConnectionHelper.cs" />
     <Compile Include="Helpers\Test_ScreenUnitHelper.cs" />

From 3b13c9ef22401bdf139fad6c57c32cf59eecb329 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 18:11:03 +0200
Subject: [PATCH 023/595] Added empty Microsoft.Toolkit.Mvvm package

---
 .../Microsoft.Toolkit.Mvvm.csproj             | 17 ++++++++++
 Windows Community Toolkit.sln                 | 32 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
new file mode 100644
index 00000000000..44a61dd23d5
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>8.0</LangVersion>
+    <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
+    <Description>
+      This package includes Mvvm .NET Standard code only helpers such as:
+      - Ioc: Provides a fast and minimalistic implementation of an IoC container.
+    </Description>
+    <PackageTags>UWP Toolkit Windows Mvvm Ioc extensions helpers</PackageTags>
+
+    <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+
+</Project>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 2a562708db3..72a27b4a0b1 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -90,6 +90,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Media", "Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
@@ -804,6 +806,36 @@ Global
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|x64.Build.0 = Release|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|x86.ActiveCfg = Release|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|x86.Build.0 = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.ActiveCfg = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.Build.0 = Debug|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM.Build.0 = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM64.Build.0 = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|x64.Build.0 = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From ed5b3a11832ee52c7f09f1b164b266e5e1825217 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 18:12:17 +0200
Subject: [PATCH 024/595] Moved Ioc class to separate package

---
 {Microsoft.Toolkit/Mvvm => Microsoft.Toolkit.Mvvm}/Ioc.cs | 0
 UnitTests/UnitTests.csproj                                | 4 ++++
 2 files changed, 4 insertions(+)
 rename {Microsoft.Toolkit/Mvvm => Microsoft.Toolkit.Mvvm}/Ioc.cs (100%)

diff --git a/Microsoft.Toolkit/Mvvm/Ioc.cs b/Microsoft.Toolkit.Mvvm/Ioc.cs
similarity index 100%
rename from Microsoft.Toolkit/Mvvm/Ioc.cs
rename to Microsoft.Toolkit.Mvvm/Ioc.cs
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 094aa2cd257..51926253c1a 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -201,6 +201,10 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj">
+      <Project>{d82ae6e1-e612-434e-acb2-363ee48738d3}</Project>
+      <Name>Microsoft.Toolkit.Mvvm</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
       <Project>{42ca4935-54be-42ea-ac19-992378c08de6}</Project>
       <Name>Microsoft.Toolkit.Parsers</Name>

From 47f1373ee4017e334af390ffd3adf603d98fe44a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 18:38:24 +0200
Subject: [PATCH 025/595] Added ObservableObject class

---
 .../Microsoft.Toolkit.Mvvm.csproj             |  3 +-
 Microsoft.Toolkit.Mvvm/ObservableObject.cs    | 86 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/ObservableObject.cs

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 44a61dd23d5..784abc8b8b4 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
     <Description>
       This package includes Mvvm .NET Standard code only helpers such as:
diff --git a/Microsoft.Toolkit.Mvvm/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
new file mode 100644
index 00000000000..07e9c64f122
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
@@ -0,0 +1,86 @@
+// 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.
+
+// Original file header:
+// ****************************************************************************
+// <copyright file="ObservableObject.cs" company="GalaSoft Laurent Bugnion">
+// Copyright © GalaSoft Laurent Bugnion 2011-2016
+// </copyright>
+// ****************************************************************************
+// <author>Laurent Bugnion</author>
+// <email>laurent@galasoft.ch</email>
+// <date>10.4.2011</date>
+// <project>GalaSoft.MvvmLight.Messaging</project>
+// <web>http://www.mvvmlight.net</web>
+// <license>
+// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
+// </license>
+// ****************************************************************************
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm
+{
+    /// <summary>
+    /// A base class for objects of which the properties must be observable.
+    /// </summary>
+    public abstract class ObservableObject : INotifyPropertyChanged, INotifyPropertyChanging
+    {
+        /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        /// <inheritdoc cref="INotifyPropertyChanging.PropertyChanging"/>
+        public event PropertyChangingEventHandler? PropertyChanging;
+
+        /// <summary>
+        /// Raises the <see cref="PropertyChanged"/> event if needed.
+        /// </summary>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        protected virtual void RaisePropertyChanged([CallerMemberName] string propertyName = null!)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// Raises the <see cref="PropertyChanging"/> event if needed.
+        /// </summary>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        protected virtual void RaisePropertyChanging([CallerMemberName] string propertyName = null!)
+        {
+            PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
+        /// value, then raises the <see cref="PropertyChanged"/> event.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null!)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, newValue))
+            {
+                return false;
+            }
+
+            this.RaisePropertyChanging(propertyName);
+
+            field = newValue;
+
+            this.RaisePropertyChanged(propertyName);
+
+            return true;
+        }
+    }
+}
\ No newline at end of file

From bcd2674e8f99c8b6484aecda598e7fadd634b7c8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 18:40:28 +0200
Subject: [PATCH 026/595] Minor code style tweaks

---
 Microsoft.Toolkit.Mvvm/Ioc.cs              | 6 +++++-
 Microsoft.Toolkit.Mvvm/ObservableObject.cs | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Ioc.cs b/Microsoft.Toolkit.Mvvm/Ioc.cs
index 8a2cc3d14f9..bb5ccce4675 100644
--- a/Microsoft.Toolkit.Mvvm/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/Ioc.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.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
diff --git a/Microsoft.Toolkit.Mvvm/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
index 07e9c64f122..be6697c40d7 100644
--- a/Microsoft.Toolkit.Mvvm/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable SA1512
+
 // Original file header:
 // ****************************************************************************
 // <copyright file="ObservableObject.cs" company="GalaSoft Laurent Bugnion">

From 08dfe8ae2e6176b876e8051960c75efe513a16c5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 18:54:26 +0200
Subject: [PATCH 027/595] Minor code refactorings

Changed the property raise methods to follow ObservableCollection naming convention (cc. @Aminator)
---
 Microsoft.Toolkit.Mvvm/ObservableObject.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
index be6697c40d7..ecf629edb75 100644
--- a/Microsoft.Toolkit.Mvvm/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ObservableObject.cs
@@ -41,7 +41,7 @@ public abstract class ObservableObject : INotifyPropertyChanged, INotifyProperty
         /// Raises the <see cref="PropertyChanged"/> event if needed.
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        protected virtual void RaisePropertyChanged([CallerMemberName] string propertyName = null!)
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null!)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -50,7 +50,7 @@ protected virtual void RaisePropertyChanged([CallerMemberName] string propertyNa
         /// Raises the <see cref="PropertyChanging"/> event if needed.
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        protected virtual void RaisePropertyChanging([CallerMemberName] string propertyName = null!)
+        protected virtual void OnPropertyChanging([CallerMemberName] string propertyName = null!)
         {
             PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
@@ -76,11 +76,11 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
                 return false;
             }
 
-            this.RaisePropertyChanging(propertyName);
+            this.OnPropertyChanging(propertyName);
 
             field = newValue;
 
-            this.RaisePropertyChanged(propertyName);
+            this.OnPropertyChanged(propertyName);
 
             return true;
         }

From ad613c3f1b91919e826775452e68803fe507e80f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 19:32:04 +0200
Subject: [PATCH 028/595] Added RelayCommand type

---
 Microsoft.Toolkit.Mvvm/RelayCommand.cs | 95 ++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/RelayCommand.cs

diff --git a/Microsoft.Toolkit.Mvvm/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/RelayCommand.cs
new file mode 100644
index 00000000000..578e6638495
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/RelayCommand.cs
@@ -0,0 +1,95 @@
+// 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.
+
+#pragma warning disable SA1512
+
+// <copyright file="RelayCommand.cs" company="GalaSoft Laurent Bugnion">
+// Copyright © GalaSoft Laurent Bugnion 2009-2016
+// </copyright>
+// ****************************************************************************
+// <author>Laurent Bugnion</author>
+// <email>laurent@galasoft.ch</email>
+// <date>22.4.2009</date>
+// <project>GalaSoft.MvvmLight</project>
+// <web>http://www.mvvmlight.net</web>
+// <license>
+// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
+// </license>
+// ****************************************************************************
+// <credits>This class was developed by Josh Smith (http://joshsmithonwpf.wordpress.com) and
+// slightly modified with his permission.</credits>
+// ****************************************************************************
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+
+namespace Microsoft.Toolkit.Mvvm
+{
+    /// <summary>
+    /// A command whose sole purpose is to relay its functionality to other
+    /// objects by invoking delegates. The default return value for the <see cref="CanExecute"/>
+    /// method is <see langword="true"/>. This type does not allow you to accept command parameters
+    /// in the <see cref="Execute"/> and <see cref="CanExecute"/> callback methods.
+    /// </summary>
+    public sealed class RelayCommand : ICommand
+    {
+        /// <summary>
+        /// The <see cref="Action"/> to invoke when <see cref="Execute"/> is used.
+        /// </summary>
+        private readonly Action execute;
+
+        /// <summary>
+        /// The optional action to invoke when <see cref="CanExecute"/> is used.
+        /// </summary>
+        private readonly Func<bool>? canExecute;
+
+        /// <inheritdoc/>
+        public event EventHandler? CanExecuteChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelayCommand"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        public RelayCommand(Action execute)
+            : this(execute, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelayCommand"/> class.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        public RelayCommand(Action execute, Func<bool>? canExecute)
+        {
+            this.execute = execute;
+            this.canExecute = canExecute;
+        }
+
+        /// <summary>
+        /// Raises the <see cref="CanExecuteChanged" /> event.
+        /// </summary>
+        public void RaiseCanExecuteChanged()
+        {
+            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool CanExecute(object parameter)
+        {
+            return this.canExecute?.Invoke() != false;
+        }
+
+        /// <inheritdoc/>
+        public void Execute(object parameter)
+        {
+            if (CanExecute(parameter))
+            {
+                this.execute();
+            }
+        }
+    }
+}
\ No newline at end of file

From f93ae4f60845d2ab0d5eb36401181a5395f0f9cb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 19:38:54 +0200
Subject: [PATCH 029/595] Added the RelayCommand<T> type

---
 Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs | 118 ++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs
new file mode 100644
index 00000000000..56104e01b09
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs
@@ -0,0 +1,118 @@
+// 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.
+
+#pragma warning disable SA1512
+
+// <copyright file="RelayCommand.cs" company="GalaSoft Laurent Bugnion">
+// Copyright © GalaSoft Laurent Bugnion 2009-2016
+// </copyright>
+// ****************************************************************************
+// <author>Laurent Bugnion</author>
+// <email>laurent@galasoft.ch</email>
+// <date>22.4.2009</date>
+// <project>GalaSoft.MvvmLight</project>
+// <web>http://www.mvvmlight.net</web>
+// <license>
+// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
+// </license>
+// ****************************************************************************
+// <credits>This class was developed by Josh Smith (http://joshsmithonwpf.wordpress.com) and
+// slightly modified with his permission.</credits>
+// ****************************************************************************
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+
+namespace Microsoft.Toolkit.Mvvm
+{
+    /// <summary>
+    /// A generic command whose sole purpose is to relay its functionality to other
+    /// objects by invoking delegates. The default return value for the CanExecute
+    /// method is <see langword="true"/>. This class allows you to accept command parameters
+    /// in the <see cref="Execute(T)"/> and <see cref="CanExecute(T)"/> callback methods.
+    /// </summary>
+    /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
+    public sealed class RelayCommand<T> : ICommand
+    {
+        /// <summary>
+        /// The <see cref="Action"/> to invoke when <see cref="Execute(T)"/> is used.
+        /// </summary>
+        private readonly Action<T> execute;
+
+        /// <summary>
+        /// The optional action to invoke when <see cref="CanExecute(T)"/> is used.
+        /// </summary>
+        private readonly Func<T, bool>? canExecute;
+
+        /// <inheritdoc/>
+        public event EventHandler? CanExecuteChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelayCommand{T}"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        public RelayCommand(Action<T> execute)
+            : this(execute, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelayCommand{T}"/> class.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        public RelayCommand(Action<T> execute, Func<T, bool>? canExecute)
+        {
+            this.execute = execute;
+            this.canExecute = canExecute;
+        }
+
+        /// <summary>
+        /// Raises the <see cref="CanExecuteChanged" /> event.
+        /// </summary>
+        public void RaiseCanExecuteChanged()
+        {
+            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="CanExecute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <returns>Whether or not the current command can be executed.</returns>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool CanExecute(T parameter)
+        {
+            return this.canExecute?.Invoke(parameter) != false;
+        }
+
+        /// <inheritdoc/>
+        public bool CanExecute(object parameter)
+        {
+            return CanExecute((T)parameter);
+        }
+
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="Execute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Execute(T parameter)
+        {
+            if (CanExecute(parameter))
+            {
+                this.execute(parameter);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Execute(object parameter)
+        {
+            Execute((T)parameter);
+        }
+    }
+}
\ No newline at end of file

From 1e75231a0547f749551f1a51fa89f2b2d265dd73 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Apr 2020 19:41:54 +0200
Subject: [PATCH 030/595] Minor code refactoring

---
 Microsoft.Toolkit.Mvvm/{ => Commands}/RelayCommand.cs    | 2 +-
 Microsoft.Toolkit.Mvvm/{ => Commands}/RelayCommand{T}.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{ => Commands}/RelayCommand.cs (98%)
 rename Microsoft.Toolkit.Mvvm/{ => Commands}/RelayCommand{T}.cs (99%)

diff --git a/Microsoft.Toolkit.Mvvm/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
similarity index 98%
rename from Microsoft.Toolkit.Mvvm/RelayCommand.cs
rename to Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
index 578e6638495..c2fe13c80ca 100644
--- a/Microsoft.Toolkit.Mvvm/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
@@ -25,7 +25,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.Commands
 {
     /// <summary>
     /// A command whose sole purpose is to relay its functionality to other
diff --git a/Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs
rename to Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 56104e01b09..262f56152ce 100644
--- a/Microsoft.Toolkit.Mvvm/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -25,7 +25,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.Commands
 {
     /// <summary>
     /// A generic command whose sole purpose is to relay its functionality to other

From 79f4f4b6e351a2c891602ee6fdef3fc626778b85 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 16:46:58 +0200
Subject: [PATCH 031/595] Ported minimal DictionarySlim<TKey, TValue> type from
 CoreFXLabs

---
 .../DictionarySlim{TKey,TValue}.cs            | 246 ++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
new file mode 100644
index 00000000000..c9acfd2a39f
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -0,0 +1,246 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Collections.Extensions
+{
+    /// <summary>
+    /// A lightweight Dictionary with three principal differences compared to <see cref="Dictionary{TKey, TValue}"/>
+    ///
+    /// 1) It is possible to do "get or add" in a single lookup using <see cref="GetOrAddValueRef(TKey)"/>. For
+    /// values that are value types, this also saves a copy of the value.
+    /// 2) It assumes it is cheap to equate values.
+    /// 3) It assumes the keys implement <see cref="IEquatable{TKey}"/> or else Equals() and they are cheap and sufficient.
+    /// </summary>
+    /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+    /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+    /// <remarks>
+    /// 1) This avoids having to do separate lookups (<see cref="Dictionary{TKey, TValue}.TryGetValue(TKey, out TValue)"/>
+    /// followed by <see cref="Dictionary{TKey, TValue}.Add(TKey, TValue)"/>.
+    /// There is not currently an API exposed to get a value by ref without adding if the key is not present.
+    /// 2) This means it can save space by not storing hash codes.
+    /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
+    /// </remarks>
+    [DebuggerDisplay("Count = {Count}")]
+    internal sealed class DictionarySlim<TKey, TValue>
+        where TKey : struct, IEquatable<TKey>
+    {
+        // See info in CoreFX labs for how this works
+        private static readonly Entry[] InitialEntries = new Entry[1];
+        private int _count;
+        private int _freeList = -1;
+        private int[] _buckets;
+        private Entry[] _entries;
+
+        private struct Entry
+        {
+            public TKey Key;
+            public TValue Value;
+            public int Next;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DictionarySlim{TKey, TValue}"/> class.
+        /// </summary>
+        public DictionarySlim()
+        {
+            _buckets = new int[1];
+            _entries = InitialEntries;
+        }
+
+        /// <summary>
+        /// Gets the count of entries in the dictionary.
+        /// </summary>
+        public int Count => _count;
+
+        /// <summary>
+        /// Clears the dictionary. Note that this invalidates any active enumerators.
+        /// </summary>
+        public void Clear()
+        {
+            _count = 0;
+            _freeList = -1;
+            _buckets = new int[1];
+            _entries = InitialEntries;
+        }
+
+        /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
+        public bool Remove(TKey key)
+        {
+            Entry[] entries = _entries;
+            int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
+            int entryIndex = _buckets[bucketIndex] - 1;
+
+            int lastIndex = -1;
+            while (entryIndex != -1)
+            {
+                Entry candidate = entries[entryIndex];
+                if (candidate.Key.Equals(key))
+                {
+                    if (lastIndex != -1)
+                    {
+                        entries[lastIndex].Next = candidate.Next;
+                    }
+                    else
+                    {
+                        _buckets[bucketIndex] = candidate.Next + 1;
+                    }
+
+                    entries[entryIndex] = default;
+
+                    entries[entryIndex].Next = -3 - _freeList;
+                    _freeList = entryIndex;
+
+                    _count--;
+                    return true;
+                }
+
+                lastIndex = entryIndex;
+                entryIndex = candidate.Next;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the value for the specified key, or, if the key is not present,
+        /// adds an entry and returns the value by ref. This makes it possible to
+        /// add or update a value in a single look up operation.
+        /// </summary>
+        /// <param name="key">Key to look for</param>
+        /// <returns>Reference to the new or existing value</returns>
+        public ref TValue GetOrAddValueRef(TKey key)
+        {
+            Entry[] entries = _entries;
+            int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
+
+            for (int i = _buckets[bucketIndex] - 1;
+                    (uint)i < (uint)entries.Length; i = entries[i].Next)
+            {
+                if (key.Equals(entries[i].Key))
+                {
+                    return ref entries[i].Value;
+                }
+            }
+
+            return ref AddKey(key, bucketIndex);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private ref TValue AddKey(TKey key, int bucketIndex)
+        {
+            Entry[] entries = _entries;
+            int entryIndex;
+            if (_freeList != -1)
+            {
+                entryIndex = _freeList;
+                _freeList = -3 - entries[_freeList].Next;
+            }
+            else
+            {
+                if (_count == entries.Length || entries.Length == 1)
+                {
+                    entries = Resize();
+                    bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
+                }
+
+                entryIndex = _count;
+            }
+
+            entries[entryIndex].Key = key;
+            entries[entryIndex].Next = _buckets[bucketIndex] - 1;
+
+            _buckets[bucketIndex] = entryIndex + 1;
+            _count++;
+
+            return ref entries[entryIndex].Value;
+        }
+
+        /// <summary>
+        /// Resizes the current dictionary to reduce the number of collisions
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private Entry[] Resize()
+        {
+            int count = _count;
+            int newSize = _entries.Length * 2;
+
+            if ((uint)newSize > (uint)int.MaxValue)
+            {
+                throw new InvalidOperationException("Max capacity exceeded");
+            }
+
+            var entries = new Entry[newSize];
+
+            Array.Copy(_entries, 0, entries, 0, count);
+
+            var newBuckets = new int[entries.Length];
+
+            while (count-- > 0)
+            {
+                int bucketIndex = entries[count].Key.GetHashCode() & (newBuckets.Length - 1);
+                entries[count].Next = newBuckets[bucketIndex] - 1;
+                newBuckets[bucketIndex] = count + 1;
+            }
+
+            _buckets = newBuckets;
+            _entries = entries;
+
+            return entries;
+        }
+
+        /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
+        public Enumerator GetEnumerator() => new Enumerator(this);
+
+        /// <summary>
+        /// Enumerator for <see cref="DictionarySlim{TKey,TValue}"/>.
+        /// </summary>
+        public ref struct Enumerator
+        {
+            private readonly DictionarySlim<TKey, TValue> _dictionary;
+            private int _index;
+            private int _count;
+            private KeyValuePair<TKey, TValue> _current;
+
+            internal Enumerator(DictionarySlim<TKey, TValue> dictionary)
+            {
+                _dictionary = dictionary;
+                _index = 0;
+                _count = _dictionary._count;
+                _current = default;
+            }
+
+            /// <inheritdoc cref="IEnumerator.MoveNext"/>
+            public bool MoveNext()
+            {
+                if (_count == 0)
+                {
+                    _current = default;
+                    return false;
+                }
+
+                _count--;
+
+                while (_dictionary._entries[_index].Next < -1)
+                {
+                    _index++;
+                }
+
+                _current = new KeyValuePair<TKey, TValue>(
+                    _dictionary._entries[_index].Key,
+                    _dictionary._entries[_index++].Value);
+                return true;
+            }
+
+            /// <inheritdoc cref="IEnumerator{T}.Current"/>
+            public KeyValuePair<TKey, TValue> Current => _current;
+        }
+    }
+}
\ No newline at end of file

From bb7db868e678248a2f49933d4dc80c1bfd0130c1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 16:54:26 +0200
Subject: [PATCH 032/595] Added the IDictionary<in TKey> interface

---
 .../DictionarySlim{TKey,TValue}.cs               |  4 ++--
 .../IDictionary{TKey}.cs                         | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index c9acfd2a39f..2c1862ac2e6 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue>
+    internal sealed class DictionarySlim<TKey, TValue> : IDictionary<TKey>
         where TKey : struct, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
@@ -71,7 +71,7 @@ public void Clear()
             _entries = InitialEntries;
         }
 
-        /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
+        /// <inheritdoc/>
         public bool Remove(TKey key)
         {
             Entry[] entries = _entries;
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
new file mode 100644
index 00000000000..e4976feb47f
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.Collections.Extensions
+{
+    /// <summary>
+    /// An interface providing value-invariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
+    /// </summary>
+    /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+    internal interface IDictionary<in TKey>
+        where TKey : struct, IEquatable<TKey>
+    {
+        /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
+        bool Remove(TKey key);
+    }
+}

From 8963f3a4a47bc2fb523a2e8d44e45cfbc355a820 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 18:10:37 +0200
Subject: [PATCH 033/595] Initial draft of the Messenger class

---
 Microsoft.Toolkit.Mvvm/Messenger.cs           | 332 ++++++++++++++++++
 .../Microsoft.Toolkit.Mvvm.csproj             |   4 +
 2 files changed, 336 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messenger.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
new file mode 100644
index 00000000000..70bf07a7def
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -0,0 +1,332 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.Collections.Extensions;
+
+namespace Microsoft.Toolkit.Mvvm
+{
+    /// <summary>
+    /// A type implementing a messaging system between objects.
+    /// </summary>
+    public static class Messenger
+    {
+        /// <summary>
+        /// The collection of currently registered recipients, with a link to their linked message receivers.
+        /// </summary>
+        /// <remarks>
+        /// This collection is used to allow reflection-free access to all the existing
+        /// registered recipients from <see cref="Unregister(object)"/>, so that all the
+        /// existing handlers can be removed without having to dynamically create the
+        /// generic types for the containers of the various dictionaries mapping the handlers.
+        /// </remarks>
+        private static readonly DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>> RecipientsMap
+            = new DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>>();
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        public static void Register<TMessage>(object recipient, Action<TMessage> action)
+        {
+            Register(recipient, default(Unit), action);
+        }
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="token">A token used to determine the receiving channel to use.</param>
+        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        public static void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+        {
+            lock (RecipientsMap)
+            {
+                // Get the <TMessage, TToken> registration list for this recipient
+                var values = Container<TMessage, TToken>.Values;
+                var key = new Recipient(recipient);
+                ref var list = ref values.GetOrAddValueRef(key);
+
+                if (list is null)
+                {
+                    list = new List<Entry<TMessage, TToken>>();
+                }
+
+                // Add the new registration entry
+                list.Add(new Entry<TMessage, TToken>(action, token));
+
+                // Make sure this registration map is tracked for the current recipient
+                ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+
+                if (set is null)
+                {
+                    set = new HashSet<IDictionary<Recipient>>();
+                }
+
+                set.Add(values);
+            }
+        }
+
+        /// <summary>
+        /// Unregisters a recipient from messages of a given type.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        public static void Unregister<TMessage>(object recipient)
+        {
+            Unregister<TMessage, Unit>(recipient, default);
+        }
+
+        /// <summary>
+        /// Unregisters a recipient from messages of a given type.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <param name="token">The token to use to identify which handlers to unregister.</param>
+        public static void Unregister<TMessage, TToken>(object recipient, TToken token)
+        {
+            lock (RecipientsMap)
+            {
+                // Get the registration list (same as above)
+                var values = Container<TMessage, TToken>.Values;
+                var key = new Recipient(recipient);
+                ref var list = ref values.GetOrAddValueRef(key);
+
+                if (list is null)
+                {
+                    return;
+                }
+
+                // Remove all entries with a matching token
+                list.RemoveAll(entry => EqualityComparer<TToken>.Default.Equals(entry.Token, token));
+
+                /* If the list is empty, it means that the current recipient has no remaining
+                 * registered handlers for the current <TMessage, TToken> combination, regardless,
+                 * of the specific token value (ie. the channel used to receive messages of that type).
+                 * We can remove the list entirely from this map, and remove the link to the map itself
+                 * to the static mapping between existing registered recipients. */
+                if (list.Count == 0)
+                {
+                    values.Remove(key);
+
+                    ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+
+                    set.Remove(values);
+
+                    if (set.Count == 0)
+                    {
+                        RecipientsMap.Remove(key);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Unregisters a recipient from all registered messages.
+        /// </summary>
+        /// <param name="recipient">The recipient to unregister.</param>
+        public static void Unregister(object recipient)
+        {
+            lock (RecipientsMap)
+            {
+                // If the recipient has no registered messages at all, ignore
+                var key = new Recipient(recipient);
+                ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+
+                if (set is null || set.Count == 0)
+                {
+                    return;
+                }
+
+                // Removes all the lists of registered handlers for the recipient
+                foreach (var map in set)
+                {
+                    map.Remove(key);
+                }
+
+                // Remove the associated set in the static map
+                RecipientsMap.Remove(key);
+            }
+        }
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <param name="message">The message to send.</param>
+        public static void Send<TMessage>(TMessage message)
+        {
+            Send(message, default(Unit));
+        }
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="message">The message to send.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        public static void Send<TMessage, TToken>(TMessage message, TToken token)
+        {
+            Entry<TMessage, TToken>[] entries;
+            int length = 0;
+
+            lock (RecipientsMap)
+            {
+                /* We need to make a local copy of the currently registered handlers,
+                 * since users might try to unregister (or register) new handlers from
+                 * inside one of the currently existing handlers. We can use memory pooling
+                 * to reuse arrays, to minimize the average memory usage. In practice,
+                 * we usually just need to pay the small overhead of copying the items. */
+                var values = Container<TMessage, TToken>.Values;
+
+                // Count the total number of recipients
+                foreach (var pair in values)
+                {
+                    length += pair.Value.Count;
+                }
+
+                // Rent the array to copy handlers to
+                entries = ArrayPool<Entry<TMessage, TToken>>.Shared.Rent(length);
+
+                /* Copy the handlers to the local collection.
+                 * Both types being enumerate expose a struct enumerator,
+                 * so we're not actually allocating the enumerator here. */
+                int i = 0;
+                foreach (var pair in values)
+                {
+                    foreach (var entry in pair.Value)
+                    {
+                        entries[i++] = entry;
+                    }
+                }
+            }
+
+            try
+            {
+                // Invoke all the necessary handlers on the local copy of entries
+                foreach (var entry in entries.AsSpan(0, length))
+                {
+                    if (EqualityComparer<TToken>.Default.Equals(token, entry.Token))
+                    {
+                        entry.Action(message);
+                    }
+                }
+            }
+            finally
+            {
+                ArrayPool<Entry<TMessage, TToken>>.Shared.Return(entries, true);
+            }
+        }
+
+        /// <summary>
+        /// A container class for registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
+        private static class Container<TMessage, TToken>
+        {
+            /// <summary>
+            /// The mapping of currently registered recipients for the combination of types
+            /// <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>, along with
+            /// their registered actions and tokens. Each recipient has an associated <see cref="List{T}"/>
+            /// since it could have a number of handlers registered in parallel, each using a different
+            /// registration channel specified by the token in use. Using a <see cref="DictionarySlim{TKey,TValue}"/>
+            /// for the mapping allows for quick access to all the registered entries for each recipient.
+            /// </summary>
+            public static readonly DictionarySlim<Recipient, List<Entry<TMessage, TToken>>> Values
+                = new DictionarySlim<Recipient, List<Entry<TMessage, TToken>>>();
+        }
+
+        /// <summary>
+        /// A simple type representing a recipient.
+        /// </summary>
+        /// <remarks>
+        /// This type is used to enable fast indexing in each mapping dictionary,
+        /// since it acts as an external override for the <see cref="GetHashCode"/> and
+        /// <see cref="Equals(object?)"/> methods for arbitrary objects, removing both
+        /// the virtual call and preventing instances overriding those methods in this context.
+        /// Using this type guarantees that all the equality operations are always only done
+        /// based on reference equality for each registered recipient, regardless of its type.
+        /// </remarks>
+        private readonly struct Recipient : IEquatable<Recipient>
+        {
+            /// <summary>
+            /// The registered recipient.
+            /// </summary>
+            private readonly object target;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Recipient"/> struct.
+            /// </summary>
+            /// <param name="target">The target recipient instance.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Recipient(object target)
+            {
+                this.target = target;
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Recipient other)
+            {
+                return ReferenceEquals(this.target, other.target);
+            }
+
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Recipient other && Equals(other);
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public override int GetHashCode()
+            {
+                return RuntimeHelpers.GetHashCode(this.target);
+            }
+        }
+
+        /// <summary>
+        /// An empty type representing a generic token with no specific value.
+        /// </summary>
+        private struct Unit
+        {
+        }
+
+        /// <summary>
+        /// A type representing a pair of message and token used for registration.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
+        private readonly struct Entry<TMessage, TToken>
+        {
+            /// <summary>
+            /// The <see cref="Action{T}"/> to invoke when a message is receive.
+            /// </summary>
+            public readonly Action<TMessage> Action;
+
+            /// <summary>
+            /// The token used for the message registration.
+            /// </summary>
+            public readonly TToken Token;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Entry{TMessage, TToken}"/> struct.
+            /// </summary>
+            /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is receive.</param>
+            /// <param name="token">The token used for the message registration.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Entry(Action<TMessage> action, TToken token)
+            {
+                this.Action = action;
+                this.Token = token;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 784abc8b8b4..ee24e73b38b 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -15,4 +15,8 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+  </ItemGroup>
+
 </Project>

From 2e95d488d44894df11dcc25296089add2883fcab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 18:13:04 +0200
Subject: [PATCH 034/595] Added missing file headers

---
 Microsoft.Toolkit.Mvvm/Messenger.cs                         | 6 +++++-
 .../Microsoft.Collections.Extensions/IDictionary{TKey}.cs   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 70bf07a7def..8ea9ecc202d 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.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.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
index e4976feb47f..9ab5e595ff7 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.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;
 
 namespace Microsoft.Collections.Extensions

From 805d9402d7b2f88b0ac949dfbf93deff438cd132 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 20:08:52 +0200
Subject: [PATCH 035/595] Code tweaks and performance improvements

---
 Microsoft.Toolkit.Mvvm/Messenger.cs           | 137 ++++++++++--------
 .../DictionarySlim{TKey,TValue}.cs            |   2 +-
 .../IDictionary{TKey}.cs                      |   2 +-
 3 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 8ea9ecc202d..da74a8c66d6 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -33,6 +33,7 @@ private static readonly DictionarySlim<Recipient, HashSet<IDictionary<Recipient>
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         public static void Register<TMessage>(object recipient, Action<TMessage> action)
         {
             Register(recipient, default(Unit), action);
@@ -46,25 +47,34 @@ public static void Register<TMessage>(object recipient, Action<TMessage> action)
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="token">A token used to determine the receiving channel to use.</param>
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         public static void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+            where TToken : notnull, IEquatable<TToken>
         {
             lock (RecipientsMap)
             {
                 // Get the <TMessage, TToken> registration list for this recipient
                 var values = Container<TMessage, TToken>.Values;
                 var key = new Recipient(recipient);
-                ref var list = ref values.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
-                if (list is null)
+                if (map is null)
                 {
-                    list = new List<Entry<TMessage, TToken>>();
+                    map = new DictionarySlim<TToken, Action<TMessage>>();
                 }
 
                 // Add the new registration entry
-                list.Add(new Entry<TMessage, TToken>(action, token));
+                ref Action<TMessage> handler = ref map.GetOrAddValueRef(token);
+
+                if (!(handler is null))
+                {
+                    ThrowInvalidOperationExceptionForDuplicateRegistration();
+                }
+
+                handler = action;
 
                 // Make sure this registration map is tracked for the current recipient
-                ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
 
                 if (set is null)
                 {
@@ -80,6 +90,7 @@ public static void Register<TMessage, TToken>(object recipient, TToken token, Ac
         /// </summary>
         /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
         /// <param name="recipient">The recipient to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         public static void Unregister<TMessage>(object recipient)
         {
             Unregister<TMessage, Unit>(recipient, default);
@@ -92,33 +103,35 @@ public static void Unregister<TMessage>(object recipient)
         /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
         /// <param name="recipient">The recipient to unregister.</param>
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         public static void Unregister<TMessage, TToken>(object recipient, TToken token)
+            where TToken : notnull, IEquatable<TToken>
         {
             lock (RecipientsMap)
             {
                 // Get the registration list (same as above)
                 var values = Container<TMessage, TToken>.Values;
                 var key = new Recipient(recipient);
-                ref var list = ref values.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
-                if (list is null)
+                if (map is null)
                 {
                     return;
                 }
 
-                // Remove all entries with a matching token
-                list.RemoveAll(entry => EqualityComparer<TToken>.Default.Equals(entry.Token, token));
+                // Remove the target handler
+                map.Remove(token);
 
-                /* If the list is empty, it means that the current recipient has no remaining
+                /* If the map is empty, it means that the current recipient has no remaining
                  * registered handlers for the current <TMessage, TToken> combination, regardless,
                  * of the specific token value (ie. the channel used to receive messages of that type).
-                 * We can remove the list entirely from this map, and remove the link to the map itself
+                 * We can remove the map entirely from this container, and remove the link to the map itself
                  * to the static mapping between existing registered recipients. */
-                if (list.Count == 0)
+                if (map.Count == 0)
                 {
                     values.Remove(key);
 
-                    ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+                    ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
 
                     set.Remove(values);
 
@@ -140,15 +153,15 @@ public static void Unregister(object recipient)
             {
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
-                ref var set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
 
-                if (set is null || set.Count == 0)
+                if (set is null)
                 {
                     return;
                 }
 
                 // Removes all the lists of registered handlers for the recipient
-                foreach (var map in set)
+                foreach (IDictionary<Recipient> map in set)
                 {
                     map.Remove(key);
                 }
@@ -176,9 +189,10 @@ public static void Send<TMessage>(TMessage message)
         /// <param name="message">The message to send.</param>
         /// <param name="token">The token indicating what channel to use.</param>
         public static void Send<TMessage, TToken>(TMessage message, TToken token)
+            where TToken : notnull, IEquatable<TToken>
         {
-            Entry<TMessage, TToken>[] entries;
-            int length = 0;
+            Action<TMessage>[] entries;
+            int i = 0;
 
             lock (RecipientsMap)
             {
@@ -189,24 +203,32 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
                  * we usually just need to pay the small overhead of copying the items. */
                 var values = Container<TMessage, TToken>.Values;
 
-                // Count the total number of recipients
+                // Count the total number of recipients (including with different tokens)
                 foreach (var pair in values)
                 {
-                    length += pair.Value.Count;
+                    i += pair.Value.Count;
                 }
 
                 // Rent the array to copy handlers to
-                entries = ArrayPool<Entry<TMessage, TToken>>.Shared.Rent(length);
+                entries = ArrayPool<Action<TMessage>>.Shared.Rent(i);
 
                 /* Copy the handlers to the local collection.
                  * Both types being enumerate expose a struct enumerator,
-                 * so we're not actually allocating the enumerator here. */
-                int i = 0;
+                 * so we're not actually allocating the enumerator here.
+                 * The array is oversized at this point, since it also includes
+                 * handlers for different tokens. We can reuse the same variable
+                 * to count the number of matching handlers to invoke later on.
+                 * This will be the array slice with valid actions in the rented buffer. */
+                i = 0;
                 foreach (var pair in values)
                 {
                     foreach (var entry in pair.Value)
                     {
-                        entries[i++] = entry;
+                        // Only select the ones with a matching token
+                        if (EqualityComparer<TToken>.Default.Equals(entry.Key, token))
+                        {
+                            entries[i++] = entry.Value;
+                        }
                     }
                 }
             }
@@ -214,17 +236,17 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
             try
             {
                 // Invoke all the necessary handlers on the local copy of entries
-                foreach (var entry in entries.AsSpan(0, length))
+                foreach (var entry in entries.AsSpan(0, i))
                 {
-                    if (EqualityComparer<TToken>.Default.Equals(token, entry.Token))
-                    {
-                        entry.Action(message);
-                    }
+                    entry(message);
                 }
             }
             finally
             {
-                ArrayPool<Entry<TMessage, TToken>>.Shared.Return(entries, true);
+                // Remove references to avoid leaks coming from the shader memory pool
+                entries.AsSpan(0, i).Clear();
+
+                ArrayPool<Action<TMessage>>.Shared.Return(entries, true);
             }
         }
 
@@ -234,6 +256,7 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
         private static class Container<TMessage, TToken>
+            where TToken : notnull, IEquatable<TToken>
         {
             /// <summary>
             /// The mapping of currently registered recipients for the combination of types
@@ -243,8 +266,8 @@ private static class Container<TMessage, TToken>
             /// registration channel specified by the token in use. Using a <see cref="DictionarySlim{TKey,TValue}"/>
             /// for the mapping allows for quick access to all the registered entries for each recipient.
             /// </summary>
-            public static readonly DictionarySlim<Recipient, List<Entry<TMessage, TToken>>> Values
-                = new DictionarySlim<Recipient, List<Entry<TMessage, TToken>>>();
+            public static readonly DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
+                = new DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>();
         }
 
         /// <summary>
@@ -299,38 +322,36 @@ public override int GetHashCode()
         /// <summary>
         /// An empty type representing a generic token with no specific value.
         /// </summary>
-        private struct Unit
-        {
-        }
-
-        /// <summary>
-        /// A type representing a pair of message and token used for registration.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
-        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
-        private readonly struct Entry<TMessage, TToken>
+        private struct Unit : IEquatable<Unit>
         {
-            /// <summary>
-            /// The <see cref="Action{T}"/> to invoke when a message is receive.
-            /// </summary>
-            public readonly Action<TMessage> Action;
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Unit other)
+            {
+                return true;
+            }
 
-            /// <summary>
-            /// The token used for the message registration.
-            /// </summary>
-            public readonly TToken Token;
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Unit;
+            }
 
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Entry{TMessage, TToken}"/> struct.
-            /// </summary>
-            /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is receive.</param>
-            /// <param name="token">The token used for the message registration.</param>
+            /// <inheritdoc/>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Entry(Action<TMessage> action, TToken token)
+            public override int GetHashCode()
             {
-                this.Action = action;
-                this.Token = token;
+                return 0;
             }
         }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
+        {
+            throw new InvalidOperationException("The target recipient has already subscribed to the target message");
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 2c1862ac2e6..2e11250adc6 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Collections.Extensions
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
     internal sealed class DictionarySlim<TKey, TValue> : IDictionary<TKey>
-        where TKey : struct, IEquatable<TKey>
+        where TKey : notnull, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
         private static readonly Entry[] InitialEntries = new Entry[1];
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
index 9ab5e595ff7..95e4c62a749 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Collections.Extensions
     /// </summary>
     /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
     internal interface IDictionary<in TKey>
-        where TKey : struct, IEquatable<TKey>
+        where TKey : notnull, IEquatable<TKey>
     {
         /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
         bool Remove(TKey key);

From 5eacb127100f970c37403617fd4d0e333f237900 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 20:09:26 +0200
Subject: [PATCH 036/595] Minor code style tweaks

---
 Microsoft.Toolkit.Mvvm/Messenger.cs | 56 ++++++++++++++---------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index da74a8c66d6..20ad8c1a685 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -85,6 +85,34 @@ public static void Register<TMessage, TToken>(object recipient, TToken token, Ac
             }
         }
 
+        /// <summary>
+        /// Unregisters a recipient from all registered messages.
+        /// </summary>
+        /// <param name="recipient">The recipient to unregister.</param>
+        public static void Unregister(object recipient)
+        {
+            lock (RecipientsMap)
+            {
+                // If the recipient has no registered messages at all, ignore
+                var key = new Recipient(recipient);
+                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+
+                if (set is null)
+                {
+                    return;
+                }
+
+                // Removes all the lists of registered handlers for the recipient
+                foreach (IDictionary<Recipient> map in set)
+                {
+                    map.Remove(key);
+                }
+
+                // Remove the associated set in the static map
+                RecipientsMap.Remove(key);
+            }
+        }
+
         /// <summary>
         /// Unregisters a recipient from messages of a given type.
         /// </summary>
@@ -143,34 +171,6 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
-        /// <summary>
-        /// Unregisters a recipient from all registered messages.
-        /// </summary>
-        /// <param name="recipient">The recipient to unregister.</param>
-        public static void Unregister(object recipient)
-        {
-            lock (RecipientsMap)
-            {
-                // If the recipient has no registered messages at all, ignore
-                var key = new Recipient(recipient);
-                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
-
-                if (set is null)
-                {
-                    return;
-                }
-
-                // Removes all the lists of registered handlers for the recipient
-                foreach (IDictionary<Recipient> map in set)
-                {
-                    map.Remove(key);
-                }
-
-                // Remove the associated set in the static map
-                RecipientsMap.Remove(key);
-            }
-        }
-
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
         /// </summary>

From ae6ff2400160bb3ddf2c5f426af322ce7d046cf4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 20:13:45 +0200
Subject: [PATCH 037/595] Added DictionarySlim<TKey, TValue>.ContainsKey method

---
 .../DictionarySlim{TKey,TValue}.cs            | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 2e11250adc6..917e96843db 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -60,15 +60,21 @@ public DictionarySlim()
         /// </summary>
         public int Count => _count;
 
-        /// <summary>
-        /// Clears the dictionary. Note that this invalidates any active enumerators.
-        /// </summary>
-        public void Clear()
+        /// <inheritdoc cref="Dictionary{TKey,TValue}.ContainsKey"/>
+        public bool ContainsKey(TKey key)
         {
-            _count = 0;
-            _freeList = -1;
-            _buckets = new int[1];
-            _entries = InitialEntries;
+            Entry[] entries = _entries;
+
+            for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+                (uint)i < (uint)entries.Length; i = entries[i].Next)
+            {
+                if (key.Equals(entries[i].Key))
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         /// <inheritdoc/>
@@ -77,8 +83,8 @@ public bool Remove(TKey key)
             Entry[] entries = _entries;
             int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
             int entryIndex = _buckets[bucketIndex] - 1;
-
             int lastIndex = -1;
+
             while (entryIndex != -1)
             {
                 Entry candidate = entries[entryIndex];
@@ -122,7 +128,8 @@ public ref TValue GetOrAddValueRef(TKey key)
             int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
 
             for (int i = _buckets[bucketIndex] - 1;
-                    (uint)i < (uint)entries.Length; i = entries[i].Next)
+                 (uint)i < (uint)entries.Length;
+                 i = entries[i].Next)
             {
                 if (key.Equals(entries[i].Key))
                 {
@@ -138,6 +145,7 @@ private ref TValue AddKey(TKey key, int bucketIndex)
         {
             Entry[] entries = _entries;
             int entryIndex;
+
             if (_freeList != -1)
             {
                 entryIndex = _freeList;
@@ -172,7 +180,7 @@ private Entry[] Resize()
             int count = _count;
             int newSize = _entries.Length * 2;
 
-            if ((uint)newSize > (uint)int.MaxValue)
+            if ((uint)newSize > int.MaxValue)
             {
                 throw new InvalidOperationException("Max capacity exceeded");
             }

From 0f7f2ac716e02b8534b8cd5fb18adcfda369aa36 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 20:15:56 +0200
Subject: [PATCH 038/595] Added Messenger.IsRegistered methods

---
 Microsoft.Toolkit.Mvvm/Messenger.cs | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 20ad8c1a685..c27ec01560a 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
 
@@ -27,6 +28,39 @@ public static class Messenger
         private static readonly DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>> RecipientsMap
             = new DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>>();
 
+        /// <summary>
+        /// Checks whether or not a given recipient has already been registered for a message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
+        /// <param name="recipient">The target recipient to check the registration for.</param>
+        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        [Pure]
+        public static bool IsRegistered<TMessage>(object recipient)
+        {
+            return IsRegistered<TMessage, Unit>(recipient, default);
+        }
+
+        /// <summary>
+        /// Checks whether or not a given recipient has already been registered for a message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
+        /// <typeparam name="TToken">The type of token to check the channel for.</typeparam>
+        /// <param name="recipient">The target recipient to check the registration for.</param>
+        /// <param name="token">The token used to identify the target channel to check.</param>
+        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        [Pure]
+        public static bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
+            where TToken : notnull, IEquatable<TToken>
+        {
+            lock (RecipientsMap)
+            {
+                var values = Container<TMessage, TToken>.Values;
+                var key = new Recipient(recipient);
+
+                return values.ContainsKey(key);
+            }
+        }
+
         /// <summary>
         /// Registers a recipient for a given type of message.
         /// </summary>

From d0b110bdf23e05d02e8650749aebd468caa61973 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 22:18:47 +0200
Subject: [PATCH 039/595] Added IReadOnlyDictionary<in TKey, out TValue>
 interface

---
 .../DictionarySlim{TKey,TValue}.cs            | 34 ++++++++++++++++++-
 .../IReadOnlyDictionary{TKey,TValue}.cs       | 25 ++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 917e96843db..5d1be4ed294 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue> : IDictionary<TKey>
+    internal sealed class DictionarySlim<TKey, TValue> : IDictionary<TKey>, IReadOnlyDictionary<TKey, TValue>
         where TKey : notnull, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
@@ -60,6 +60,29 @@ public DictionarySlim()
         /// </summary>
         public int Count => _count;
 
+        /// <inheritdoc/>
+        public TValue this[TKey key]
+        {
+            get
+            {
+                Entry[] entries = _entries;
+
+                for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+                    (uint)i < (uint)entries.Length;
+                    i = entries[i].Next)
+                {
+                    if (key.Equals(entries[i].Key))
+                    {
+                        return entries[i].Value;
+                    }
+                }
+
+                ThrowArgumentExceptionForKeyNotFound(key);
+
+                return default!;
+            }
+        }
+
         /// <inheritdoc cref="Dictionary{TKey,TValue}.ContainsKey"/>
         public bool ContainsKey(TKey key)
         {
@@ -250,5 +273,14 @@ public bool MoveNext()
             /// <inheritdoc cref="IEnumerator{T}.Current"/>
             public KeyValuePair<TKey, TValue> Current => _current;
         }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when trying to load an element with a missing key.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowArgumentExceptionForKeyNotFound(TKey key)
+        {
+            throw new ArgumentException($"The target key {key} was not present in the dictionary");
+        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
new file mode 100644
index 00000000000..4ecc749f735
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
@@ -0,0 +1,25 @@
+// 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;
+
+namespace Microsoft.Collections.Extensions
+{
+    /// <summary>
+    /// An interface providing value-invariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
+    /// </summary>
+    /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+    /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+    internal interface IReadOnlyDictionary<in TKey, out TValue>
+        where TKey : notnull, IEquatable<TKey>
+    {
+        /// <summary>
+        /// Gets the value with the specified key.
+        /// </summary>
+        /// <param name="key">The key to look for</param>
+        /// <returns>The returned value</returns>
+        /// <exception cref="ArgumentException">Thrown if the key wasn't present.</exception>
+        TValue this[TKey key] { get; }
+    }
+}

From 43c7202eba49b2a8aa6d70a399a2b2635b34a406 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 22:32:22 +0200
Subject: [PATCH 040/595] Fixed some XML docs

---
 .../DictionarySlim{TKey,TValue}.cs                    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 5d1be4ed294..d8a5b1b721d 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -2,11 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable SA1512
+
+// The DictionarySlim<TKey, TValue> type is originally from CoreFX labs, see
+// the source repository on GitHub at https://github.com/dotnet/corefxlab.
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Collections.Extensions
@@ -14,10 +18,9 @@ namespace Microsoft.Collections.Extensions
     /// <summary>
     /// A lightweight Dictionary with three principal differences compared to <see cref="Dictionary{TKey, TValue}"/>
     ///
-    /// 1) It is possible to do "get or add" in a single lookup using <see cref="GetOrAddValueRef(TKey)"/>. For
-    /// values that are value types, this also saves a copy of the value.
+    /// 1) It is possible to do "get or add" in a single lookup. For value types, this also saves a copy of the value.
     /// 2) It assumes it is cheap to equate values.
-    /// 3) It assumes the keys implement <see cref="IEquatable{TKey}"/> or else Equals() and they are cheap and sufficient.
+    /// 3) It assumes the keys implement <see cref="IEquatable{TKey}"/> and they are cheap and sufficient.
     /// </summary>
     /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
     /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>

From 45c794d63a1ba31333a5b8042ba6fbd01eeb43b8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 22:42:00 +0200
Subject: [PATCH 041/595] Fixed a bug with new values being created when not
 needed

---
 Microsoft.Toolkit.Mvvm/Messenger.cs           |  5 ++--
 .../DictionarySlim{TKey,TValue}.cs            | 27 +++++++++++++++++++
 .../IReadOnlyDictionary{TKey,TValue}.cs       |  4 +--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index c27ec01560a..8ec660095ca 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -174,9 +174,8 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
                 // Get the registration list (same as above)
                 var values = Container<TMessage, TToken>.Values;
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
-                if (map is null)
+                if (!values.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>> map))
                 {
                     return;
                 }
@@ -193,7 +192,7 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
                 {
                     values.Remove(key);
 
-                    ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+                    HashSet<IDictionary<Recipient>> set = RecipientsMap[key];
 
                     set.Remove(values);
 
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index d8a5b1b721d..b1b2f299cad 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -103,6 +103,33 @@ public bool ContainsKey(TKey key)
             return false;
         }
 
+        /// <summary>
+        /// Gets the value if present for the specified key.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <param name="value">The value found, otherwise <see langword="default"/>.</param>
+        /// <returns>Whether or not the key was present.</returns>
+        public bool TryGetValue(TKey key, out TValue value)
+        {
+            Entry[] entries = _entries;
+
+            for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+                 (uint)i < (uint)entries.Length;
+                 i = entries[i].Next)
+            {
+                if (key.Equals(entries[i].Key))
+                {
+                    value = entries[i].Value;
+
+                    return true;
+                }
+            }
+
+            value = default!;
+
+            return false;
+        }
+
         /// <inheritdoc/>
         public bool Remove(TKey key)
         {
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
index 4ecc749f735..4fffd657f1b 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
@@ -17,8 +17,8 @@ internal interface IReadOnlyDictionary<in TKey, out TValue>
         /// <summary>
         /// Gets the value with the specified key.
         /// </summary>
-        /// <param name="key">The key to look for</param>
-        /// <returns>The returned value</returns>
+        /// <param name="key">The key to look for.</param>
+        /// <returns>The returned value.</returns>
         /// <exception cref="ArgumentException">Thrown if the key wasn't present.</exception>
         TValue this[TKey key] { get; }
     }

From 6c68dcfcf57b95f9c9fccd4789ba0e33844e8a6c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Apr 2020 23:02:39 +0200
Subject: [PATCH 042/595] Renamed some interfaces to avoid naming collisions

---
 Microsoft.Toolkit.Mvvm/Messenger.cs                | 14 +++++++-------
 .../DictionarySlim{TKey,TValue}.cs                 |  2 +-
 ...,TValue}.cs => IDictionarySlim{TKey,TValue}.cs} |  9 +++++----
 ...ictionary{TKey}.cs => IDictionarySlim{TKey}.cs} |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/{IReadOnlyDictionary{TKey,TValue}.cs => IDictionarySlim{TKey,TValue}.cs} (63%)
 rename Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/{IDictionary{TKey}.cs => IDictionarySlim{TKey}.cs} (65%)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 8ec660095ca..069885cb6bd 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -25,8 +25,8 @@ public static class Messenger
         /// existing handlers can be removed without having to dynamically create the
         /// generic types for the containers of the various dictionaries mapping the handlers.
         /// </remarks>
-        private static readonly DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>> RecipientsMap
-            = new DictionarySlim<Recipient, HashSet<IDictionary<Recipient>>>();
+        private static readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> RecipientsMap
+            = new DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>();
 
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
@@ -108,11 +108,11 @@ public static void Register<TMessage, TToken>(object recipient, TToken token, Ac
                 handler = action;
 
                 // Make sure this registration map is tracked for the current recipient
-                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionarySlim<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
 
                 if (set is null)
                 {
-                    set = new HashSet<IDictionary<Recipient>>();
+                    set = new HashSet<IDictionarySlim<Recipient>>();
                 }
 
                 set.Add(values);
@@ -129,7 +129,7 @@ public static void Unregister(object recipient)
             {
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
-                ref HashSet<IDictionary<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionarySlim<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
 
                 if (set is null)
                 {
@@ -137,7 +137,7 @@ public static void Unregister(object recipient)
                 }
 
                 // Removes all the lists of registered handlers for the recipient
-                foreach (IDictionary<Recipient> map in set)
+                foreach (IDictionarySlim<Recipient> map in set)
                 {
                     map.Remove(key);
                 }
@@ -192,7 +192,7 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
                 {
                     values.Remove(key);
 
-                    HashSet<IDictionary<Recipient>> set = RecipientsMap[key];
+                    HashSet<IDictionarySlim<Recipient>> set = RecipientsMap[key];
 
                     set.Remove(values);
 
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index b1b2f299cad..59039a084ba 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -32,7 +32,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue> : IDictionary<TKey>, IReadOnlyDictionary<TKey, TValue>
+    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey>, IDictionarySlim<TKey, TValue>
         where TKey : notnull, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
similarity index 63%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
rename to Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index 4fffd657f1b..79dc6350f79 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IReadOnlyDictionary{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -7,11 +7,12 @@
 namespace Microsoft.Collections.Extensions
 {
     /// <summary>
-    /// An interface providing value-invariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
+    /// An interface providing key type contravariant and value type covariant access
+    /// to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
     /// </summary>
-    /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-    /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-    internal interface IReadOnlyDictionary<in TKey, out TValue>
+    /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
+    /// <typeparam name="TValue">The covariant type of values in the dictionary.</typeparam>
+    internal interface IDictionarySlim<in TKey, out TValue>
         where TKey : notnull, IEquatable<TKey>
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
similarity index 65%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
rename to Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 95e4c62a749..bd41933f0a8 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionary{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -8,10 +8,10 @@
 namespace Microsoft.Collections.Extensions
 {
     /// <summary>
-    /// An interface providing value-invariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
+    /// An interface providing key type contravariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
     /// </summary>
-    /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-    internal interface IDictionary<in TKey>
+    /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
+    internal interface IDictionarySlim<in TKey>
         where TKey : notnull, IEquatable<TKey>
     {
         /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>

From 852e85e2c1053ba0beca50110e2c859e9690e31e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 00:15:05 +0200
Subject: [PATCH 043/595] Added Messenger.Unregister<TToken>() method

---
 Microsoft.Toolkit.Mvvm/Messenger.cs           | 86 ++++++++++++++++++-
 .../DictionarySlim{TKey,TValue}.cs            |  6 +-
 .../IDictionarySlim{TKey,TValue}.cs           |  2 +-
 .../IDictionarySlim{TKey}.cs                  |  5 ++
 4 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 069885cb6bd..40fc41aee27 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -158,6 +158,90 @@ public static void Unregister<TMessage>(object recipient)
             Unregister<TMessage, Unit>(recipient, default);
         }
 
+        /// <summary>
+        /// Unregisters a recipient from messages on a specific channel.
+        /// </summary>
+        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <param name="token">The token to use to identify which handlers to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        public static void Unregister<TToken>(object recipient, TToken token)
+            where TToken : notnull, IEquatable<TToken>
+        {
+            lock (RecipientsMap)
+            {
+                // Get the shared set of mappings for the recipient, if present
+                var key = new Recipient(recipient);
+
+                if (!RecipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
+                {
+                    return;
+                }
+
+                /* Copy the candidate mappings for the target recipient to a local
+                 * array, as we can't modify the contents of the set while iterating it.
+                 * The rented buffer is oversized and will also include mappings for
+                 * handlers of messages that are registered through a different token. */
+                var maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set.Count);
+                int i = 0;
+
+                try
+                {
+                    // Select the items with the same token type
+                    foreach (IDictionarySlim<Recipient> item in set)
+                    {
+                        if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> map)
+                        {
+                            maps[i++] = map;
+                        }
+                    }
+
+                    /* Iterate through all the local maps. These are all the currently
+                     * existing maps of handlers for messages of any given type, with a token
+                     * of the current type, for the target recipient. We heavily rely on
+                     * interfaces here to be able to iterate through all the available mappings
+                     * without having to know the concrete type in advance, and without having
+                     * to deal with reflection: we can just check if the type of the closed interface
+                     * matches with the token type currently in use, and operate on those instances. */
+                    foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
+                    {
+                        IDictionarySlim<TToken> holder = map[key];
+
+                        /* Remove the registered handler for the input token,
+                         * for the current message type (unknown from here). */
+                        holder.Remove(token);
+
+                        if (holder.Count == 0)
+                        {
+                            // If the map is empty, remove the recipient entirely from its container
+                            map.Remove(key);
+
+                            if (map.Count == 0)
+                            {
+                                /* If no handlers are left at all for the recipient, across all
+                                 * message types and token types, remove the set of mappings
+                                 * entirely for the current recipient, and lost the strong
+                                 * reference to it as well. This is the same situation that
+                                 * would've been achieved by just calling Unregister(recipient). */
+                                set.Remove(map);
+
+                                if (set.Count == 0)
+                                {
+                                    RecipientsMap.Remove(key);
+                                }
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    maps.AsSpan(0, i).Clear();
+
+                    ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Return(maps);
+                }
+            }
+        }
+
         /// <summary>
         /// Unregisters a recipient from messages of a given type.
         /// </summary>
@@ -279,7 +363,7 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
                 // Remove references to avoid leaks coming from the shader memory pool
                 entries.AsSpan(0, i).Clear();
 
-                ArrayPool<Action<TMessage>>.Shared.Return(entries, true);
+                ArrayPool<Action<TMessage>>.Shared.Return(entries);
             }
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 59039a084ba..589a073a931 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -32,7 +32,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey>, IDictionarySlim<TKey, TValue>
+    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : notnull, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
@@ -58,9 +58,7 @@ public DictionarySlim()
             _entries = InitialEntries;
         }
 
-        /// <summary>
-        /// Gets the count of entries in the dictionary.
-        /// </summary>
+        /// <inheritdoc/>
         public int Count => _count;
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index 79dc6350f79..106cf8daf5f 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Collections.Extensions
     /// </summary>
     /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
     /// <typeparam name="TValue">The covariant type of values in the dictionary.</typeparam>
-    internal interface IDictionarySlim<in TKey, out TValue>
+    internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
         where TKey : notnull, IEquatable<TKey>
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index bd41933f0a8..33fcfec7adc 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -14,6 +14,11 @@ namespace Microsoft.Collections.Extensions
     internal interface IDictionarySlim<in TKey>
         where TKey : notnull, IEquatable<TKey>
     {
+        /// <summary>
+        /// Gets the count of entries in the dictionary.
+        /// </summary>
+        int Count { get; }
+
         /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
         bool Remove(TKey key);
     }

From 3af3aff993f035304c91def72c3dc39f7d6cba9e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 00:54:26 +0200
Subject: [PATCH 044/595] Added more comments in the Messenger class

---
 Microsoft.Toolkit.Mvvm/Messenger.cs | 30 ++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index 40fc41aee27..b8b63b74258 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -16,14 +16,38 @@ namespace Microsoft.Toolkit.Mvvm
     /// </summary>
     public static class Messenger
     {
+        // The Messenger class uses the following logic to link stored instances together:
+        // --------------------------------------------------------------------------------------------------------
+        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> RecipientsMap
+        //                    |                  /       \    /
+        //                    \_________________/_____    \__/____[*]IDictionarySlim<Recipient, Token>
+        //                                     /      \     /                      ______________/
+        //                                    /        \   /                      /
+        // Container<TMessage, TToken>.DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
+        // --------------------------------------------------------------------------------------------------------
+        // Each combination of <TMessage, TToken> results in a concrete Container<,> type, which holds the
+        // mapping to registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
+        // dictionary, so that each recipient can have up to one registered handler for a given token, for each
+        // message type. Each existing recipient is also stored in the main recipients map, along with a set of
+        // all the existing dictionaries of handlers for that recipient (for all message types and token types).
+        // A recipient is stored in the main map as long as it has at least one registered handler in any of the
+        // existing mappings for every message/token type combination. The shared map is used to access the set
+        // of all registered handlers for a given recipient, without having to know in advance the type of message
+        // or token being used for the registration, and without having to use reflection. Note that each dictionary
+        // stored in the associated set for each recipient also implements IDictionarySlim<Recipient, Token>, with
+        // any token type currently in use by that recipient. This allows to retrieve the type-closed mappings
+        // of registered handlers with a given token type, for any message type, for every receiver, again without
+        // having to use reflection. This shared map is used to unregister messages from a given recipients either
+        // unconditionally, by message type, by token, or for a specific pair of message type and token value.
+
         /// <summary>
         /// The collection of currently registered recipients, with a link to their linked message receivers.
         /// </summary>
         /// <remarks>
         /// This collection is used to allow reflection-free access to all the existing
-        /// registered recipients from <see cref="Unregister(object)"/>, so that all the
-        /// existing handlers can be removed without having to dynamically create the
-        /// generic types for the containers of the various dictionaries mapping the handlers.
+        /// registered recipients from <see cref="Unregister(object)"/> and other overloads,
+        /// so that all the existing handlers can be removed without having to dynamically create
+        /// the generic types for the containers of the various dictionaries mapping the handlers.
         /// </remarks>
         private static readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> RecipientsMap
             = new DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>();

From ea68036dc73079d34599a53ad55c26efd5cec726 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 01:05:49 +0200
Subject: [PATCH 045/595] Added DictionarySlim<TKey, TValue>.Clear method

---
 .../DictionarySlim{TKey,TValue}.cs              | 14 ++++++++++++--
 .../HashHelpers.cs                              | 17 +++++++++++++++++
 .../IDictionarySlim{TKey}.cs                    |  5 +++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 589a073a931..62f442ec8e9 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -54,7 +54,7 @@ private struct Entry
         /// </summary>
         public DictionarySlim()
         {
-            _buckets = new int[1];
+            _buckets = HashHelpers.SizeOneIntArray;
             _entries = InitialEntries;
         }
 
@@ -84,13 +84,23 @@ public TValue this[TKey key]
             }
         }
 
+        /// <inheritdoc/>
+        public void Clear()
+        {
+            _count = 0;
+            _freeList = -1;
+            _buckets = HashHelpers.SizeOneIntArray;
+            _entries = InitialEntries;
+        }
+
         /// <inheritdoc cref="Dictionary{TKey,TValue}.ContainsKey"/>
         public bool ContainsKey(TKey key)
         {
             Entry[] entries = _entries;
 
             for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
-                (uint)i < (uint)entries.Length; i = entries[i].Next)
+                 (uint)i < (uint)entries.Length;
+                 i = entries[i].Next)
             {
                 if (key.Equals(entries[i].Key))
                 {
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs
new file mode 100644
index 00000000000..14fb3abe766
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs
@@ -0,0 +1,17 @@
+// 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.Collections.Extensions
+{
+    /// <summary>
+    /// A helper class for <see cref="DictionarySlim{TKey,TValue}"/>.
+    /// </summary>
+    internal static class HashHelpers
+    {
+        /// <summary>
+        /// Gets an array of type <see cref="int"/> of size 1.
+        /// </summary>
+        internal static readonly int[] SizeOneIntArray = new int[1];
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 33fcfec7adc..c9cf27067ba 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -21,5 +21,10 @@ internal interface IDictionarySlim<in TKey>
 
         /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
         bool Remove(TKey key);
+
+        /// <summary>
+        /// Clears the current dictionary.
+        /// </summary>
+        void Clear();
     }
 }

From 7ab96f3dd4749a5c36f2e878ed0c76a580babccd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 01:08:42 +0200
Subject: [PATCH 046/595] Added Messenger.Reset method

---
 Microsoft.Toolkit.Mvvm/Messenger.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messenger.cs
index b8b63b74258..745328fd369 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messenger.cs
@@ -391,6 +391,27 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
             }
         }
 
+        /// <summary>
+        /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
+        /// </summary>
+        public static void Reset()
+        {
+            lock (RecipientsMap)
+            {
+                foreach (var pair in RecipientsMap)
+                {
+                    // Clear all the typed maps, as they're assigned to static fields
+                    foreach (var map in pair.Value)
+                    {
+                        map.Clear();
+                    }
+                }
+
+                // Clear the shared map too
+                RecipientsMap.Clear();
+            }
+        }
+
         /// <summary>
         /// A container class for registered recipients.
         /// </summary>

From 6dc71d0188c8f4b159d5d44a1c2757313ddd5c27 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 01:45:50 +0200
Subject: [PATCH 047/595] Added initial Messenger unit tests

---
 UnitTests/Mvvm/Test_Messenger.cs | 99 ++++++++++++++++++++++++++++++++
 UnitTests/UnitTests.csproj       |  1 +
 2 files changed, 100 insertions(+)
 create mode 100644 UnitTests/Mvvm/Test_Messenger.cs

diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
new file mode 100644
index 00000000000..df046747fa1
--- /dev/null
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -0,0 +1,99 @@
+// 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 Microsoft.Toolkit.Mvvm;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_Messenger
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken()
+        {
+            object a = new object();
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+
+            string result = null;
+            Messenger.Register<MessageA>(a, m => result = m.Text);
+
+            Assert.IsTrue(Messenger.IsRegistered<MessageA>(a));
+
+            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+
+            Assert.AreEqual(result, nameof(MessageA));
+
+            Messenger.Unregister<MessageA>(a);
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+
+            result = null;
+            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+
+            Assert.IsNull(result);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken()
+        {
+            object a = new object();
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+
+            string result = null;
+            Messenger.Register<MessageA>(a, m => result = m.Text);
+
+            Assert.IsTrue(Messenger.IsRegistered<MessageA>(a));
+
+            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+
+            Assert.AreEqual(result, nameof(MessageA));
+
+            Messenger.Unregister(a);
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+
+            result = null;
+            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+
+            Assert.IsNull(result);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
+        {
+            object a = new object();
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+
+            string result = null;
+            Messenger.Register<MessageA, string>(a, nameof(MessageA), m => result = m.Text);
+
+            Assert.IsTrue(Messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+
+            Messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+
+            Assert.AreEqual(result, nameof(MessageA));
+
+            Messenger.Unregister<MessageA, string>(a, nameof(MessageA));
+
+            Assert.IsFalse(Messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+
+            result = null;
+            Messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+
+            Assert.IsNull(result);
+        }
+
+        public sealed class MessageA
+        {
+            public string Text;
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 51926253c1a..f947137c2aa 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
+    <Compile Include="Mvvm\Test_Messenger.cs" />
     <Compile Include="Mvvm\Test_Ioc.cs" />
     <Compile Include="Helpers\Test_ColorHelper.cs" />
     <Compile Include="Helpers\Test_ConnectionHelper.cs" />

From 8c2cced5eae67de5b1933fd8ef2093b47ae6f27a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 02:25:41 +0200
Subject: [PATCH 048/595] Minor code style tweaks

---
 UnitTests/Mvvm/Test_Messenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index df046747fa1..21e0f2e8346 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -93,7 +93,7 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
 
         public sealed class MessageA
         {
-            public string Text;
+            public string Text { get; set; }
         }
     }
 }

From bca38f5760fb22fb6c3404e31fcc487125b0e5ff Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 13:03:11 +0200
Subject: [PATCH 049/595] Code refactoring

---
 Microsoft.Toolkit.Mvvm/{ => Messaging}/Messenger.cs             | 2 +-
 .../DictionarySlim{TKey,TValue}.cs                              | 0
 .../Microsoft.Collections.Extensions/HashHelpers.cs             | 0
 .../IDictionarySlim{TKey,TValue}.cs                             | 0
 .../Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs   | 0
 UnitTests/Mvvm/Test_Messenger.cs                                | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{ => Messaging}/Messenger.cs (99%)
 rename Microsoft.Toolkit.Mvvm/{ => Messaging}/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{ => Messaging}/Microsoft.Collections.Extensions/HashHelpers.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{ => Messaging}/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{ => Messaging}/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs (100%)

diff --git a/Microsoft.Toolkit.Mvvm/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/Messenger.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 745328fd369..60ba2d5e132 100644
--- a/Microsoft.Toolkit.Mvvm/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -9,7 +9,7 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.Messaging
 {
     /// <summary>
     /// A type implementing a messaging system between objects.
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/HashHelpers.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index 21e0f2e8346..fd44a47fdf3 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -2,7 +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 Microsoft.Toolkit.Mvvm;
+using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm

From de0d2ba607f479b2036535a27dfd56037b80b7d8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 13:23:32 +0200
Subject: [PATCH 050/595] Added Messenger APIs with no input message

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 60ba2d5e132..e77b1821c3b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -60,6 +60,7 @@ private static readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipi
         /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
         [Pure]
         public static bool IsRegistered<TMessage>(object recipient)
+            where TMessage : class
         {
             return IsRegistered<TMessage, Unit>(recipient, default);
         }
@@ -74,6 +75,7 @@ public static bool IsRegistered<TMessage>(object recipient)
         /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
         [Pure]
         public static bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             lock (RecipientsMap)
@@ -93,6 +95,7 @@ public static bool IsRegistered<TMessage, TToken>(object recipient, TToken token
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         public static void Register<TMessage>(object recipient, Action<TMessage> action)
+            where TMessage : class
         {
             Register(recipient, default(Unit), action);
         }
@@ -107,6 +110,7 @@ public static void Register<TMessage>(object recipient, Action<TMessage> action)
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         public static void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+            where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             lock (RecipientsMap)
@@ -178,6 +182,7 @@ public static void Unregister(object recipient)
         /// <param name="recipient">The recipient to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         public static void Unregister<TMessage>(object recipient)
+            where TMessage : class
         {
             Unregister<TMessage, Unit>(recipient, default);
         }
@@ -275,6 +280,7 @@ public static void Unregister<TToken>(object recipient, TToken token)
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         public static void Unregister<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             lock (RecipientsMap)
@@ -312,16 +318,49 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <remarks>
+        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
+        /// message type exposes a parameterless constructor: it will automatically create
+        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
+        /// </remarks>
+        public static void Send<TMessage>()
+            where TMessage : class, new()
+        {
+            Send(new TMessage(), default(Unit));
+        }
+
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
         /// </summary>
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <param name="message">The message to send.</param>
         public static void Send<TMessage>(TMessage message)
+            where TMessage : class
         {
             Send(message, default(Unit));
         }
 
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <remarks>
+        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
+        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
+        /// </remarks>
+        public static void Send<TMessage, TToken>(TToken token)
+            where TMessage : class, new()
+            where TToken : notnull, IEquatable<TToken>
+        {
+            Send(new TMessage(), token);
+        }
+
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
         /// </summary>
@@ -330,6 +369,7 @@ public static void Send<TMessage>(TMessage message)
         /// <param name="message">The message to send.</param>
         /// <param name="token">The token indicating what channel to use.</param>
         public static void Send<TMessage, TToken>(TMessage message, TToken token)
+            where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             Action<TMessage>[] entries;
@@ -418,6 +458,7 @@ public static void Reset()
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
         private static class Container<TMessage, TToken>
+            where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             /// <summary>

From 6d22101d87d2d14a155d55925dab85f36b54b0ee Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 14:07:35 +0200
Subject: [PATCH 051/595] Added RequestMessageBase<T> type

---
 .../Messages/RequestMessageBase{T}.cs         | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs
new file mode 100644
index 00000000000..522c9cc6575
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Runtime.CompilerServices;
+
+#pragma warning disable CS8618
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A base <see langword="class"/> for request messages.
+    /// </summary>
+    /// <typeparam name="T">The type of request to make.</typeparam>
+    public abstract class RequestMessageBase<T>
+    {
+        /// <summary>
+        /// An <see cref="object"/> used to synchronize access to <see cref="Result"/> and <see cref="ReportResult"/>.
+        /// </summary>
+        private readonly object dummy = new object();
+
+        private T result;
+
+        /// <summary>
+        /// Gets the message response.
+        /// </summary>
+        public T Result
+        {
+            get
+            {
+                lock (this.dummy)
+                {
+                    if (!this.IsResponseReceived)
+                    {
+                        ThrowInvalidOperationExceptionForDuplicateReporResult();
+                    }
+
+                    return this.result;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a result has already been assigned to this instance.
+        /// </summary>
+        public bool IsResponseReceived { get; private set; }
+
+        /// <summary>
+        /// Reports a result for the current request message.
+        /// </summary>
+        /// <param name="result">The result to report for the message.</param>
+        public void ReportResult(T result)
+        {
+            lock (this.dummy)
+            {
+                if (this.IsResponseReceived)
+                {
+                    ThrowInvalidOperationExceptionForDuplicateReporResult();
+                }
+
+                this.IsResponseReceived = true;
+                this.result = result;
+            }
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when <see cref="ReportResult"/> is called twice.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForDuplicateReporResult()
+        {
+            throw new InvalidOperationException("A result has already been reported for the current message");
+        }
+    }
+}

From 2cd0a2017a993e5cce7972c4b4276f35ee9ae0af Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 14:17:50 +0200
Subject: [PATCH 052/595] Added Messenger request methods

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index e77b1821c3b..dcae86fb08e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -431,6 +432,82 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
             }
         }
 
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        /// <remarks>
+        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
+        /// message type exposes a parameterless constructor: it will automatically create
+        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
+        /// </remarks>
+        public static TResult Request<TMessage, TResult>()
+            where TMessage : RequestMessageBase<TResult>, new()
+        {
+            return Request<TMessage, TResult, Unit>(new TMessage(), default);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <param name="message">The message to send.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        public static TResult Request<TMessage, TResult>(TMessage message)
+            where TMessage : RequestMessageBase<TResult>
+        {
+            return Request<TMessage, TResult, Unit>(message, default);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        /// <remarks>
+        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
+        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
+        /// </remarks>
+        public static TResult Request<TMessage, TResult, TToken>(TToken token)
+            where TMessage : RequestMessageBase<TResult>, new()
+            where TToken : notnull, IEquatable<TToken>
+        {
+            return Request<TMessage, TResult, TToken>(new TMessage(), token);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="message">The request message to send.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        public static TResult Request<TMessage, TResult, TToken>(TMessage message, TToken token)
+            where TMessage : RequestMessageBase<TResult>
+            where TToken : notnull, IEquatable<TToken>
+        {
+            Send(message, token);
+
+            if (!message.IsResponseReceived)
+            {
+                ThrowInvalidOperationExceptionForNoResponseReceived();
+            }
+
+            return message.Result;
+        }
+
         /// <summary>
         /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
         /// </summary>
@@ -556,5 +633,14 @@ private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
         {
             throw new InvalidOperationException("The target recipient has already subscribed to the target message");
         }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
+        {
+            throw new InvalidOperationException("No response was received for the given request message");
+        }
     }
 }

From 595474c905f012db9300111d478cd26136250b55 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 14:24:44 +0200
Subject: [PATCH 053/595] Minor code refactoring

---
 .../{RequestMessageBase{T}.cs => RequestMessage{T}.cs}    | 4 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/Messages/{RequestMessageBase{T}.cs => RequestMessage{T}.cs} (93%)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
similarity index 93%
rename from Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index 522c9cc6575..37d29fdc9e4 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessageBase{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
@@ -6,10 +6,10 @@
 namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
 {
     /// <summary>
-    /// A base <see langword="class"/> for request messages.
+    /// A <see langword="class"/> for request messages, which can either be used directly or through derived classes.
     /// </summary>
     /// <typeparam name="T">The type of request to make.</typeparam>
-    public abstract class RequestMessageBase<T>
+    public class RequestMessage<T>
     {
         /// <summary>
         /// An <see cref="object"/> used to synchronize access to <see cref="Result"/> and <see cref="ReportResult"/>.
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index dcae86fb08e..12c5eb2e0ad 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -445,7 +445,7 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
         /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
         /// </remarks>
         public static TResult Request<TMessage, TResult>()
-            where TMessage : RequestMessageBase<TResult>, new()
+            where TMessage : RequestMessage<TResult>, new()
         {
             return Request<TMessage, TResult, Unit>(new TMessage(), default);
         }
@@ -459,7 +459,7 @@ public static TResult Request<TMessage, TResult>()
         /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
         /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
         public static TResult Request<TMessage, TResult>(TMessage message)
-            where TMessage : RequestMessageBase<TResult>
+            where TMessage : RequestMessage<TResult>
         {
             return Request<TMessage, TResult, Unit>(message, default);
         }
@@ -478,7 +478,7 @@ public static TResult Request<TMessage, TResult>(TMessage message)
         /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
         /// </remarks>
         public static TResult Request<TMessage, TResult, TToken>(TToken token)
-            where TMessage : RequestMessageBase<TResult>, new()
+            where TMessage : RequestMessage<TResult>, new()
             where TToken : notnull, IEquatable<TToken>
         {
             return Request<TMessage, TResult, TToken>(new TMessage(), token);
@@ -495,7 +495,7 @@ public static TResult Request<TMessage, TResult, TToken>(TToken token)
         /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
         /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
         public static TResult Request<TMessage, TResult, TToken>(TMessage message, TToken token)
-            where TMessage : RequestMessageBase<TResult>
+            where TMessage : RequestMessage<TResult>
             where TToken : notnull, IEquatable<TToken>
         {
             Send(message, token);

From 82bf497ad691604b3403787d2b2a4360a999e183 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 14:31:37 +0200
Subject: [PATCH 054/595] Added PropertyChangedMessage<T> type

---
 .../Messages/PropertyChangedMessage{T}.cs     | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
new file mode 100644
index 00000000000..8b0f57fc2e0
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -0,0 +1,66 @@
+// 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.
+
+#pragma warning disable SA1512
+
+// Original file header:
+// ****************************************************************************
+// <copyright file="PropertyChangedMessage`1.cs" company="GalaSoft Laurent Bugnion">
+// Copyright © GalaSoft Laurent Bugnion 2009-2016
+// </copyright>
+// ****************************************************************************
+// <author>Laurent Bugnion</author>
+// <email>laurent@galasoft.ch</email>
+// <date>13.4.2009</date>
+// <project>GalaSoft.MvvmLight.Messaging</project>
+// <web>http://www.mvvmlight.net</web>
+// <license>
+// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
+// </license>
+// ****************************************************************************
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A message used to broadcast property changes in observable objects.
+    /// </summary>
+    /// <typeparam name="T">The type of the property to broadcast the change for.</typeparam>
+    public class PropertyChangedMessage<T>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PropertyChangedMessage{T}"/> class.
+        /// </summary>
+        /// <param name="sender">The original sender of the broadcast message.</param>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        /// <param name="oldValue">The value that the property had before the change.</param>
+        /// <param name="newValue">The value that the property has after the change.</param>
+        public PropertyChangedMessage(object sender, string propertyName, T oldValue, T newValue)
+        {
+            this.Sender = sender;
+            this.PropertyName = propertyName;
+            this.OldValue = oldValue;
+            this.NewValue = newValue;
+        }
+
+        /// <summary>
+        /// Gets the original sender of the broadcast message.
+        /// </summary>
+        public object Sender { get; }
+
+        /// <summary>
+        /// Gets the name of the property that changed.
+        /// </summary>
+        public string PropertyName { get; }
+
+        /// <summary>
+        /// Gets the value that the property had before the change.
+        /// </summary>
+        public T OldValue { get; }
+
+        /// <summary>
+        /// Gets the value that the property has after the change.
+        /// </summary>
+        public T NewValue { get; }
+    }
+}
\ No newline at end of file

From 82946f9841a82d6310f1b440add7ad290bdbbc9b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 15:34:17 +0200
Subject: [PATCH 055/595] Added ViewModelBase class

---
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs | 132 ++++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/ViewModelBase.cs

diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
new file mode 100644
index 00000000000..4e1ddd293d9
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -0,0 +1,132 @@
+// 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.
+
+#pragma warning disable SA1512
+
+// Original file header:
+// ****************************************************************************
+// <copyright file="ViewModelBase.cs" company="GalaSoft Laurent Bugnion">
+// Copyright © GalaSoft Laurent Bugnion 2009-2016
+// </copyright>
+// ****************************************************************************
+// <author>Laurent Bugnion</author>
+// <email>laurent@galasoft.ch</email>
+// <date>22.4.2009</date>
+// <project>GalaSoft.MvvmLight</project>
+// <web>http://www.mvvmlight.net</web>
+// <license>
+// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
+// </license>
+// <LastBaseLevel>BL0014</LastBaseLevel>
+// ****************************************************************************
+
+using System.Runtime.CompilerServices;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+
+namespace Microsoft.Toolkit.Mvvm
+{
+    /// <summary>
+    /// A base class for viewmodels.
+    /// </summary>
+    public abstract class ViewModelBase : ObservableObject
+    {
+        private bool isActive;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the current view model is currently active.
+        /// </summary>
+        public bool IsActive
+        {
+            get => this.isActive;
+            set
+            {
+                if (Set(ref this.isActive, value))
+                {
+                    if (value)
+                    {
+                        OnActivate();
+                    }
+                    else
+                    {
+                        OnDeactivate();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raised whenever the <see cref="IsActive"/> property is set to <see langword="true"/>.
+        /// Use this method to register to messages and do other initialization for this instance.
+        /// </summary>
+        protected virtual void OnActivate()
+        {
+        }
+
+        /// <summary>
+        /// Raised whenever the <see cref="IsActive"/> property is set to <see langword="false"/>.
+        /// Use this method to unregister from messages and do general cleanup for this instance.
+        /// </summary>
+        /// <remarks>The base implementation unregisters all messages for this recipient (with no token).</remarks>
+        protected virtual void OnDeactivate()
+        {
+            Messenger.Unregister(this);
+        }
+
+        /// <summary>
+        /// Broadcasts a <see cref="PropertyChangedMessage{T}"/> with the specified
+        /// parameters, without using any particular token (so using the default channel).
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The value of the property before it changed.</param>
+        /// <param name="newValue">The value of the property after it changed.</param>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        /// <remarks>
+        /// You should override this method if you wish to customize the channel being
+        /// used to send the message (eg. if you need to use a specific token for the channel).
+        /// </remarks>
+        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
+        {
+            var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
+
+            Messenger.Send(message);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.Set{T}(ref T, T, string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method, the
+        /// <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            if (!broadcast)
+            {
+                return Set(ref field, newValue, propertyName);
+            }
+
+            T oldValue = field;
+
+            if (Set(ref field, newValue, propertyName))
+            {
+                Broadcast(oldValue, newValue, propertyName);
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file

From e549aef8ba7f52fc7c3c4f18fd9d5ce641407978 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 17:50:01 +0200
Subject: [PATCH 056/595] The Messenger class is not static anymore

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 191 +++++++++++-------
 .../DictionarySlim{TKey,TValue}.cs            |   2 +-
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs       |   4 +-
 UnitTests/Mvvm/Test_Messenger.cs              |  42 ++--
 4 files changed, 145 insertions(+), 94 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 12c5eb2e0ad..af413350680 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -15,31 +15,42 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <summary>
     /// A type implementing a messaging system between objects.
     /// </summary>
-    public static class Messenger
+    public sealed class Messenger
     {
         // The Messenger class uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
-        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> RecipientsMap
-        //                    |                  /       \    /
-        //                    \_________________/_____    \__/____[*]IDictionarySlim<Recipient, Token>
-        //                                     /      \     /                      ______________/
-        //                                    /        \   /                      /
-        // Container<TMessage, TToken>.DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
+        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap
+        //                    |                         \      /
+        //                    |                          \____/_____[*]IDictionarySlim<Recipient, Token>
+        //                    |  ____________________________/             \____
+        //                    | /                                               \
+        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
+        //                                            /               /          /
+        //                       __(T1)______________/_______________/          /
+        //                      /     ____(T2)______/                          /
+        //                     /     /                                        /
+        //                    /     /        ________(as object)_____________/
+        //                   /     /        /
+        // DictionarySlim<(Type, Type), object> typesMap;
         // --------------------------------------------------------------------------------------------------------
-        // Each combination of <TMessage, TToken> results in a concrete Container<,> type, which holds the
-        // mapping to registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
+        // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
+        // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
         // dictionary, so that each recipient can have up to one registered handler for a given token, for each
-        // message type. Each existing recipient is also stored in the main recipients map, along with a set of
-        // all the existing dictionaries of handlers for that recipient (for all message types and token types).
-        // A recipient is stored in the main map as long as it has at least one registered handler in any of the
-        // existing mappings for every message/token type combination. The shared map is used to access the set
-        // of all registered handlers for a given recipient, without having to know in advance the type of message
-        // or token being used for the registration, and without having to use reflection. Note that each dictionary
-        // stored in the associated set for each recipient also implements IDictionarySlim<Recipient, Token>, with
-        // any token type currently in use by that recipient. This allows to retrieve the type-closed mappings
-        // of registered handlers with a given token type, for any message type, for every receiver, again without
-        // having to use reflection. This shared map is used to unregister messages from a given recipients either
-        // unconditionally, by message type, by token, or for a specific pair of message type and token value.
+        // message type. Each mapping is stored in the types map, which associates to each pair of concrete types the
+        // mapping instances. Each instances is just exposed as an object, as each will be a closed type over a different
+        // combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in the main
+        // recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
+        // message types and token types). A recipient is stored in the main map as long as it has at least one
+        // registered handler in any of the existing mappings for every message/token type combination.
+        // The shared map is used to access the set of all registered handlers for a given recipient, without having
+        // to know in advance the type of message or token being used for the registration, and without having to
+        // use reflection. This is the same approach used in the types map, just with a more specific exposed reference
+        // type as in this case we have at least some partial knowledge of the generic type parameters of the mapped types.
+        // Note that each dictionary stored in the associated set for each recipient also implements
+        // IDictionarySlim<Recipient, Token>, with any token type currently in use by that recipient. This allows to retrieve
+        // the type-closed mappings of registered handlers with a given token type, for an message type, for every receiver,
+        // again without having to use reflection. This shared map is used to unregister messages from a given recipients
+        // either unconditionally, by message type, by token, or for a specific pair of message type and token value.
 
         /// <summary>
         /// The collection of currently registered recipients, with a link to their linked message receivers.
@@ -50,9 +61,25 @@ public static class Messenger
         /// so that all the existing handlers can be removed without having to dynamically create
         /// the generic types for the containers of the various dictionaries mapping the handlers.
         /// </remarks>
-        private static readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> RecipientsMap
+        private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap
             = new DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>();
 
+        /// <summary>
+        /// The <see cref="Mapping{TMessage,TToken}"/> instance for types combination.
+        /// </summary>
+        /// <remarks>
+        /// The values are just of type <see cref="object"/> as we don't know the type parameters in advance.
+        /// Each method relies on <see cref="GetMapping{TMessage,TToken}"/> to get the type-safe instance
+        /// of the <see cref="Mapping{TMessage,TToken}"/> class for each pair of generic arguments in use.
+        /// </remarks>
+        private readonly DictionarySlim<(Type, Type), object> typesMap
+            = new DictionarySlim<(Type, Type), object>();
+
+        /// <summary>
+        /// Gets the default <see cref="Messenger"/> instance.
+        /// </summary>
+        public static Messenger Default { get; } = new Messenger();
+
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
         /// </summary>
@@ -60,7 +87,7 @@ private static readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipi
         /// <param name="recipient">The target recipient to check the registration for.</param>
         /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
         [Pure]
-        public static bool IsRegistered<TMessage>(object recipient)
+        public bool IsRegistered<TMessage>(object recipient)
             where TMessage : class
         {
             return IsRegistered<TMessage, Unit>(recipient, default);
@@ -75,13 +102,13 @@ public static bool IsRegistered<TMessage>(object recipient)
         /// <param name="token">The token used to identify the target channel to check.</param>
         /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
         [Pure]
-        public static bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
+        public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
-                var values = Container<TMessage, TToken>.Values;
+                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
 
                 return values.ContainsKey(key);
@@ -95,7 +122,7 @@ public static bool IsRegistered<TMessage, TToken>(object recipient, TToken token
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        public static void Register<TMessage>(object recipient, Action<TMessage> action)
+        public void Register<TMessage>(object recipient, Action<TMessage> action)
             where TMessage : class
         {
             Register(recipient, default(Unit), action);
@@ -110,14 +137,14 @@ public static void Register<TMessage>(object recipient, Action<TMessage> action)
         /// <param name="token">A token used to determine the receiving channel to use.</param>
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        public static void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+        public void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
                 // Get the <TMessage, TToken> registration list for this recipient
-                var values = Container<TMessage, TToken>.Values;
+                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
                 ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
@@ -137,7 +164,7 @@ public static void Register<TMessage, TToken>(object recipient, TToken token, Ac
                 handler = action;
 
                 // Make sure this registration map is tracked for the current recipient
-                ref HashSet<IDictionarySlim<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionarySlim<Recipient>> set = ref this.recipientsMap.GetOrAddValueRef(key);
 
                 if (set is null)
                 {
@@ -152,13 +179,13 @@ public static void Register<TMessage, TToken>(object recipient, TToken token, Ac
         /// Unregisters a recipient from all registered messages.
         /// </summary>
         /// <param name="recipient">The recipient to unregister.</param>
-        public static void Unregister(object recipient)
+        public void Unregister(object recipient)
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
-                ref HashSet<IDictionarySlim<Recipient>> set = ref RecipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IDictionarySlim<Recipient>> set = ref this.recipientsMap.GetOrAddValueRef(key);
 
                 if (set is null)
                 {
@@ -172,7 +199,7 @@ public static void Unregister(object recipient)
                 }
 
                 // Remove the associated set in the static map
-                RecipientsMap.Remove(key);
+                this.recipientsMap.Remove(key);
             }
         }
 
@@ -182,7 +209,7 @@ public static void Unregister(object recipient)
         /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
         /// <param name="recipient">The recipient to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
-        public static void Unregister<TMessage>(object recipient)
+        public void Unregister<TMessage>(object recipient)
             where TMessage : class
         {
             Unregister<TMessage, Unit>(recipient, default);
@@ -195,15 +222,15 @@ public static void Unregister<TMessage>(object recipient)
         /// <param name="recipient">The recipient to unregister.</param>
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
-        public static void Unregister<TToken>(object recipient, TToken token)
+        public void Unregister<TToken>(object recipient, TToken token)
             where TToken : notnull, IEquatable<TToken>
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
                 // Get the shared set of mappings for the recipient, if present
                 var key = new Recipient(recipient);
 
-                if (!RecipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
                 {
                     return;
                 }
@@ -257,7 +284,7 @@ public static void Unregister<TToken>(object recipient, TToken token)
 
                                 if (set.Count == 0)
                                 {
-                                    RecipientsMap.Remove(key);
+                                    this.recipientsMap.Remove(key);
                                 }
                             }
                         }
@@ -280,14 +307,14 @@ public static void Unregister<TToken>(object recipient, TToken token)
         /// <param name="recipient">The recipient to unregister.</param>
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
-        public static void Unregister<TMessage, TToken>(object recipient, TToken token)
+        public void Unregister<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
                 // Get the registration list (same as above)
-                var values = Container<TMessage, TToken>.Values;
+                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
 
                 if (!values.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>> map))
@@ -307,13 +334,13 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
                 {
                     values.Remove(key);
 
-                    HashSet<IDictionarySlim<Recipient>> set = RecipientsMap[key];
+                    HashSet<IDictionarySlim<Recipient>> set = this.recipientsMap[key];
 
                     set.Remove(values);
 
                     if (set.Count == 0)
                     {
-                        RecipientsMap.Remove(key);
+                        this.recipientsMap.Remove(key);
                     }
                 }
             }
@@ -328,7 +355,7 @@ public static void Unregister<TMessage, TToken>(object recipient, TToken token)
         /// message type exposes a parameterless constructor: it will automatically create
         /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
         /// </remarks>
-        public static void Send<TMessage>()
+        public void Send<TMessage>()
             where TMessage : class, new()
         {
             Send(new TMessage(), default(Unit));
@@ -339,7 +366,7 @@ public static void Send<TMessage>()
         /// </summary>
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <param name="message">The message to send.</param>
-        public static void Send<TMessage>(TMessage message)
+        public void Send<TMessage>(TMessage message)
             where TMessage : class
         {
             Send(message, default(Unit));
@@ -355,7 +382,7 @@ public static void Send<TMessage>(TMessage message)
         /// This method will automatically create a new <typeparamref name="TMessage"/> instance
         /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
         /// </remarks>
-        public static void Send<TMessage, TToken>(TToken token)
+        public void Send<TMessage, TToken>(TToken token)
             where TMessage : class, new()
             where TToken : notnull, IEquatable<TToken>
         {
@@ -369,21 +396,21 @@ public static void Send<TMessage, TToken>(TToken token)
         /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
         /// <param name="message">The message to send.</param>
         /// <param name="token">The token indicating what channel to use.</param>
-        public static void Send<TMessage, TToken>(TMessage message, TToken token)
+        public void Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
             Action<TMessage>[] entries;
             int i = 0;
 
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
                 /* We need to make a local copy of the currently registered handlers,
                  * since users might try to unregister (or register) new handlers from
                  * inside one of the currently existing handlers. We can use memory pooling
                  * to reuse arrays, to minimize the average memory usage. In practice,
                  * we usually just need to pay the small overhead of copying the items. */
-                var values = Container<TMessage, TToken>.Values;
+                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
 
                 // Count the total number of recipients (including with different tokens)
                 foreach (var pair in values)
@@ -444,7 +471,7 @@ public static void Send<TMessage, TToken>(TMessage message, TToken token)
         /// message type exposes a parameterless constructor: it will automatically create
         /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
         /// </remarks>
-        public static TResult Request<TMessage, TResult>()
+        public TResult Request<TMessage, TResult>()
             where TMessage : RequestMessage<TResult>, new()
         {
             return Request<TMessage, TResult, Unit>(new TMessage(), default);
@@ -458,7 +485,7 @@ public static TResult Request<TMessage, TResult>()
         /// <param name="message">The message to send.</param>
         /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
         /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public static TResult Request<TMessage, TResult>(TMessage message)
+        public TResult Request<TMessage, TResult>(TMessage message)
             where TMessage : RequestMessage<TResult>
         {
             return Request<TMessage, TResult, Unit>(message, default);
@@ -477,7 +504,7 @@ public static TResult Request<TMessage, TResult>(TMessage message)
         /// This method will automatically create a new <typeparamref name="TMessage"/> instance
         /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
         /// </remarks>
-        public static TResult Request<TMessage, TResult, TToken>(TToken token)
+        public TResult Request<TMessage, TResult, TToken>(TToken token)
             where TMessage : RequestMessage<TResult>, new()
             where TToken : notnull, IEquatable<TToken>
         {
@@ -494,7 +521,7 @@ public static TResult Request<TMessage, TResult, TToken>(TToken token)
         /// <param name="token">The token indicating what channel to use.</param>
         /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
         /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public static TResult Request<TMessage, TResult, TToken>(TMessage message, TToken token)
+        public TResult Request<TMessage, TResult, TToken>(TMessage message, TToken token)
             where TMessage : RequestMessage<TResult>
             where TToken : notnull, IEquatable<TToken>
         {
@@ -511,11 +538,11 @@ public static TResult Request<TMessage, TResult, TToken>(TMessage message, TToke
         /// <summary>
         /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
         /// </summary>
-        public static void Reset()
+        public void Reset()
         {
-            lock (RecipientsMap)
+            lock (this.recipientsMap)
             {
-                foreach (var pair in RecipientsMap)
+                foreach (var pair in this.recipientsMap)
                 {
                     // Clear all the typed maps, as they're assigned to static fields
                     foreach (var map in pair.Value)
@@ -525,29 +552,53 @@ public static void Reset()
                 }
 
                 // Clear the shared map too
-                RecipientsMap.Clear();
+                this.recipientsMap.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Mapping{TMessage,TToken}"/> instance of currently registered recipients for the
+        /// combination of types <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>, along with
+        /// their registered actions and tokens. Each recipient has an associated <see cref="DictionarySlim{TKey,TValue}"/>
+        /// mapping each token value to a specific handler on that communication channel, if available.
+        /// Using a pair of <see cref="DictionarySlim{TKey,TValue}"/> instances for the two indirect mappings allows for
+        /// quick access to all the handlers per recipient, and to the handler per token for each recipient.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <returns>A <see cref="Mapping{TMessage,TToken}"/> instance with the requested type arguments.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
+            where TMessage : class
+            where TToken : notnull, IEquatable<TToken>
+        {
+            ref object target = ref this.typesMap.GetOrAddValueRef((typeof(TMessage), typeof(TToken)));
+
+            if (target is null)
+            {
+                target = new Mapping<TMessage, TToken>();
             }
+
+            /* This method is the only one handling values in the types map, and here we
+             * are sure that the object reference we have points to an instance of the right
+             * type. Using an unsafe cast skips two conditional branches and is faster. */
+            return Unsafe.As<Mapping<TMessage, TToken>>(target);
         }
 
         /// <summary>
-        /// A container class for registered recipients.
+        /// A mapping type representing a link to recipients and their view of handlers per communication channel.
         /// </summary>
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
-        private static class Container<TMessage, TToken>
+        /// <remarks>
+        /// This type is defined for simplicity and as a workaround for the lack of support for using type aliases
+        /// over open generic types in C# (using type aliases can only be used for concrete, closed types).
+        /// </remarks>
+        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
         {
-            /// <summary>
-            /// The mapping of currently registered recipients for the combination of types
-            /// <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>, along with
-            /// their registered actions and tokens. Each recipient has an associated <see cref="List{T}"/>
-            /// since it could have a number of handlers registered in parallel, each using a different
-            /// registration channel specified by the token in use. Using a <see cref="DictionarySlim{TKey,TValue}"/>
-            /// for the mapping allows for quick access to all the registered entries for each recipient.
-            /// </summary>
-            public static readonly DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
-                = new DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>();
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 62f442ec8e9..30173f203ed 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -32,7 +32,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
+    internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : notnull, IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 4e1ddd293d9..86f02477646 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -71,7 +71,7 @@ protected virtual void OnActivate()
         /// <remarks>The base implementation unregisters all messages for this recipient (with no token).</remarks>
         protected virtual void OnDeactivate()
         {
-            Messenger.Unregister(this);
+            Messenger.Default.Unregister(this);
         }
 
         /// <summary>
@@ -90,7 +90,7 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         {
             var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
-            Messenger.Send(message);
+            Messenger.Default.Send(message);
         }
 
         /// <summary>
diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index fd44a47fdf3..fdc15b625ee 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -16,23 +16,23 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken
         {
             object a = new object();
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Register<MessageA>(a, m => result = m.Text);
+            Messenger.Default.Register<MessageA>(a, m => result = m.Text);
 
-            Assert.IsTrue(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
 
-            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Unregister<MessageA>(a);
+            Messenger.Default.Unregister<MessageA>(a);
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             result = null;
-            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.IsNull(result);
         }
@@ -43,23 +43,23 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(
         {
             object a = new object();
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Register<MessageA>(a, m => result = m.Text);
+            Messenger.Default.Register<MessageA>(a, m => result = m.Text);
 
-            Assert.IsTrue(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
 
-            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Unregister(a);
+            Messenger.Default.Unregister(a);
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             result = null;
-            Messenger.Send(new MessageA { Text = nameof(MessageA) });
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.IsNull(result);
         }
@@ -70,23 +70,23 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
         {
             object a = new object();
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA>(a));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Register<MessageA, string>(a, nameof(MessageA), m => result = m.Text);
+            Messenger.Default.Register<MessageA, string>(a, nameof(MessageA), m => result = m.Text);
 
-            Assert.IsTrue(Messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA, string>(a, nameof(MessageA)));
 
-            Messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Unregister<MessageA, string>(a, nameof(MessageA));
+            Messenger.Default.Unregister<MessageA, string>(a, nameof(MessageA));
 
-            Assert.IsFalse(Messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA, string>(a, nameof(MessageA)));
 
             result = null;
-            Messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
 
             Assert.IsNull(result);
         }

From 1121fbefe956e60c742e350355f7f5bc60b2f463 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 17:56:55 +0200
Subject: [PATCH 057/595] Added messaging customization to ViewModelBase

---
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs | 34 +++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 86f02477646..800cdadf81f 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -32,6 +32,36 @@ namespace Microsoft.Toolkit.Mvvm
     /// </summary>
     public abstract class ViewModelBase : ObservableObject
     {
+        /// <summary>
+        /// The optional <see cref="Messenger"/> instance to use.
+        /// </summary>
+        private readonly Messenger? messenger;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// </summary>
+        protected ViewModelBase()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// </summary>
+        /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
+        /// <remarks>
+        /// If <paramref name="messenger"/> is <see langword="null"/>, the <see cref="Messaging.Messenger.Default"/>
+        /// instance will be used to send message (eg. from <see cref="Set{T}"/> or <see cref="Broadcast{T}"/>).
+        /// </remarks>
+        protected ViewModelBase(Messenger messenger)
+        {
+            this.messenger = messenger;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Messaging.Messenger"/> instance in use.
+        /// </summary>
+        protected Messenger Messenger => this.messenger ?? Messenger.Default;
+
         private bool isActive;
 
         /// <summary>
@@ -71,7 +101,7 @@ protected virtual void OnActivate()
         /// <remarks>The base implementation unregisters all messages for this recipient (with no token).</remarks>
         protected virtual void OnDeactivate()
         {
-            Messenger.Default.Unregister(this);
+            Messenger.Unregister(this);
         }
 
         /// <summary>
@@ -90,7 +120,7 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         {
             var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
-            Messenger.Default.Send(message);
+            Messenger.Send(message);
         }
 
         /// <summary>

From 1e3e1e4fbc18fe01819be3dcf6f31d74a77ff30f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:23:36 +0200
Subject: [PATCH 058/595] The Ioc class is not static anymore

---
 Microsoft.Toolkit.Mvvm/Ioc.cs | 373 +++++++++++++++++++++-------------
 UnitTests/Mvvm/Test_Ioc.cs    |  41 ++--
 2 files changed, 256 insertions(+), 158 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Ioc.cs b/Microsoft.Toolkit.Mvvm/Ioc.cs
index bb5ccce4675..ee472b8161c 100644
--- a/Microsoft.Toolkit.Mvvm/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/Ioc.cs
@@ -3,13 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
 using System.Runtime.CompilerServices;
+using Microsoft.Collections.Extensions;
 
 #nullable enable
 
@@ -33,27 +31,26 @@ namespace Microsoft.Toolkit.Mvvm
     /// </code>
     /// Then, register your services at startup, or at some time before using them:
     /// <code>
-    /// IoC.Register&lt;ILogger, ConsoleLogger>();
+    /// Ioc.Default.Register&lt;ILogger, ConsoleLogger>();
     /// </code>
     /// Finally, use the <see cref="Ioc"/> type to retrieve service instances to use:
     /// <code>
-    /// IoC.GetInstance&lt;ILogger>().Log("Hello world!");
+    /// Ioc.Default.GetInstance&lt;ILogger>().Log("Hello world!");
     /// </code>
     /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
     /// throw an exception in case the requested service has not been registered yet.
     /// </summary>
-    public static class Ioc
+    public sealed class Ioc
     {
         /// <summary>
-        /// The collection of currently registered service types.
+        /// The <see cref="IContainer"/> instance for each registered type.
         /// </summary>
-        /// <remarks>
-        /// This list is not used when retrieving registered instances through
-        /// the <see cref="GetInstance{TService}"/> method, so it has no impact on
-        /// performances there. This is only used to allow users to retrieve all
-        /// the registered instances at any given time, or to unregister them all.
-        /// </remarks>
-        private static readonly HashSet<Type> RegisteredTypes = new HashSet<Type>();
+        private readonly DictionarySlim<Key, IContainer> typesMap = new DictionarySlim<Key, IContainer>();
+
+        /// <summary>
+        /// Gets the default <see cref="Ioc"/> instance.
+        /// </summary>
+        public static Ioc Default { get; } = new Ioc();
 
         /// <summary>
         /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
@@ -61,14 +58,12 @@ public static class Ioc
         /// <typeparam name="TService">The type of service to check for registration.</typeparam>
         /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
         [Pure]
-        public static bool IsRegistered<TService>()
+        public bool IsRegistered<TService>()
             where TService : class
         {
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                return
-                    !(Container<TService>.Instance is null) ||
-                    !(Container<TService>.Factory is null);
+                return TryGetContainer<TService>(out _);
             }
         }
 
@@ -78,7 +73,7 @@ public static bool IsRegistered<TService>()
         /// <typeparam name="TService">The type of service to register.</typeparam>
         /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
         /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
-        public static void Register<TService, TProvider>()
+        public void Register<TService, TProvider>()
             where TService : class
             where TProvider : class, TService, new()
         {
@@ -90,16 +85,15 @@ public static void Register<TService, TProvider>()
         /// </summary>
         /// <typeparam name="TService">The type of service to register.</typeparam>
         /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
-        public static void Register<TService>(TService provider)
+        public void Register<TService>(TService provider)
             where TService : class
         {
-            lock (RegisteredTypes)
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                RegisteredTypes.Add(typeof(TService));
+                Container<TService> container = GetContainer<TService>();
 
-                Container<TService>.Factory = null;
-                Container<TService>.Instance = provider;
+                container.Factory = null;
+                container.Instance = provider;
             }
         }
 
@@ -108,16 +102,15 @@ public static void Register<TService>(TService provider)
         /// </summary>
         /// <typeparam name="TService">The type of service to register.</typeparam>
         /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
-        public static void Register<TService>(Func<TService> factory)
+        public void Register<TService>(Func<TService> factory)
             where TService : class
         {
-            lock (RegisteredTypes)
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                RegisteredTypes.Add(typeof(TService));
+                Container<TService> container = GetContainer<TService>();
 
-                Container<TService>.Factory = factory;
-                Container<TService>.Instance = null;
+                container.Factory = factory;
+                container.Instance = null;
             }
         }
 
@@ -125,83 +118,88 @@ public static void Register<TService>(Func<TService> factory)
         /// Unregisters a service of a specified type.
         /// </summary>
         /// <typeparam name="TService">The type of service to unregister.</typeparam>
-        public static void Unregister<TService>()
+        public void Unregister<TService>()
             where TService : class
         {
-            lock (RegisteredTypes)
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                RegisteredTypes.Remove(typeof(TService));
+                var key = new Key(typeof(TService));
 
-                Container<TService>.Factory = null;
-                Container<TService>.Instance = null;
+                this.typesMap.Remove(key);
             }
         }
 
         /// <summary>
         /// Resets the internal state of the <see cref="Ioc"/> type and unregisters all services.
         /// </summary>
-        public static void Reset()
+        public void Reset()
         {
-            lock (RegisteredTypes)
+            lock (this.typesMap)
             {
-                foreach (Type serviceType in RegisteredTypes)
-                {
-                    Type containerType = typeof(Container<>).MakeGenericType(serviceType);
-                    FieldInfo
-                        lockField = containerType.GetField(nameof(Container<object>.Lock)),
-                        lazyField = containerType.GetField(nameof(Container<object>.Factory)),
-                        instanceField = containerType.GetField(nameof(Container<object>.Instance));
-
-                    lock (lockField.GetValue(null))
-                    {
-                        lazyField.SetValue(null, null);
-                        instanceField.SetValue(null, null);
-                    }
-                }
-
-                RegisteredTypes.Clear();
+                this.typesMap.Clear();
             }
         }
 
         /// <summary>
         /// Gets all the currently registered services.
         /// </summary>
-        /// <returns>A collection of all the currently registered services.</returns>
+        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered services.</returns>
         /// <remarks>
         /// This will also cause the <see cref="Ioc"/> service to resolve instances of
         /// registered services that were setup to use lazy initialization.
         /// </remarks>
         [Pure]
-        public static IReadOnlyCollection<object> GetAllServices()
+        public ReadOnlyMemory<object> GetAllServices()
         {
-            lock (RegisteredTypes)
+            lock (this.typesMap)
             {
-                return (
-                    from Type serviceType in RegisteredTypes
-                    let resolver = typeof(Ioc).GetMethod(nameof(GetInstance))
-                    let resolverOfT = resolver.MakeGenericMethod(serviceType)
-                    let service = resolverOfT.Invoke(null, null)
-                    select service).ToArray();
+                if (this.typesMap.Count == 0)
+                {
+                    return Array.Empty<object>();
+                }
+
+                object[] services = new object[this.typesMap.Count];
+
+                int i = 0;
+                foreach (var pair in this.typesMap)
+                {
+                    services[i++] = pair.Value.Instance ?? pair.Value.Factory!();
+                }
+
+                return services;
             }
         }
 
         /// <summary>
         /// Gets all the currently registered and instantiated services.
         /// </summary>
-        /// <returns>A collection of all the currently registered and instantiated services.</returns>
+        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered and instantiated services.</returns>
         [Pure]
-        public static IReadOnlyCollection<object> GetAllCreatedServices()
+        public ReadOnlyMemory<object> GetAllCreatedServices()
         {
-            lock (RegisteredTypes)
+            lock (this.typesMap)
             {
-                return (
-                    from Type serviceType in RegisteredTypes
-                    let containerType = typeof(Container<>).MakeGenericType(serviceType)
-                    let field = containerType.GetField(nameof(Container<object>.Instance))
-                    let instance = field.GetValue(null)
-                    where !(instance is null)
-                    select instance).ToArray();
+                if (this.typesMap.Count == 0)
+                {
+                    return Array.Empty<object>();
+                }
+
+                object[] services = new object[this.typesMap.Count];
+
+                int i = 0;
+                foreach (var pair in this.typesMap)
+                {
+                    object? service = pair.Value.Instance;
+
+                    if (service is null)
+                    {
+                        continue;
+                    }
+
+                    services[i++] = service;
+                }
+
+                return services.AsMemory(0, i);
             }
         }
 
@@ -211,26 +209,19 @@ from Type serviceType in RegisteredTypes
         /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
         [Pure]
-        public static bool TryGetInstance<TService>(out TService? service)
+        public bool TryGetInstance<TService>(out TService? service)
             where TService : class
         {
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                service = Container<TService>.Instance;
-
-                if (!(service is null))
+                if (!TryGetContainer(out Container<TService>? container))
                 {
-                    return true;
-                }
-
-                Func<TService>? factory = Container<TService>.Factory;
+                    service = null;
 
-                if (factory is null)
-                {
                     return false;
                 }
 
-                service = Container<TService>.Instance = factory();
+                service = container!.Instance ?? container.Factory?.Invoke();
 
                 return true;
             }
@@ -241,88 +232,151 @@ public static bool TryGetInstance<TService>(out TService? service)
         /// </summary>
         /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService GetInstance<TService>()
+        public TService GetInstance<TService>()
             where TService : class
         {
-            TService? service = Container<TService>.Instance;
-
-            if (service is null)
+            if (!TryGetInstance(out TService? service))
             {
-                return GetInstanceOrThrow<TService>();
+                ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
             }
 
-            return service;
+            return service!;
         }
 
         /// <summary>
-        /// Tries to resolve a <typeparamref name="TService"/> instance with additional checks.
-        /// This method implements the slow path for <see cref="GetInstance{TService}"/>, locking
-        /// to ensure thread-safety and invoking the available factory, if possible.
+        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>
         /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static TService GetInstanceOrThrow<TService>()
+        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [Pure]
+        public TService GetInstanceWithoutCaching<TService>()
             where TService : class
         {
-            lock (Container<TService>.Lock)
+            lock (this.typesMap)
             {
-                TService? service = Container<TService>.Instance;
+                if (!TryGetContainer(out Container<TService>? container))
+                {
+                    ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
+                }
+
+                Func<TService>? factory = container!.Factory;
 
-                // Check the instance field again for race conditions
-                if (!(service is null))
+                if (!(factory is null))
                 {
-                    return service;
+                    return factory();
                 }
 
-                Func<TService>? factory = Container<TService>.Factory;
+                TService service = container.Instance!;
 
-                // If no factory is available, the service hasn't been registered yet
-                if (factory is null)
+                if (service.GetType().GetConstructor(Type.EmptyTypes) is null)
                 {
-                    throw new InvalidOperationException($"Service {typeof(TService)} not initialized");
+                    ThrowInvalidOperationExceptionOnServiceWithNoConstructor<TService>(service.GetType());
                 }
 
-                return Container<TService>.Instance = factory();
+                Type serviceType = service.GetType();
+                Expression[] expressions = { Expression.New(serviceType) };
+                Expression body = Expression.Block(serviceType, expressions);
+                factory = Expression.Lambda<Func<TService>>(body).Compile();
+
+                // Cache for later use
+                container.Factory = factory;
+
+                return factory();
             }
         }
 
         /// <summary>
-        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// Tries to get a <see cref="Container{T}"/> instance for a specific service type.
         /// </summary>
         /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        /// <param name="container">The resulting <see cref="Container{T}"/>, if found.</param>
+        /// <returns>Whether or not the container was present.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService GetInstanceWithoutCaching<TService>()
+        private bool TryGetContainer<TService>(out Container<TService>? container)
             where TService : class
         {
-            lock (Container<TService>.Lock)
+            var key = new Key(typeof(TService));
+
+            if (this.typesMap.TryGetValue(key, out IContainer local))
             {
-                Func<TService>? factory = Container<TService>.Factory;
+                // We can use a fast cast here as the type is always known
+                container = Unsafe.As<Container<TService>>(local);
 
-                if (!(factory is null))
-                {
-                    return factory();
-                }
+                return true;
+            }
 
-                TService? service = Container<TService>.Instance;
+            container = null;
 
-                if (!(service is null))
-                {
-                    Type serviceType = service.GetType();
-                    Expression[] expressions = { Expression.New(serviceType) };
-                    Expression body = Expression.Block(serviceType, expressions);
-                    factory = Expression.Lambda<Func<TService>>(body).Compile();
+            return false;
+        }
 
-                    Container<TService>.Factory = factory;
+        /// <summary>
+        /// Gets the <see cref="Container{T}"/> instance for a specific service type.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>A <see cref="Container{T}"/> instance with the requested type argument.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private Container<TService> GetContainer<TService>()
+            where TService : class
+        {
+            var key = new Key(typeof(TService));
+            ref IContainer target = ref this.typesMap.GetOrAddValueRef(key);
 
-                    return factory();
-                }
+            if (target is null)
+            {
+                target = new Container<TService>();
+            }
+
+            return Unsafe.As<Container<TService>>(target);
+        }
+
+        /// <summary>
+        /// A simple type representing a registered type.
+        /// </summary>
+        /// <remarks>
+        /// This type is used to enable fast indexing in the type mapping, and is used to externally
+        /// inject the <see cref="IEquatable{T}"/> interface to <see cref="Type"/>.
+        /// </remarks>
+        private readonly struct Key : IEquatable<Key>
+        {
+            /// <summary>
+            /// The registered type.
+            /// </summary>
+            private readonly Type type;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Key"/> struct.
+            /// </summary>
+            /// <param name="type">The input <see cref="Type"/> instance.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Key(Type type)
+            {
+                this.type = type;
+            }
 
-                throw new InvalidOperationException($"Service {typeof(TService)} not initialized");
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Key other)
+            {
+                return ReferenceEquals(this.type, other.type);
+            }
+
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Key other && Equals(other);
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public override int GetHashCode()
+            {
+                return RuntimeHelpers.GetHashCode(this.type);
             }
         }
 
@@ -330,24 +384,69 @@ public static TService GetInstanceWithoutCaching<TService>()
         /// Internal container type for services of type <typeparamref name="T"/>.
         /// </summary>
         /// <typeparam name="T">The type of services to store in this type.</typeparam>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Public fields for performance reasons")]
-        private static class Container<T>
+        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "The type is private")]
+        private sealed class Container<T> : IContainer
             where T : class
         {
-            /// <summary>
-            /// An <see cref="object"/> used to synchronize accesses to the <see cref="Factory"/> and <see cref="Instance"/> fields.
-            /// </summary>
-            public static readonly object Lock = new object();
+            /// <inheritdoc/>
+            public object Lock { get; } = new object();
 
             /// <summary>
             /// The optional <see cref="Func{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
             /// </summary>
-            public static Func<T>? Factory;
+            public Func<T>? Factory;
 
             /// <summary>
             /// The current <typeparamref name="T"/> instance being produced, if available.
             /// </summary>
-            public static T? Instance;
+            public T? Instance;
+
+            /// <inheritdoc/>
+            Func<object>? IContainer.Factory => this.Factory;
+
+            /// <inheritdoc/>
+            object? IContainer.Instance => this.Instance;
+        }
+
+        /// <summary>
+        /// A interface for the <see cref="Container{T}"/> type.
+        /// </summary>
+        private interface IContainer
+        {
+            /// <summary>
+            /// Gets an <see cref="object"/> used to synchronize accesses to the <see cref="Factory"/> and <see cref="Instance"/> fields.
+            /// </summary>
+            object Lock { get; }
+
+            /// <summary>
+            /// Gets the optional <see cref="Func{T}"/> instance to produce instances of the service.
+            /// </summary>
+            Func<object>? Factory { get; }
+
+            /// <summary>
+            /// Gets the current instance being produced, if available.
+            /// </summary>
+            object? Instance { get; }
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
+        /// </summary>
+        /// <typeparam name="TService">The type of service not found.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>()
+        {
+            throw new InvalidOperationException($"Service {typeof(TService)} not registered");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a service doesn't expose a public parametrless constructor.
+        /// </summary>
+        /// <typeparam name="TService">The type of service not found.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionOnServiceWithNoConstructor<TService>(Type type)
+        {
+            throw new InvalidOperationException($"Type {type} implementing service {typeof(TService)} does not expose a public constructor");
         }
     }
 }
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index 45b56d7657f..7a4b13cb0c2 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -2,7 +2,6 @@
 // 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.Linq;
 using Microsoft.Toolkit.Mvvm;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -15,38 +14,38 @@ public class Test_Ioc
         [TestMethod]
         public void Test_Ioc_SampleUsage()
         {
-            Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
+            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
 
-            Ioc.Register<INameService, BobService>();
+            Ioc.Default.Register<INameService, BobService>();
 
-            Assert.IsTrue(Ioc.IsRegistered<INameService>());
+            Assert.IsTrue(Ioc.Default.IsRegistered<INameService>());
 
-            var services = Ioc.GetAllServices();
+            var services = Ioc.Default.GetAllServices();
 
-            Assert.AreEqual(services.Count, 1);
-            Assert.IsInstanceOfType(services.First(), typeof(INameService));
-            Assert.IsInstanceOfType(services.First(), typeof(BobService));
+            Assert.AreEqual(services.Length, 1);
+            Assert.IsInstanceOfType(services.Span[0], typeof(INameService));
+            Assert.IsInstanceOfType(services.Span[0], typeof(BobService));
 
-            Ioc.Unregister<INameService>();
+            Ioc.Default.Unregister<INameService>();
 
-            Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
+            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
 
-            Ioc.Register<INameService>(() => new AliceService());
+            Ioc.Default.Register<INameService>(() => new AliceService());
 
-            Assert.IsTrue(Ioc.IsRegistered<INameService>());
+            Assert.IsTrue(Ioc.Default.IsRegistered<INameService>());
 
-            services = Ioc.GetAllServices();
+            services = Ioc.Default.GetAllServices();
 
-            Assert.AreEqual(services.Count, 1);
-            Assert.IsInstanceOfType(services.First(), typeof(INameService));
-            Assert.IsInstanceOfType(services.First(), typeof(AliceService));
+            Assert.AreEqual(services.Length, 1);
+            Assert.IsInstanceOfType(services.Span[0], typeof(INameService));
+            Assert.IsInstanceOfType(services.Span[0], typeof(AliceService));
 
-            Ioc.Reset();
+            Ioc.Default.Reset();
 
-            Assert.IsFalse(Ioc.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.GetAllServices().Count, 0);
+            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
+            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
         }
 
         public interface INameService

From 7396d08320344274c8597783f17d41d15fc9e4ed Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:29:07 +0200
Subject: [PATCH 059/595] Added dependency injection of service provider in
 ViewModelBase

---
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs | 38 ++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 800cdadf81f..2026ba61017 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -37,9 +37,18 @@ public abstract class ViewModelBase : ObservableObject
         /// </summary>
         private readonly Messenger? messenger;
 
+        /// <summary>
+        /// The optional <see cref="Ioc"/> instance to use.
+        /// </summary>
+        private readonly Ioc? ioc;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
+        /// <remarks>
+        /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/>
+        /// and <see cref="Mvvm.Ioc.Default"/> services to perform operations.
+        /// </remarks>
         protected ViewModelBase()
         {
         }
@@ -48,20 +57,41 @@ protected ViewModelBase()
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
         /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
-        /// <remarks>
-        /// If <paramref name="messenger"/> is <see langword="null"/>, the <see cref="Messaging.Messenger.Default"/>
-        /// instance will be used to send message (eg. from <see cref="Set{T}"/> or <see cref="Broadcast{T}"/>).
-        /// </remarks>
         protected ViewModelBase(Messenger messenger)
         {
             this.messenger = messenger;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// </summary>
+        /// <param name="ioc">The optional <see cref="Mvvm.Ioc"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(Ioc ioc)
+        {
+            this.ioc = ioc;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// </summary>
+        /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
+        /// <param name="ioc">The optional <see cref="Mvvm.Ioc"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(Messenger messenger, Ioc ioc)
+        {
+            this.messenger = messenger;
+            this.ioc = ioc;
+        }
+
         /// <summary>
         /// Gets the <see cref="Messaging.Messenger"/> instance in use.
         /// </summary>
         protected Messenger Messenger => this.messenger ?? Messenger.Default;
 
+        /// <summary>
+        /// Gets the <see cref="Mvvm.Ioc"/> instance in use.
+        /// </summary>
+        protected Ioc Ioc => this.ioc ?? Ioc.Default;
+
         private bool isActive;
 
         /// <summary>

From 6fa643b5ef9aa5281b413878b3c80fa1052d18c8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:32:25 +0200
Subject: [PATCH 060/595] Code refactoring

---
 Microsoft.Toolkit.Mvvm/{ => Services}/Ioc.cs | 2 +-
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs      | 9 +++++----
 UnitTests/Mvvm/Test_Ioc.cs                   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{ => Services}/Ioc.cs (99%)

diff --git a/Microsoft.Toolkit.Mvvm/Ioc.cs b/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/Ioc.cs
rename to Microsoft.Toolkit.Mvvm/Services/Ioc.cs
index ee472b8161c..796a5f06c0f 100644
--- a/Microsoft.Toolkit.Mvvm/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
@@ -11,7 +11,7 @@
 
 #nullable enable
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.Services
 {
     /// <summary>
     /// An Inversion of Control container that can be used to register and access instances of types providing services.
diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 2026ba61017..4cfc92d4ecf 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -24,6 +24,7 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+using Microsoft.Toolkit.Mvvm.Services;
 
 namespace Microsoft.Toolkit.Mvvm
 {
@@ -47,7 +48,7 @@ public abstract class ViewModelBase : ObservableObject
         /// </summary>
         /// <remarks>
         /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/>
-        /// and <see cref="Mvvm.Ioc.Default"/> services to perform operations.
+        /// and <see cref="Services.Ioc.Default"/> services to perform operations.
         /// </remarks>
         protected ViewModelBase()
         {
@@ -65,7 +66,7 @@ protected ViewModelBase(Messenger messenger)
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
-        /// <param name="ioc">The optional <see cref="Mvvm.Ioc"/> instance to use to retrieve services.</param>
+        /// <param name="ioc">The optional <see cref="Services.Ioc"/> instance to use to retrieve services.</param>
         protected ViewModelBase(Ioc ioc)
         {
             this.ioc = ioc;
@@ -75,7 +76,7 @@ protected ViewModelBase(Ioc ioc)
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
         /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
-        /// <param name="ioc">The optional <see cref="Mvvm.Ioc"/> instance to use to retrieve services.</param>
+        /// <param name="ioc">The optional <see cref="Services.Ioc"/> instance to use to retrieve services.</param>
         protected ViewModelBase(Messenger messenger, Ioc ioc)
         {
             this.messenger = messenger;
@@ -88,7 +89,7 @@ protected ViewModelBase(Messenger messenger, Ioc ioc)
         protected Messenger Messenger => this.messenger ?? Messenger.Default;
 
         /// <summary>
-        /// Gets the <see cref="Mvvm.Ioc"/> instance in use.
+        /// Gets the <see cref="Services.Ioc"/> instance in use.
         /// </summary>
         protected Ioc Ioc => this.ioc ?? Ioc.Default;
 
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index 7a4b13cb0c2..7ddd33f668c 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -2,7 +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 Microsoft.Toolkit.Mvvm;
+using Microsoft.Toolkit.Mvvm.Services;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm

From c40fc586f0b19a28e8918c250ea0b08b14e3b02d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:36:36 +0200
Subject: [PATCH 061/595] Added IIoc interface

---
 Microsoft.Toolkit.Mvvm/Services/IIoc.cs | 112 ++++++++++++++++++++++++
 Microsoft.Toolkit.Mvvm/Services/Ioc.cs  |  75 +++-------------
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs |  14 +--
 3 files changed, 131 insertions(+), 70 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Services/IIoc.cs

diff --git a/Microsoft.Toolkit.Mvvm/Services/IIoc.cs b/Microsoft.Toolkit.Mvvm/Services/IIoc.cs
new file mode 100644
index 00000000000..1da7338c581
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Services/IIoc.cs
@@ -0,0 +1,112 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Mvvm.Services
+{
+    /// <summary>
+    /// An interface for a type implementing an Inversion of Control service provider.
+    /// </summary>
+    public interface IIoc
+    {
+        /// <summary>
+        /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to check for registration.</typeparam>
+        /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
+        [Pure]
+        bool IsRegistered<TService>()
+            where TService : class;
+
+        /// <summary>
+        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
+        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
+        /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
+        void Register<TService, TProvider>()
+            where TService : class
+            where TProvider : class, TService, new();
+
+        /// <summary>
+        /// Registers a singleton instance of service <typeparamref name="TService"/>.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
+        /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
+        void Register<TService>(TService provider)
+            where TService : class;
+
+        /// <summary>
+        /// Registers a service <typeparamref name="TService"/> through a <see cref="Func{TResult}"/> factory.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to register.</typeparam>
+        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
+        void Register<TService>(Func<TService> factory)
+            where TService : class;
+
+        /// <summary>
+        /// Unregisters a service of a specified type.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to unregister.</typeparam>
+        void Unregister<TService>()
+            where TService : class;
+
+        /// <summary>
+        /// Resets the internal state of the <see cref="Ioc"/> type and unregisters all services.
+        /// </summary>
+        void Reset();
+
+        /// <summary>
+        /// Gets all the currently registered services.
+        /// </summary>
+        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered services.</returns>
+        /// <remarks>
+        /// This will also cause the <see cref="Ioc"/> service to resolve instances of
+        /// registered services that were setup to use lazy initialization.
+        /// </remarks>
+        [Pure]
+        ReadOnlyMemory<object> GetAllServices();
+
+        /// <summary>
+        /// Gets all the currently registered and instantiated services.
+        /// </summary>
+        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered and instantiated services.</returns>
+        [Pure]
+        ReadOnlyMemory<object> GetAllCreatedServices();
+
+        /// <summary>
+        /// Tries to resolve an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
+        [Pure]
+        bool TryGetInstance<TService>(out TService? service)
+            where TService : class;
+
+        /// <summary>
+        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        TService GetInstance<TService>()
+            where TService : class;
+
+        /// <summary>
+        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [Pure]
+        TService GetInstanceWithoutCaching<TService>()
+            where TService : class;
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Services/Ioc.cs b/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
index 796a5f06c0f..5a28a23441c 100644
--- a/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
@@ -40,7 +40,7 @@ namespace Microsoft.Toolkit.Mvvm.Services
     /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
     /// throw an exception in case the requested service has not been registered yet.
     /// </summary>
-    public sealed class Ioc
+    public sealed class Ioc : IIoc
     {
         /// <summary>
         /// The <see cref="IContainer"/> instance for each registered type.
@@ -52,12 +52,7 @@ public sealed class Ioc
         /// </summary>
         public static Ioc Default { get; } = new Ioc();
 
-        /// <summary>
-        /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to check for registration.</typeparam>
-        /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
-        [Pure]
+        /// <inheritdoc/>
         public bool IsRegistered<TService>()
             where TService : class
         {
@@ -67,12 +62,7 @@ public bool IsRegistered<TService>()
             }
         }
 
-        /// <summary>
-        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
-        /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
+        /// <inheritdoc/>
         public void Register<TService, TProvider>()
             where TService : class
             where TProvider : class, TService, new()
@@ -80,11 +70,7 @@ public void Register<TService, TProvider>()
             Register<TService>(new TProvider());
         }
 
-        /// <summary>
-        /// Registers a singleton instance of service <typeparamref name="TService"/>.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
+        /// <inheritdoc/>
         public void Register<TService>(TService provider)
             where TService : class
         {
@@ -97,11 +83,7 @@ public void Register<TService>(TService provider)
             }
         }
 
-        /// <summary>
-        /// Registers a service <typeparamref name="TService"/> through a <see cref="Func{TResult}"/> factory.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
+        /// <inheritdoc/>
         public void Register<TService>(Func<TService> factory)
             where TService : class
         {
@@ -114,10 +96,7 @@ public void Register<TService>(Func<TService> factory)
             }
         }
 
-        /// <summary>
-        /// Unregisters a service of a specified type.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to unregister.</typeparam>
+        /// <inheritdoc/>
         public void Unregister<TService>()
             where TService : class
         {
@@ -129,9 +108,7 @@ public void Unregister<TService>()
             }
         }
 
-        /// <summary>
-        /// Resets the internal state of the <see cref="Ioc"/> type and unregisters all services.
-        /// </summary>
+        /// <inheritdoc/>
         public void Reset()
         {
             lock (this.typesMap)
@@ -140,15 +117,7 @@ public void Reset()
             }
         }
 
-        /// <summary>
-        /// Gets all the currently registered services.
-        /// </summary>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered services.</returns>
-        /// <remarks>
-        /// This will also cause the <see cref="Ioc"/> service to resolve instances of
-        /// registered services that were setup to use lazy initialization.
-        /// </remarks>
-        [Pure]
+        /// <inheritdoc/>
         public ReadOnlyMemory<object> GetAllServices()
         {
             lock (this.typesMap)
@@ -170,11 +139,7 @@ public ReadOnlyMemory<object> GetAllServices()
             }
         }
 
-        /// <summary>
-        /// Gets all the currently registered and instantiated services.
-        /// </summary>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered and instantiated services.</returns>
-        [Pure]
+        /// <inheritdoc/>
         public ReadOnlyMemory<object> GetAllCreatedServices()
         {
             lock (this.typesMap)
@@ -203,12 +168,7 @@ public ReadOnlyMemory<object> GetAllCreatedServices()
             }
         }
 
-        /// <summary>
-        /// Tries to resolve an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
-        [Pure]
+        /// <inheritdoc/>
         public bool TryGetInstance<TService>(out TService? service)
             where TService : class
         {
@@ -227,13 +187,7 @@ public bool TryGetInstance<TService>(out TService? service)
             }
         }
 
-        /// <summary>
-        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
-        [Pure]
+        /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public TService GetInstance<TService>()
             where TService : class
@@ -246,12 +200,7 @@ public TService GetInstance<TService>()
             return service!;
         }
 
-        /// <summary>
-        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        [Pure]
+        /// <inheritdoc/>
         public TService GetInstanceWithoutCaching<TService>()
             where TService : class
         {
diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 4cfc92d4ecf..1f02a244daa 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -39,9 +39,9 @@ public abstract class ViewModelBase : ObservableObject
         private readonly Messenger? messenger;
 
         /// <summary>
-        /// The optional <see cref="Ioc"/> instance to use.
+        /// The optional <see cref="IIoc"/> instance to use.
         /// </summary>
-        private readonly Ioc? ioc;
+        private readonly IIoc? ioc;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
@@ -66,8 +66,8 @@ protected ViewModelBase(Messenger messenger)
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
-        /// <param name="ioc">The optional <see cref="Services.Ioc"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(Ioc ioc)
+        /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(IIoc ioc)
         {
             this.ioc = ioc;
         }
@@ -76,8 +76,8 @@ protected ViewModelBase(Ioc ioc)
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
         /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
-        /// <param name="ioc">The optional <see cref="Services.Ioc"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(Messenger messenger, Ioc ioc)
+        /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(Messenger messenger, IIoc ioc)
         {
             this.messenger = messenger;
             this.ioc = ioc;
@@ -91,7 +91,7 @@ protected ViewModelBase(Messenger messenger, Ioc ioc)
         /// <summary>
         /// Gets the <see cref="Services.Ioc"/> instance in use.
         /// </summary>
-        protected Ioc Ioc => this.ioc ?? Ioc.Default;
+        protected IIoc Ioc => this.ioc ?? Services.Ioc.Default;
 
         private bool isActive;
 

From dd7e973b6e6ffda9f1d370efb30ddddf6d20913c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:45:09 +0200
Subject: [PATCH 062/595] Added IMessenger interface

---
 .../Messaging/IMessenger.cs                   | 150 ++++++++++++++++++
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 101 ++----------
 Microsoft.Toolkit.Mvvm/ViewModelBase.cs       |  18 +--
 3 files changed, 172 insertions(+), 97 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
new file mode 100644
index 00000000000..871f629e3e1
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -0,0 +1,150 @@
+// 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.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging
+{
+    /// <summary>
+    /// An interface for a type providing the ability to exchange messages between different objects.
+    /// </summary>
+    public interface IMessenger
+    {
+        /// <summary>
+        /// Checks whether or not a given recipient has already been registered for a message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
+        /// <param name="recipient">The target recipient to check the registration for.</param>
+        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        [Pure]
+        bool IsRegistered<TMessage>(object recipient)
+            where TMessage : class;
+
+        /// <summary>
+        /// Checks whether or not a given recipient has already been registered for a message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
+        /// <typeparam name="TToken">The type of token to check the channel for.</typeparam>
+        /// <param name="recipient">The target recipient to check the registration for.</param>
+        /// <param name="token">The token used to identify the target channel to check.</param>
+        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        [Pure]
+        bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        void Register<TMessage>(object recipient, Action<TMessage> action)
+            where TMessage : class;
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="token">A token used to determine the receiving channel to use.</param>
+        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+            where TMessage : class
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Unregisters a recipient from all registered messages.
+        /// </summary>
+        /// <param name="recipient">The recipient to unregister.</param>
+        void Unregister(object recipient);
+
+        /// <summary>
+        /// Unregisters a recipient from messages of a given type.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        void Unregister<TMessage>(object recipient)
+            where TMessage : class;
+
+        /// <summary>
+        /// Unregisters a recipient from messages on a specific channel.
+        /// </summary>
+        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <param name="token">The token to use to identify which handlers to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        void Unregister<TToken>(object recipient, TToken token)
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Unregisters a recipient from messages of a given type.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <param name="token">The token to use to identify which handlers to unregister.</param>
+        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        void Unregister<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <remarks>
+        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
+        /// message type exposes a parameterless constructor: it will automatically create
+        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
+        /// </remarks>
+        void Send<TMessage>()
+            where TMessage : class, new();
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <param name="message">The message to send.</param>
+        void Send<TMessage>(TMessage message)
+            where TMessage : class;
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <remarks>
+        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
+        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
+        /// </remarks>
+        void Send<TMessage, TToken>(TToken token)
+            where TMessage : class, new()
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="message">The message to send.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        void Send<TMessage, TToken>(TMessage message, TToken token)
+            where TMessage : class
+            where TToken : notnull, IEquatable<TToken>;
+
+        /// <summary>
+        /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
+        /// </summary>
+        void Reset();
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index af413350680..468a5e0aee1 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <summary>
     /// A type implementing a messaging system between objects.
     /// </summary>
-    public sealed class Messenger
+    public sealed class Messenger : IMessenger
     {
         // The Messenger class uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
@@ -80,27 +80,14 @@ private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>
         /// </summary>
         public static Messenger Default { get; } = new Messenger();
 
-        /// <summary>
-        /// Checks whether or not a given recipient has already been registered for a message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
-        /// <param name="recipient">The target recipient to check the registration for.</param>
-        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
-        [Pure]
+        /// <inheritdoc/>
         public bool IsRegistered<TMessage>(object recipient)
             where TMessage : class
         {
             return IsRegistered<TMessage, Unit>(recipient, default);
         }
 
-        /// <summary>
-        /// Checks whether or not a given recipient has already been registered for a message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
-        /// <typeparam name="TToken">The type of token to check the channel for.</typeparam>
-        /// <param name="recipient">The target recipient to check the registration for.</param>
-        /// <param name="token">The token used to identify the target channel to check.</param>
-        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        /// <inheritdoc/>
         [Pure]
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
@@ -115,28 +102,14 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
-        /// <summary>
-        /// Registers a recipient for a given type of message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
-        /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
-        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <inheritdoc/>
         public void Register<TMessage>(object recipient, Action<TMessage> action)
             where TMessage : class
         {
             Register(recipient, default(Unit), action);
         }
 
-        /// <summary>
-        /// Registers a recipient for a given type of message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
-        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
-        /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <param name="token">A token used to determine the receiving channel to use.</param>
-        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
-        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <inheritdoc/>
         public void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
@@ -175,10 +148,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
             }
         }
 
-        /// <summary>
-        /// Unregisters a recipient from all registered messages.
-        /// </summary>
-        /// <param name="recipient">The recipient to unregister.</param>
+        /// <inheritdoc/>
         public void Unregister(object recipient)
         {
             lock (this.recipientsMap)
@@ -203,25 +173,14 @@ public void Unregister(object recipient)
             }
         }
 
-        /// <summary>
-        /// Unregisters a recipient from messages of a given type.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
-        /// <param name="recipient">The recipient to unregister.</param>
-        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        /// <inheritdoc/>
         public void Unregister<TMessage>(object recipient)
             where TMessage : class
         {
             Unregister<TMessage, Unit>(recipient, default);
         }
 
-        /// <summary>
-        /// Unregisters a recipient from messages on a specific channel.
-        /// </summary>
-        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
-        /// <param name="recipient">The recipient to unregister.</param>
-        /// <param name="token">The token to use to identify which handlers to unregister.</param>
-        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        /// <inheritdoc/>
         public void Unregister<TToken>(object recipient, TToken token)
             where TToken : notnull, IEquatable<TToken>
         {
@@ -299,14 +258,7 @@ public void Unregister<TToken>(object recipient, TToken token)
             }
         }
 
-        /// <summary>
-        /// Unregisters a recipient from messages of a given type.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
-        /// <param name="recipient">The recipient to unregister.</param>
-        /// <param name="token">The token to use to identify which handlers to unregister.</param>
-        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        /// <inheritdoc/>
         public void Unregister<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
@@ -346,42 +298,21 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <remarks>
-        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
-        /// message type exposes a parameterless constructor: it will automatically create
-        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
-        /// </remarks>
+        /// <inheritdoc/>
         public void Send<TMessage>()
             where TMessage : class, new()
         {
             Send(new TMessage(), default(Unit));
         }
 
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <param name="message">The message to send.</param>
+        /// <inheritdoc/>
         public void Send<TMessage>(TMessage message)
             where TMessage : class
         {
             Send(message, default(Unit));
         }
 
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <remarks>
-        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
-        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
-        /// </remarks>
+        /// <inheritdoc/>
         public void Send<TMessage, TToken>(TToken token)
             where TMessage : class, new()
             where TToken : notnull, IEquatable<TToken>
@@ -389,13 +320,7 @@ public void Send<TMessage, TToken>(TToken token)
             Send(new TMessage(), token);
         }
 
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="message">The message to send.</param>
-        /// <param name="token">The token indicating what channel to use.</param>
+        /// <inheritdoc/>
         public void Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : notnull, IEquatable<TToken>
diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
index 1f02a244daa..9702c5f0a89 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
@@ -34,9 +34,9 @@ namespace Microsoft.Toolkit.Mvvm
     public abstract class ViewModelBase : ObservableObject
     {
         /// <summary>
-        /// The optional <see cref="Messenger"/> instance to use.
+        /// The optional <see cref="IMessenger"/> instance to use.
         /// </summary>
-        private readonly Messenger? messenger;
+        private readonly IMessenger? messenger;
 
         /// <summary>
         /// The optional <see cref="IIoc"/> instance to use.
@@ -57,8 +57,8 @@ protected ViewModelBase()
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
-        /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
-        protected ViewModelBase(Messenger messenger)
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
+        protected ViewModelBase(IMessenger messenger)
         {
             this.messenger = messenger;
         }
@@ -75,21 +75,21 @@ protected ViewModelBase(IIoc ioc)
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
-        /// <param name="messenger">The <see cref="Messenger"/> instance to use to send messages.</param>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
         /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(Messenger messenger, IIoc ioc)
+        protected ViewModelBase(IMessenger messenger, IIoc ioc)
         {
             this.messenger = messenger;
             this.ioc = ioc;
         }
 
         /// <summary>
-        /// Gets the <see cref="Messaging.Messenger"/> instance in use.
+        /// Gets the <see cref="IMessenger"/> instance in use.
         /// </summary>
-        protected Messenger Messenger => this.messenger ?? Messenger.Default;
+        protected IMessenger Messenger => this.messenger ?? Messaging.Messenger.Default;
 
         /// <summary>
-        /// Gets the <see cref="Services.Ioc"/> instance in use.
+        /// Gets the <see cref="IIoc"/> instance in use.
         /// </summary>
         protected IIoc Ioc => this.ioc ?? Services.Ioc.Default;
 

From fc638226d3515c4efe1c55bf1e5640f4ac85c926 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 22:54:48 +0200
Subject: [PATCH 063/595] Moved request methods to extensions

---
 .../Messaging/IMessengerExtensions.cs         | 105 ++++++++++++++++++
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  92 +--------------
 2 files changed, 107 insertions(+), 90 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
new file mode 100644
index 00000000000..0538576faa8
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
@@ -0,0 +1,105 @@
+// 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.Runtime.CompilerServices;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging
+{
+    /// <summary>
+    /// Extensions for the <see cref="IMessenger"/> type.
+    /// </summary>
+    public static class IMessengerExtensions
+    {
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        /// <remarks>
+        /// This method is a shorthand for <see cref="Request{TMessage,TResult}(IMessenger,TMessage)"/> when the
+        /// message type exposes a parameterless constructor: it will automatically create
+        /// a new <typeparamref name="TMessage"/> request message and use that to perform the request.
+        /// </remarks>
+        public static TResult Request<TMessage, TResult>(this IMessenger messenger)
+            where TMessage : RequestMessage<TResult>, new()
+        {
+            return Request<TMessage, TResult, Messenger.Unit>(messenger, new TMessage(), default);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
+        /// <param name="message">The message to send.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        public static TResult Request<TMessage, TResult>(this IMessenger messenger, TMessage message)
+            where TMessage : RequestMessage<TResult>
+        {
+            return Request<TMessage, TResult, Messenger.Unit>(messenger, message, default);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        /// <remarks>
+        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
+        /// just like <see cref="Request{TMessage,TResult}(IMessenger)"/>, and then send it to the right recipients.
+        /// </remarks>
+        public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TToken token)
+            where TMessage : RequestMessage<TResult>, new()
+            where TToken : notnull, IEquatable<TToken>
+        {
+            return Request<TMessage, TResult, TToken>(messenger, new TMessage(), token);
+        }
+
+        /// <summary>
+        /// Sends a request of the specified type to all registered recipients, and returns the received response.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
+        /// <typeparam name="TResult">The type of response to expect.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
+        /// <param name="message">The request message to send.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
+        public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TMessage message, TToken token)
+            where TMessage : RequestMessage<TResult>
+            where TToken : notnull, IEquatable<TToken>
+        {
+            messenger.Send(message, token);
+
+            if (!message.IsResponseReceived)
+            {
+                ThrowInvalidOperationExceptionForNoResponseReceived();
+            }
+
+            return message.Result;
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
+        {
+            throw new InvalidOperationException("No response was received for the given request message");
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 468a5e0aee1..00ea5a27157 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -8,7 +8,6 @@
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -384,85 +383,7 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
             }
         }
 
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        /// <remarks>
-        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
-        /// message type exposes a parameterless constructor: it will automatically create
-        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
-        /// </remarks>
-        public TResult Request<TMessage, TResult>()
-            where TMessage : RequestMessage<TResult>, new()
-        {
-            return Request<TMessage, TResult, Unit>(new TMessage(), default);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <param name="message">The message to send.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public TResult Request<TMessage, TResult>(TMessage message)
-            where TMessage : RequestMessage<TResult>
-        {
-            return Request<TMessage, TResult, Unit>(message, default);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        /// <remarks>
-        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
-        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
-        /// </remarks>
-        public TResult Request<TMessage, TResult, TToken>(TToken token)
-            where TMessage : RequestMessage<TResult>, new()
-            where TToken : notnull, IEquatable<TToken>
-        {
-            return Request<TMessage, TResult, TToken>(new TMessage(), token);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="message">The request message to send.</param>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public TResult Request<TMessage, TResult, TToken>(TMessage message, TToken token)
-            where TMessage : RequestMessage<TResult>
-            where TToken : notnull, IEquatable<TToken>
-        {
-            Send(message, token);
-
-            if (!message.IsResponseReceived)
-            {
-                ThrowInvalidOperationExceptionForNoResponseReceived();
-            }
-
-            return message.Result;
-        }
-
-        /// <summary>
-        /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
-        /// </summary>
+        /// <inheritdoc/>
         public void Reset()
         {
             lock (this.recipientsMap)
@@ -578,7 +499,7 @@ public override int GetHashCode()
         /// <summary>
         /// An empty type representing a generic token with no specific value.
         /// </summary>
-        private struct Unit : IEquatable<Unit>
+        internal struct Unit : IEquatable<Unit>
         {
             /// <inheritdoc/>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -609,14 +530,5 @@ private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
         {
             throw new InvalidOperationException("The target recipient has already subscribed to the target message");
         }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
-        {
-            throw new InvalidOperationException("No response was received for the given request message");
-        }
     }
 }

From 5b1258bad8a8cd92ba3940cceb87909eab085e04 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Apr 2020 23:02:11 +0200
Subject: [PATCH 064/595] Code refactoring

---
 .../{ => ComponentModel}/ObservableObject.cs                | 6 +++---
 .../{ => ComponentModel}/ViewModelBase.cs                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{ => ComponentModel}/ObservableObject.cs (93%)
 rename Microsoft.Toolkit.Mvvm/{ => ComponentModel}/ViewModelBase.cs (99%)

diff --git a/Microsoft.Toolkit.Mvvm/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
similarity index 93%
rename from Microsoft.Toolkit.Mvvm/ObservableObject.cs
rename to Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index ecf629edb75..263f2698f6b 100644
--- a/Microsoft.Toolkit.Mvvm/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -24,7 +24,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
     /// <summary>
     /// A base class for objects of which the properties must be observable.
@@ -43,7 +43,7 @@ public abstract class ObservableObject : INotifyPropertyChanged, INotifyProperty
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null!)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -52,7 +52,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         protected virtual void OnPropertyChanging([CallerMemberName] string propertyName = null!)
         {
-            PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+            this.PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/ViewModelBase.cs
rename to Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 9702c5f0a89..8e29bb62002 100644
--- a/Microsoft.Toolkit.Mvvm/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -26,7 +26,7 @@
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 using Microsoft.Toolkit.Mvvm.Services;
 
-namespace Microsoft.Toolkit.Mvvm
+namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
     /// <summary>
     /// A base class for viewmodels.

From 59a6a87cc0db6d086233a4d98ae4ae238bd01f4e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 00:13:16 +0200
Subject: [PATCH 065/595] Added tests for ObservableObject

---
 UnitTests/Mvvm/Test_ObservableObject.cs | 56 +++++++++++++++++++++++++
 UnitTests/UnitTests.csproj              |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 UnitTests/Mvvm/Test_ObservableObject.cs

diff --git a/UnitTests/Mvvm/Test_ObservableObject.cs b/UnitTests/Mvvm/Test_ObservableObject.cs
new file mode 100644
index 00000000000..742935b4b13
--- /dev/null
+++ b/UnitTests/Mvvm/Test_ObservableObject.cs
@@ -0,0 +1,56 @@
+// 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.ComponentModel;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_ObservableObject
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableObject_Events()
+        {
+            var model = new SampleModel<int>();
+
+            (PropertyChangingEventArgs, int) changing = default;
+            (PropertyChangedEventArgs, int) changed = default;
+
+            model.PropertyChanging += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changing = (e, model.Data);
+            };
+
+            model.PropertyChanged += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changed = (e, model.Data);
+            };
+
+            model.Data = 42;
+
+            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModel<int>.Data));
+            Assert.AreEqual(changing.Item2, 0);
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel<int>.Data));
+            Assert.AreEqual(changed.Item2, 42);
+        }
+
+        public class SampleModel<T> : ObservableObject
+        {
+            private T data;
+
+            public T Data
+            {
+                get => data;
+                set => Set(ref data, value);
+            }
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index f947137c2aa..15872ab48a5 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
+    <Compile Include="Mvvm\Test_ObservableObject.cs" />
     <Compile Include="Mvvm\Test_Messenger.cs" />
     <Compile Include="Mvvm\Test_Ioc.cs" />
     <Compile Include="Helpers\Test_ColorHelper.cs" />

From 245745bc4393b3a73d5bae3d5ed12d0ca7703ffe Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 00:28:18 +0200
Subject: [PATCH 066/595] Added tests for ViewModelBase

---
 UnitTests/Mvvm/Test_ViewModelBase.cs | 113 +++++++++++++++++++++++++++
 UnitTests/UnitTests.csproj           |   1 +
 2 files changed, 114 insertions(+)
 create mode 100644 UnitTests/Mvvm/Test_ViewModelBase.cs

diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/Mvvm/Test_ViewModelBase.cs
new file mode 100644
index 00000000000..650bea05e86
--- /dev/null
+++ b/UnitTests/Mvvm/Test_ViewModelBase.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 Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+using Microsoft.Toolkit.Mvvm.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_ViewModelBase
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ViewModelBase_Activation()
+        {
+            var viewmodel = new SomeViewModel<int>();
+
+            Assert.IsFalse(viewmodel.IsActivatedCheck);
+
+            viewmodel.IsActive = true;
+
+            Assert.IsTrue(viewmodel.IsActivatedCheck);
+
+            viewmodel.IsActive = false;
+
+            Assert.IsFalse(viewmodel.IsActivatedCheck);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ViewModelBase_Defaults()
+        {
+            var viewmodel = new SomeViewModel<int>();
+
+            Assert.AreSame(viewmodel.CurrentMessenger, Messenger.Default);
+            Assert.AreSame(viewmodel.CurrentIoc, Ioc.Default);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ViewModelBase_Injection()
+        {
+            var messenger = new Messenger();
+            var ioc = new Ioc();
+            var viewmodel = new SomeViewModel<int>(messenger, ioc);
+
+            Assert.AreSame(viewmodel.CurrentMessenger, messenger);
+            Assert.AreSame(viewmodel.CurrentIoc, ioc);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ViewModelBase_Broadcast()
+        {
+            var messenger = new Messenger();
+            var viewmodel = new SomeViewModel<int>(messenger, null);
+
+            PropertyChangedMessage<int> message = null;
+
+            messenger.Register<PropertyChangedMessage<int>>(messenger, m => message = m);
+
+            viewmodel.Data = 42;
+
+            Assert.IsNotNull(message);
+            Assert.AreSame(message.Sender, viewmodel);
+            Assert.AreEqual(message.OldValue, 0);
+            Assert.AreEqual(message.NewValue, 42);
+            Assert.AreEqual(message.PropertyName, nameof(SomeViewModel<int>.Data));
+        }
+
+        public class SomeViewModel<T> : ViewModelBase
+        {
+            public SomeViewModel()
+            {
+            }
+
+            public SomeViewModel(IMessenger messenger, IIoc ioc)
+                : base(messenger, ioc)
+            {
+            }
+
+            public IIoc CurrentIoc => Ioc;
+
+            public IMessenger CurrentMessenger => Messenger;
+
+            private T data;
+
+            public T Data
+            {
+                get => data;
+                set => Set(ref data, value, true);
+            }
+
+            public bool IsActivatedCheck { get; private set; }
+
+            protected override void OnActivate()
+            {
+                IsActivatedCheck = true;
+            }
+
+            protected override void OnDeactivate()
+            {
+                base.OnDeactivate();
+
+                IsActivatedCheck = false;
+            }
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 15872ab48a5..3cfafb33b90 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
+    <Compile Include="Mvvm\Test_ViewModelBase.cs" />
     <Compile Include="Mvvm\Test_ObservableObject.cs" />
     <Compile Include="Mvvm\Test_Messenger.cs" />
     <Compile Include="Mvvm\Test_Ioc.cs" />

From fd3aba31bec1fabb88c9bb101fa4783086306d5f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 00:47:20 +0200
Subject: [PATCH 067/595] Added tests for relay commands

---
 UnitTests/Mvvm/Test_RelayCommand.cs    | 83 ++++++++++++++++++++++++++
 UnitTests/Mvvm/Test_RelayCommand{T}.cs | 69 +++++++++++++++++++++
 UnitTests/UnitTests.csproj             |  2 +
 3 files changed, 154 insertions(+)
 create mode 100644 UnitTests/Mvvm/Test_RelayCommand.cs
 create mode 100644 UnitTests/Mvvm/Test_RelayCommand{T}.cs

diff --git a/UnitTests/Mvvm/Test_RelayCommand.cs b/UnitTests/Mvvm/Test_RelayCommand.cs
new file mode 100644
index 00000000000..c0229fc3806
--- /dev/null
+++ b/UnitTests/Mvvm/Test_RelayCommand.cs
@@ -0,0 +1,83 @@
+// 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.Mvvm.Commands;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_RelayCommand
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommand_AlwaysEnabled()
+        {
+            int ticks = 0;
+
+            var command = new RelayCommand(() => ticks++);
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute(new object()));
+
+            (object, EventArgs) args = default;
+
+            command.CanExecuteChanged += (s, e) => args = (s, e);
+
+            command.RaiseCanExecuteChanged();
+
+            Assert.AreSame(args.Item1, command);
+            Assert.AreSame(args.Item2, EventArgs.Empty);
+
+            command.Execute(null);
+
+            Assert.AreEqual(ticks, 1);
+
+            command.Execute(new object());
+
+            Assert.AreEqual(ticks, 2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommand_WithCanExecuteFunctionTrue()
+        {
+            int ticks = 0;
+
+            var command = new RelayCommand(() => ticks++, () => true);
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute(new object()));
+
+            command.Execute(null);
+
+            Assert.AreEqual(ticks, 1);
+
+            command.Execute(new object());
+
+            Assert.AreEqual(ticks, 2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommand_WithCanExecuteFunctionFalse()
+        {
+            int ticks = 0;
+
+            var command = new RelayCommand(() => ticks++, () => false);
+
+            Assert.IsFalse(command.CanExecute(null));
+            Assert.IsFalse(command.CanExecute(new object()));
+
+            command.Execute(null);
+
+            Assert.AreEqual(ticks, 0);
+
+            command.Execute(new object());
+
+            Assert.AreEqual(ticks, 0);
+        }
+    }
+}
diff --git a/UnitTests/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
new file mode 100644
index 00000000000..63c8b4f4190
--- /dev/null
+++ b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
@@ -0,0 +1,69 @@
+// 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.Diagnostics.CodeAnalysis;
+using Microsoft.Toolkit.Mvvm.Commands;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Generic type")]
+    public class Test_RelayCommandOfT
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommandOfT_AlwaysEnabled()
+        {
+            string text = string.Empty;
+
+            var command = new RelayCommand<string>(s => text = s);
+
+            Assert.IsTrue(command.CanExecute("Text"));
+            Assert.IsTrue(command.CanExecute(null));
+
+            Assert.ThrowsException<InvalidCastException>(() => command.CanExecute(new object()));
+
+            (object, EventArgs) args = default;
+
+            command.CanExecuteChanged += (s, e) => args = (s, e);
+
+            command.RaiseCanExecuteChanged();
+
+            Assert.AreSame(args.Item1, command);
+            Assert.AreSame(args.Item2, EventArgs.Empty);
+
+            command.Execute("Hello");
+
+            Assert.AreEqual(text, "Hello");
+
+            command.Execute(null);
+
+            Assert.AreEqual(text, null);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommand_WithCanExecuteFunction()
+        {
+            string text = string.Empty;
+
+            var command = new RelayCommand<string>(s => text = s, s => s != null);
+
+            Assert.IsTrue(command.CanExecute("Text"));
+            Assert.IsFalse(command.CanExecute(null));
+
+            Assert.ThrowsException<InvalidCastException>(() => command.CanExecute(new object()));
+
+            command.Execute("Hello");
+
+            Assert.AreEqual(text, "Hello");
+
+            command.Execute(null);
+
+            Assert.AreEqual(text, "Hello");
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 3cfafb33b90..2f729c3c07e 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -139,6 +139,8 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
+    <Compile Include="Mvvm\Test_RelayCommand{T}.cs" />
+    <Compile Include="Mvvm\Test_RelayCommand.cs" />
     <Compile Include="Mvvm\Test_ViewModelBase.cs" />
     <Compile Include="Mvvm\Test_ObservableObject.cs" />
     <Compile Include="Mvvm\Test_Messenger.cs" />

From c0a863bb7b6e53ddff3f7099a5d0e65d66c6e873 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 01:28:14 +0200
Subject: [PATCH 068/595] Messenger XML comments improved

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 00ea5a27157..58c3155ef94 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -12,7 +12,26 @@
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
     /// <summary>
-    /// A type implementing a messaging system between objects.
+    /// A type that can be used to exchange messages between different objects.
+    /// This can be useful to decouple different modules of an application without having to keep strong
+    /// references to types being referenced. It is also possible to send messages to specific channels, uniquely
+    /// identified by a token, and to have different messengers in different sections of an applications.
+    /// In order to use the <see cref="IMessenger"/> functionalities, first define a message type, like so:
+    /// <code>
+    /// public sealed class LoginCompletedMessage { }
+    /// </code>
+    /// Then, register your a recipient for this message:
+    /// <code>
+    /// Messenger.Default.Register&lt;LoginCompletedMessage>(this, m =>
+    /// {
+    ///     // Handle the message here...
+    /// });
+    /// </code>
+    /// Finally, send a message when needed, like so:
+    /// <code>
+    /// Messenger.Default.Send&lt;LoginCompletedMessage>();
+    /// </code>
+    /// For info on the other available features, check the <see cref="IMessenger"/> interface.
     /// </summary>
     public sealed class Messenger : IMessenger
     {

From 2b38baca34bc43926bfe6631074734bb299ce197 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 13:05:05 +0200
Subject: [PATCH 069/595] Added
 ObservableObject.SetAndNotifyOnCompletion<TTask> method

---
 .../ComponentModel/ObservableObject.cs        | 84 +++++++++++++++++++
 UnitTests/Mvvm/Test_ObservableObject.cs       | 56 +++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 263f2698f6b..a7d698c8c67 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -20,9 +20,13 @@
 // </license>
 // ****************************************************************************
 
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq.Expressions;
+using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
@@ -84,5 +88,85 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
 
             return true;
         }
+
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// The behavior mirrors that of <see cref="Set{T}"/>, with the difference being that this method
+        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
+        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
+        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// </summary>
+        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
+        /// <param name="field">An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask>> field, TTask newValue, [CallerMemberName] string propertyName = null!)
+            where TTask : Task
+        {
+            // Get the target field to set
+            if (!((field.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
+            {
+                ThrowArgumentExceptionForInvalidFieldExpression();
+
+                // This is never executed, as the method above always throws
+                return false;
+            }
+
+            TTask oldTask = (TTask)fieldInfo.GetValue(this);
+
+            if (EqualityComparer<TTask>.Default.Equals(oldTask, newValue))
+            {
+                return false;
+            }
+
+            this.OnPropertyChanging(propertyName);
+
+            fieldInfo.SetValue(this, newValue);
+
+            OnPropertyChanged(propertyName);
+
+            /* We use a local async function here so that the main method can
+             * remain synchronous and return a value that can be immediately
+             * used by the caller. This mirrors Set<T>(ref T, T, string). */
+            async Task MonitorTaskAsync()
+            {
+                try
+                {
+                    // Await the task and ignore any exceptions
+                    await newValue;
+                }
+                catch
+                {
+                }
+
+                TTask currentTask = (TTask)fieldInfo.GetValue(this);
+
+                // Only notify if the property hasn't changed
+                if (ReferenceEquals(newValue, currentTask))
+                {
+                    OnPropertyChanged(propertyName);
+                }
+            }
+
+            _ = MonitorTaskAsync();
+
+            return true;
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowArgumentExceptionForInvalidFieldExpression()
+        {
+            throw new ArgumentException("The given expression must be in the form () => field");
+        }
     }
 }
\ No newline at end of file
diff --git a/UnitTests/Mvvm/Test_ObservableObject.cs b/UnitTests/Mvvm/Test_ObservableObject.cs
index 742935b4b13..453fbe1da5a 100644
--- a/UnitTests/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/Mvvm/Test_ObservableObject.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -52,5 +53,60 @@ public T Data
                 set => Set(ref data, value);
             }
         }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_ObservableObject_NotifyTask()
+        {
+            var model = new SampleModelWithTask<int>();
+            var tcs = new TaskCompletionSource<int>();
+            var task = tcs.Task;
+
+            (PropertyChangingEventArgs, Task<int>) changing = default;
+            (PropertyChangedEventArgs, Task<int>) changed = default;
+
+            model.PropertyChanging += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changing = (e, model.Data);
+            };
+
+            model.PropertyChanged += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changed = (e, model.Data);
+            };
+
+            model.Data = task;
+
+            Assert.IsFalse(task.IsCompleted);
+            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
+            Assert.IsNull(changing.Item2);
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
+            Assert.AreSame(changed.Item2, task);
+
+            changed = default;
+
+            tcs.SetResult(42);
+
+            await Task.Delay(100); // Time for the notification to dispatch
+
+            Assert.IsTrue(task.IsCompleted);
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel<int>.Data));
+            Assert.AreSame(changed.Item2, task);
+        }
+
+        public class SampleModelWithTask<T> : ObservableObject
+        {
+            private Task<T> data;
+
+            public Task<T> Data
+            {
+                get => data;
+                set => SetAndNotifyOnCompletion(() => data, value);
+            }
+        }
     }
 }

From 22aa752726a50296d31ff550cf6a2fd2d0da3ee2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 15:39:03 +0200
Subject: [PATCH 070/595] Fixed a comment

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 58c3155ef94..eaf681dfc77 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -42,7 +42,7 @@ public sealed class Messenger : IMessenger
         //                    |                          \____/_____[*]IDictionarySlim<Recipient, Token>
         //                    |  ____________________________/             \____
         //                    | /                                               \
-        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> Values
+        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
         //                                            /               /          /
         //                       __(T1)______________/_______________/          /
         //                      /     ____(T2)______/                          /

From 53982ad32fe8d16f7912586d6688e00b4fd22050 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 15:57:48 +0200
Subject: [PATCH 071/595] Removed unnecessary using directives

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 871f629e3e1..811a3419779 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Buffers;
-using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging

From 774ed79a5f9e752cd838f20dcd51ec40c5f3f321 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 18:32:30 +0200
Subject: [PATCH 072/595] Fixed an incorrect comment

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index eaf681dfc77..72dc3079a43 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -37,11 +37,12 @@ public sealed class Messenger : IMessenger
     {
         // The Messenger class uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
-        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap
+        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap;
         //                    |                         \      /
-        //                    |                          \____/_____[*]IDictionarySlim<Recipient, Token>
-        //                    |  ____________________________/             \____
-        //                    | /                                               \
+        //                    |                          \____/_____[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
+        //                    |   ___________________________/             \____                    /
+        //                    |  /           ___________________________________\__________________/
+        //                    | /           /                                    \
         // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
         //                                            /               /          /
         //                       __(T1)______________/_______________/          /

From 61248d2f65fdd6c1040e5f7d82036b6df95b2aef Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 18:46:46 +0200
Subject: [PATCH 073/595] Minor code tweaks

---
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs    | 4 ++--
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
index c2fe13c80ca..4b7238923f1 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
@@ -53,8 +53,8 @@ public sealed class RelayCommand : ICommand
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         public RelayCommand(Action execute)
-            : this(execute, null)
         {
+            this.execute = execute;
         }
 
         /// <summary>
@@ -62,7 +62,7 @@ public RelayCommand(Action execute)
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
-        public RelayCommand(Action execute, Func<bool>? canExecute)
+        public RelayCommand(Action execute, Func<bool> canExecute)
         {
             this.execute = execute;
             this.canExecute = canExecute;
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 262f56152ce..5825d7d8605 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -54,8 +54,8 @@ public sealed class RelayCommand<T> : ICommand
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         public RelayCommand(Action<T> execute)
-            : this(execute, null)
         {
+            this.execute = execute;
         }
 
         /// <summary>
@@ -63,7 +63,7 @@ public RelayCommand(Action<T> execute)
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
-        public RelayCommand(Action<T> execute, Func<T, bool>? canExecute)
+        public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
         {
             this.execute = execute;
             this.canExecute = canExecute;

From 58f3c6472a4da9427165803fa17215788b202c00 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 18:49:06 +0200
Subject: [PATCH 074/595] Added AsyncRelayCommand type

---
 .../Commands/AsyncRelayCommand.cs             | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
new file mode 100644
index 00000000000..33288d7197d
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
@@ -0,0 +1,90 @@
+// 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.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace Microsoft.Toolkit.Mvvm.Commands
+{
+    /// <summary>
+    /// A command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition of
+    /// accepting a <see cref="Func{TResult}"/> returning a <see cref="Task{TResult}"/> as the execute
+    /// action, and providing a <see cref="ExecutionTask"/> property that notifies changes when
+    /// <see cref="Execute"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
+    /// </summary>
+    public sealed class AsyncRelayCommand : ObservableObject, ICommand
+    {
+        /// <summary>
+        /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute"/> is used.
+        /// </summary>
+        private readonly Func<Task> execute;
+
+        /// <summary>
+        /// The optional action to invoke when <see cref="CanExecute"/> is used.
+        /// </summary>
+        private readonly Func<bool>? canExecute;
+
+        /// <inheritdoc/>
+        public event EventHandler? CanExecuteChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        public AsyncRelayCommand(Func<Task> execute)
+        {
+            this.execute = execute;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
+        {
+            this.execute = execute;
+            this.canExecute = canExecute;
+        }
+
+        private Task? executionTask;
+
+        /// <summary>
+        /// Gets the last scheduled <see cref="Task"/>, if available.
+        /// This property notifies a change when the <see cref="Task{TResult}"/> completes.
+        /// </summary>
+        public Task? ExecutionTask
+        {
+            get => this.executionTask;
+            private set => SetAndNotifyOnCompletion(() => this.executionTask, value);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="CanExecuteChanged" /> event.
+        /// </summary>
+        public void RaiseCanExecuteChanged()
+        {
+            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool CanExecute(object parameter)
+        {
+            return this.canExecute?.Invoke() != false;
+        }
+
+        /// <inheritdoc/>
+        public void Execute(object parameter)
+        {
+            if (CanExecute(parameter))
+            {
+                ExecutionTask = this.execute();
+            }
+        }
+    }
+}
\ No newline at end of file

From 29daf8e4b3ec9d7f7a8fd5070e4130b532ada815 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 19:05:11 +0200
Subject: [PATCH 075/595] Added AsyncRelayCommand<T> type

---
 .../Commands/AsyncRelayCommand{T}.cs          | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
new file mode 100644
index 00000000000..1f0d88294b3
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -0,0 +1,114 @@
+// 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.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace Microsoft.Toolkit.Mvvm.Commands
+{
+    /// <summary>
+    /// A generic command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition
+    /// of accepting a <see cref="Func{TResult}"/> returning a <see cref="Task{TResult}"/> as the execute
+    /// action, and providing a <see cref="ExecutionTask"/> property that notifies changes when
+    /// <see cref="Execute(T)"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
+    /// </summary>
+    /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
+    public sealed class AsyncRelayCommand<T> : ObservableObject, ICommand
+    {
+        /// <summary>
+        /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
+        /// </summary>
+        private readonly Func<T, Task> execute;
+
+        /// <summary>
+        /// The optional action to invoke when <see cref="CanExecute(T)"/> is used.
+        /// </summary>
+        private readonly Func<T, bool>? canExecute;
+
+        /// <inheritdoc/>
+        public event EventHandler? CanExecuteChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        public AsyncRelayCommand(Func<T, Task> execute)
+        {
+            this.execute = execute;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class that can always execute.
+        /// </summary>
+        /// <param name="execute">The execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
+        {
+            this.execute = execute;
+            this.canExecute = canExecute;
+        }
+
+        private Task? executionTask;
+
+        /// <summary>
+        /// Gets the last scheduled <see cref="Task"/>, if available.
+        /// This property notifies a change when the <see cref="Task{TResult}"/> completes.Th
+        /// </summary>
+        public Task? ExecutionTask
+        {
+            get => this.executionTask;
+            private set => SetAndNotifyOnCompletion(() => this.executionTask, value);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="CanExecuteChanged" /> event.
+        /// </summary>
+        public void RaiseCanExecuteChanged()
+        {
+            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="CanExecute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <returns>Whether or not the current command can be executed.</returns>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool CanExecute(T parameter)
+        {
+            return this.canExecute?.Invoke(parameter) != false;
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool CanExecute(object parameter)
+        {
+            return CanExecute((T)parameter);
+        }
+
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="Execute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Execute(T parameter)
+        {
+            if (CanExecute(parameter))
+            {
+                ExecutionTask = this.execute(parameter);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Execute(object parameter)
+        {
+            Execute((T)parameter);
+        }
+    }
+}
\ No newline at end of file

From 9c85a3c76ad3576d4f1d091443d644c91373dc0d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 19:11:49 +0200
Subject: [PATCH 076/595] Bug fixes in
 ObservableObject.SetAndNotifyOnCompletion

---
 .../ComponentModel/ObservableObject.cs              | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index a7d698c8c67..ff8abc33176 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -107,7 +107,7 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask>> field, TTask newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask?>> field, TTask? newValue, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
             // Get the target field to set
@@ -119,9 +119,9 @@ protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask>> field, TT
                 return false;
             }
 
-            TTask oldTask = (TTask)fieldInfo.GetValue(this);
+            TTask? oldTask = (TTask?)fieldInfo.GetValue(this);
 
-            if (EqualityComparer<TTask>.Default.Equals(oldTask, newValue))
+            if (EqualityComparer<TTask?>.Default.Equals(oldTask, newValue))
             {
                 return false;
             }
@@ -132,6 +132,11 @@ protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask>> field, TT
 
             OnPropertyChanged(propertyName);
 
+            if (newValue is null)
+            {
+                return true;
+            }
+
             /* We use a local async function here so that the main method can
              * remain synchronous and return a value that can be immediately
              * used by the caller. This mirrors Set<T>(ref T, T, string). */
@@ -146,7 +151,7 @@ async Task MonitorTaskAsync()
                 {
                 }
 
-                TTask currentTask = (TTask)fieldInfo.GetValue(this);
+                TTask? currentTask = (TTask?)fieldInfo.GetValue(this);
 
                 // Only notify if the property hasn't changed
                 if (ReferenceEquals(newValue, currentTask))

From 61dd57d984de6aa72d7566dc31793f5ae37adcdc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 19:19:58 +0200
Subject: [PATCH 077/595] Added ICommand<T> interface

---
 .../Commands/AsyncRelayCommand{T}.cs          | 16 +++---------
 .../Commands/ICommand{T}.cs                   | 26 +++++++++++++++++++
 .../Commands/RelayCommand{T}.cs               | 16 +++---------
 3 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
index 1f0d88294b3..b58e713ddf4 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
@@ -17,7 +16,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// <see cref="Execute(T)"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
     /// </summary>
     /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
-    public sealed class AsyncRelayCommand<T> : ObservableObject, ICommand
+    public sealed class AsyncRelayCommand<T> : ObservableObject, ICommand<T>
     {
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
@@ -72,12 +71,7 @@ public void RaiseCanExecuteChanged()
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        /// <summary>
-        /// Provides a strongly-typed variant of <see cref="CanExecute(object)"/>.
-        /// </summary>
-        /// <param name="parameter">The input parameter.</param>
-        /// <returns>Whether or not the current command can be executed.</returns>
-        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(T parameter)
         {
@@ -91,11 +85,7 @@ public bool CanExecute(object parameter)
             return CanExecute((T)parameter);
         }
 
-        /// <summary>
-        /// Provides a strongly-typed variant of <see cref="Execute(object)"/>.
-        /// </summary>
-        /// <param name="parameter">The input parameter.</param>
-        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Execute(T parameter)
         {
diff --git a/Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs
new file mode 100644
index 00000000000..6eb2e2e29db
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs
@@ -0,0 +1,26 @@
+using System.Windows.Input;
+
+namespace Microsoft.Toolkit.Mvvm.Commands
+{
+    /// <summary>
+    /// A generic interface representing a more specific version of <see cref="ICommand"/>.
+    /// </summary>
+    /// <typeparam name="T">The type used as argument for the interface methods.</typeparam>
+    public interface ICommand<in T> : ICommand
+    {
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="ICommand.CanExecute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <returns>Whether or not the current command can be executed.</returns>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        bool CanExecute(T parameter);
+
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="ICommand.Execute(object)"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        void Execute(T parameter);
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 5825d7d8605..9d630534e77 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -23,7 +23,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using System.Windows.Input;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
 {
@@ -34,7 +33,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// in the <see cref="Execute(T)"/> and <see cref="CanExecute(T)"/> callback methods.
     /// </summary>
     /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
-    public sealed class RelayCommand<T> : ICommand
+    public sealed class RelayCommand<T> : ICommand<T>
     {
         /// <summary>
         /// The <see cref="Action"/> to invoke when <see cref="Execute(T)"/> is used.
@@ -77,12 +76,7 @@ public void RaiseCanExecuteChanged()
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        /// <summary>
-        /// Provides a strongly-typed variant of <see cref="CanExecute(object)"/>.
-        /// </summary>
-        /// <param name="parameter">The input parameter.</param>
-        /// <returns>Whether or not the current command can be executed.</returns>
-        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(T parameter)
         {
@@ -95,11 +89,7 @@ public bool CanExecute(object parameter)
             return CanExecute((T)parameter);
         }
 
-        /// <summary>
-        /// Provides a strongly-typed variant of <see cref="Execute(object)"/>.
-        /// </summary>
-        /// <param name="parameter">The input parameter.</param>
-        /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
+        /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Execute(T parameter)
         {

From 7ea0d3173e036f11ec41556fe35801f60082fc20 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 20:49:27 +0200
Subject: [PATCH 078/595] Code refactoring, removed build warnings

---
 .../Commands/AsyncRelayCommand.cs             |  2 +-
 .../Commands/AsyncRelayCommand{T}.cs          |  2 +-
 .../ComponentModel/ObservableObject.cs        | 43 ++++++++++++-------
 UnitTests/Mvvm/Test_ObservableObject.cs       |  2 +-
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
index 33288d7197d..16baf7b0ea4 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
@@ -60,7 +60,7 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(() => this.executionTask, value);
+            private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
index b58e713ddf4..e6bfd021e69 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -60,7 +60,7 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(() => this.executionTask, value);
+            private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index ff8abc33176..a74eda2a1a0 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -97,9 +97,23 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
         /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
         /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// Here is a sample property declaration using this method:
+        /// <code>
+        /// private Task myTask;
+        ///
+        /// public Task MyTask
+        /// {
+        ///     get => myTask;
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
+        /// }
+        /// </code>
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="expr">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
+        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
+        /// </param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
@@ -107,28 +121,17 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask?>> field, TTask? newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> expr, TTask? newValue, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
-            // Get the target field to set
-            if (!((field.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
-            {
-                ThrowArgumentExceptionForInvalidFieldExpression();
-
-                // This is never executed, as the method above always throws
-                return false;
-            }
-
-            TTask? oldTask = (TTask?)fieldInfo.GetValue(this);
-
-            if (EqualityComparer<TTask?>.Default.Equals(oldTask, newValue))
+            if (EqualityComparer<TTask?>.Default.Equals(field, newValue))
             {
                 return false;
             }
 
             this.OnPropertyChanging(propertyName);
 
-            fieldInfo.SetValue(this, newValue);
+            field = newValue;
 
             OnPropertyChanged(propertyName);
 
@@ -137,6 +140,16 @@ protected bool SetAndNotifyOnCompletion<TTask>(Expression<Func<TTask?>> field, T
                 return true;
             }
 
+            /* Get the target field to set. This is needed because we can't
+             * capture the ref field in a closure (for the async method). */
+            if (!((expr.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
+            {
+                ThrowArgumentExceptionForInvalidFieldExpression();
+
+                // This is never executed, as the method above always throws
+                return false;
+            }
+
             /* We use a local async function here so that the main method can
              * remain synchronous and return a value that can be immediately
              * used by the caller. This mirrors Set<T>(ref T, T, string). */
diff --git a/UnitTests/Mvvm/Test_ObservableObject.cs b/UnitTests/Mvvm/Test_ObservableObject.cs
index 453fbe1da5a..9d1f5deee57 100644
--- a/UnitTests/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/Mvvm/Test_ObservableObject.cs
@@ -105,7 +105,7 @@ public class SampleModelWithTask<T> : ObservableObject
             public Task<T> Data
             {
                 get => data;
-                set => SetAndNotifyOnCompletion(() => data, value);
+                set => SetAndNotifyOnCompletion(ref data, () => data, value);
             }
         }
     }

From 6e9025802b973f8baa7aae762ec391f91970bbe0 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Apr 2020 21:12:46 +0200
Subject: [PATCH 079/595] Code refactoring, added the IRelayCommand interface

---
 .../Commands/AsyncRelayCommand.cs                |  8 +++-----
 .../Commands/AsyncRelayCommand{T}.cs             |  7 +++----
 .../Commands/Interfaces/IRelayCommand.cs         | 16 ++++++++++++++++
 .../IRelayCommand{T}.cs}                         |  6 +++---
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs  |  8 +++-----
 .../Commands/RelayCommand{T}.cs                  |  7 +++----
 6 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
 rename Microsoft.Toolkit.Mvvm/Commands/{ICommand{T}.cs => Interfaces/IRelayCommand{T}.cs} (87%)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
index 16baf7b0ea4..6727f45ca70 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
@@ -16,7 +16,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// action, and providing a <see cref="ExecutionTask"/> property that notifies changes when
     /// <see cref="Execute"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
     /// </summary>
-    public sealed class AsyncRelayCommand : ObservableObject, ICommand
+    public sealed class AsyncRelayCommand : ObservableObject, IRelayCommand
     {
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute"/> is used.
@@ -63,9 +63,7 @@ public Task? ExecutionTask
             private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
         }
 
-        /// <summary>
-        /// Raises the <see cref="CanExecuteChanged" /> event.
-        /// </summary>
+        /// <inheritdoc/>
         public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
index e6bfd021e69..3884195849c 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
@@ -16,7 +17,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// <see cref="Execute(T)"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
     /// </summary>
     /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
-    public sealed class AsyncRelayCommand<T> : ObservableObject, ICommand<T>
+    public sealed class AsyncRelayCommand<T> : ObservableObject, IRelayCommand<T>
     {
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
@@ -63,9 +64,7 @@ public Task? ExecutionTask
             private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
         }
 
-        /// <summary>
-        /// Raises the <see cref="CanExecuteChanged" /> event.
-        /// </summary>
+        /// <inheritdoc/>
         public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
new file mode 100644
index 00000000000..3e6503c0b45
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
@@ -0,0 +1,16 @@
+using System.Windows.Input;
+
+namespace Microsoft.Toolkit.Mvvm.Commands.Interfaces
+{
+    /// <summary>
+    /// An interface expanding <see cref="ICommand"/> with the ability to raise
+    /// the <see cref="ICommand.CanExecuteChanged"/> event externally.
+    /// </summary>
+    public interface IRelayCommand : ICommand
+    {
+        /// <summary>
+        /// Raises the <see cref="ICommand.CanExecuteChanged" /> event.
+        /// </summary>
+        void RaiseCanExecuteChanged();
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
similarity index 87%
rename from Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs
rename to Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
index 6eb2e2e29db..72b4707d3f9 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/ICommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
@@ -1,12 +1,12 @@
 using System.Windows.Input;
 
-namespace Microsoft.Toolkit.Mvvm.Commands
+namespace Microsoft.Toolkit.Mvvm.Commands.Interfaces
 {
     /// <summary>
-    /// A generic interface representing a more specific version of <see cref="ICommand"/>.
+    /// A generic interface representing a more specific version of <see cref="IRelayCommand"/>.
     /// </summary>
     /// <typeparam name="T">The type used as argument for the interface methods.</typeparam>
-    public interface ICommand<in T> : ICommand
+    public interface IRelayCommand<in T> : IRelayCommand
     {
         /// <summary>
         /// Provides a strongly-typed variant of <see cref="ICommand.CanExecute(object)"/>.
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
index 4b7238923f1..5b83be8a631 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
@@ -23,7 +23,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
 {
@@ -33,7 +33,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// method is <see langword="true"/>. This type does not allow you to accept command parameters
     /// in the <see cref="Execute"/> and <see cref="CanExecute"/> callback methods.
     /// </summary>
-    public sealed class RelayCommand : ICommand
+    public sealed class RelayCommand : IRelayCommand
     {
         /// <summary>
         /// The <see cref="Action"/> to invoke when <see cref="Execute"/> is used.
@@ -68,9 +68,7 @@ public RelayCommand(Action execute, Func<bool> canExecute)
             this.canExecute = canExecute;
         }
 
-        /// <summary>
-        /// Raises the <see cref="CanExecuteChanged" /> event.
-        /// </summary>
+        /// <inheritdoc/>
         public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 9d630534e77..9c0ba22a0d5 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -23,6 +23,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 
 namespace Microsoft.Toolkit.Mvvm.Commands
 {
@@ -33,7 +34,7 @@ namespace Microsoft.Toolkit.Mvvm.Commands
     /// in the <see cref="Execute(T)"/> and <see cref="CanExecute(T)"/> callback methods.
     /// </summary>
     /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
-    public sealed class RelayCommand<T> : ICommand<T>
+    public sealed class RelayCommand<T> : IRelayCommand<T>
     {
         /// <summary>
         /// The <see cref="Action"/> to invoke when <see cref="Execute(T)"/> is used.
@@ -68,9 +69,7 @@ public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
             this.canExecute = canExecute;
         }
 
-        /// <summary>
-        /// Raises the <see cref="CanExecuteChanged" /> event.
-        /// </summary>
+        /// <inheritdoc/>
         public void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);

From 971640d9ae8551bcc29a262860da01daec5c7bd8 Mon Sep 17 00:00:00 2001
From: Vincent <zeGroumf@hotmail.com>
Date: Fri, 17 Apr 2020 00:06:15 +0200
Subject: [PATCH 080/595] fix build pipeling

---
 UnitTests/UnitTestApp.xaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/UnitTests/UnitTestApp.xaml b/UnitTests/UnitTestApp.xaml
index c38cc7fbf26..40cd3de0047 100644
--- a/UnitTests/UnitTestApp.xaml
+++ b/UnitTests/UnitTestApp.xaml
@@ -1,5 +1,17 @@
 <Application x:Class="UnitTests.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+             xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
              xmlns:local="using:UnitTests"
-             RequestedTheme="Light" />
+             RequestedTheme="Light">
+
+    <Application.Resources>
+        <!--
+            We need to manually import some types here to force the XAML compiler to add them to the XamlTypeInfo file.
+            This is needed only when dynamically loading controls that the XAML compiler cannot find (ie using XamlReader.Load to load the controls).
+        -->
+        <Style TargetType="controls:UniformGrid" />
+        <ex:NullableBool x:Key="nullableBool" />
+    </Application.Resources>
+</Application>

From 3497b58a4c906041e3e04b5473ea885ad85ddda1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 02:01:14 +0200
Subject: [PATCH 081/595] Minor improvements and code tweaks

---
 .../ComponentModel/ObservableObject.cs        | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index a74eda2a1a0..4516189ccb5 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -110,7 +110,7 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
-        /// <param name="expr">
+        /// <param name="fieldExpression">
         /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
         /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
         /// </param>
@@ -121,28 +121,34 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> expr, TTask? newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
-            if (EqualityComparer<TTask?>.Default.Equals(field, newValue))
+            if (ReferenceEquals(field, newValue))
             {
                 return false;
             }
 
+            /* Check the status of the new task before assigning it to the
+             * target field. This is so that in case the task is either
+             * null or already completed, we can avoid the overhead of
+             * scheduling the method to monitor its completion. */
+            bool isAlreadyCompletedOrNull = newValue?.IsCompleted ?? true;
+
             this.OnPropertyChanging(propertyName);
 
             field = newValue;
 
             OnPropertyChanged(propertyName);
 
-            if (newValue is null)
+            if (isAlreadyCompletedOrNull)
             {
                 return true;
             }
 
             /* Get the target field to set. This is needed because we can't
              * capture the ref field in a closure (for the async method). */
-            if (!((expr.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
+            if (!((fieldExpression.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
             {
                 ThrowArgumentExceptionForInvalidFieldExpression();
 
@@ -152,13 +158,18 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
 
             /* We use a local async function here so that the main method can
              * remain synchronous and return a value that can be immediately
-             * used by the caller. This mirrors Set<T>(ref T, T, string). */
-            async Task MonitorTaskAsync()
+             * used by the caller. This mirrors Set<T>(ref T, T, string).
+             * We use an async void function instead of a Task-returning function
+             * so that if a binding update caused by the property change notification
+             * causes a crash, it is immediately reported in the application instead of
+             * the exception being ignored (as the returned task wouldn't be awaited),
+             * which would result in a confusing behavior for users. */
+            async void MonitorTask()
             {
                 try
                 {
                     // Await the task and ignore any exceptions
-                    await newValue;
+                    await newValue!;
                 }
                 catch
                 {
@@ -173,7 +184,7 @@ async Task MonitorTaskAsync()
                 }
             }
 
-            _ = MonitorTaskAsync();
+            MonitorTask();
 
             return true;
         }

From 6352082749aa4cb2b7bda3d84f177c005c0c76d5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 02:06:21 +0200
Subject: [PATCH 082/595] Code refactoring, minor performance improvements

---
 .../ComponentModel/ViewModelBase.cs           | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 8e29bb62002..af8d43cc823 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -33,16 +33,6 @@ namespace Microsoft.Toolkit.Mvvm.ComponentModel
     /// </summary>
     public abstract class ViewModelBase : ObservableObject
     {
-        /// <summary>
-        /// The optional <see cref="IMessenger"/> instance to use.
-        /// </summary>
-        private readonly IMessenger? messenger;
-
-        /// <summary>
-        /// The optional <see cref="IIoc"/> instance to use.
-        /// </summary>
-        private readonly IIoc? ioc;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
@@ -51,6 +41,7 @@ public abstract class ViewModelBase : ObservableObject
         /// and <see cref="Services.Ioc.Default"/> services to perform operations.
         /// </remarks>
         protected ViewModelBase()
+            : this(Messaging.Messenger.Default, Services.Ioc.Default)
         {
         }
 
@@ -59,8 +50,8 @@ protected ViewModelBase()
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
         protected ViewModelBase(IMessenger messenger)
+            : this(messenger, Services.Ioc.Default)
         {
-            this.messenger = messenger;
         }
 
         /// <summary>
@@ -68,8 +59,8 @@ protected ViewModelBase(IMessenger messenger)
         /// </summary>
         /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
         protected ViewModelBase(IIoc ioc)
+            : this(Messaging.Messenger.Default, ioc)
         {
-            this.ioc = ioc;
         }
 
         /// <summary>
@@ -79,19 +70,19 @@ protected ViewModelBase(IIoc ioc)
         /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
         protected ViewModelBase(IMessenger messenger, IIoc ioc)
         {
-            this.messenger = messenger;
-            this.ioc = ioc;
+            Messenger = messenger;
+            Ioc = ioc;
         }
 
         /// <summary>
         /// Gets the <see cref="IMessenger"/> instance in use.
         /// </summary>
-        protected IMessenger Messenger => this.messenger ?? Messaging.Messenger.Default;
+        protected IMessenger Messenger { get; }
 
         /// <summary>
         /// Gets the <see cref="IIoc"/> instance in use.
         /// </summary>
-        protected IIoc Ioc => this.ioc ?? Services.Ioc.Default;
+        protected IIoc Ioc { get; }
 
         private bool isActive;
 

From a3ada630ba5ffdef549c684fe131a137877f44eb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 02:09:17 +0200
Subject: [PATCH 083/595] Removed unnecessary notnull constraints

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs   | 12 ++++++------
 .../Messaging/IMessengerExtensions.cs            |  4 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs    | 16 ++++++++--------
 .../DictionarySlim{TKey,TValue}.cs               |  2 +-
 .../IDictionarySlim{TKey,TValue}.cs              |  2 +-
 .../IDictionarySlim{TKey}.cs                     |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 811a3419779..f52ee731895 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -33,7 +33,7 @@ bool IsRegistered<TMessage>(object recipient)
         [Pure]
         bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Registers a recipient for a given type of message.
@@ -56,7 +56,7 @@ void Register<TMessage>(object recipient, Action<TMessage> action)
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Unregisters a recipient from all registered messages.
@@ -81,7 +81,7 @@ void Unregister<TMessage>(object recipient)
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         void Unregister<TToken>(object recipient, TToken token)
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Unregisters a recipient from messages of a given type.
@@ -93,7 +93,7 @@ void Unregister<TToken>(object recipient, TToken token)
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
         void Unregister<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
@@ -127,7 +127,7 @@ void Send<TMessage>(TMessage message)
         /// </remarks>
         void Send<TMessage, TToken>(TToken token)
             where TMessage : class, new()
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
@@ -138,7 +138,7 @@ void Send<TMessage, TToken>(TToken token)
         /// <param name="token">The token indicating what channel to use.</param>
         void Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>;
+            where TToken : IEquatable<TToken>;
 
         /// <summary>
         /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
index 0538576faa8..f56742e7a3a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
@@ -63,7 +63,7 @@ public static TResult Request<TMessage, TResult>(this IMessenger messenger, TMes
         /// </remarks>
         public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TToken token)
             where TMessage : RequestMessage<TResult>, new()
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             return Request<TMessage, TResult, TToken>(messenger, new TMessage(), token);
         }
@@ -81,7 +81,7 @@ public static TResult Request<TMessage, TResult, TToken>(this IMessenger messeng
         /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
         public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TMessage message, TToken token)
             where TMessage : RequestMessage<TResult>
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             messenger.Send(message, token);
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 72dc3079a43..214edd6424a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -110,7 +110,7 @@ public bool IsRegistered<TMessage>(object recipient)
         [Pure]
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             lock (this.recipientsMap)
             {
@@ -131,7 +131,7 @@ public void Register<TMessage>(object recipient, Action<TMessage> action)
         /// <inheritdoc/>
         public void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             lock (this.recipientsMap)
             {
@@ -201,7 +201,7 @@ public void Unregister<TMessage>(object recipient)
 
         /// <inheritdoc/>
         public void Unregister<TToken>(object recipient, TToken token)
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             lock (this.recipientsMap)
             {
@@ -280,7 +280,7 @@ public void Unregister<TToken>(object recipient, TToken token)
         /// <inheritdoc/>
         public void Unregister<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             lock (this.recipientsMap)
             {
@@ -334,7 +334,7 @@ public void Send<TMessage>(TMessage message)
         /// <inheritdoc/>
         public void Send<TMessage, TToken>(TToken token)
             where TMessage : class, new()
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             Send(new TMessage(), token);
         }
@@ -342,7 +342,7 @@ public void Send<TMessage, TToken>(TToken token)
         /// <inheritdoc/>
         public void Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             Action<TMessage>[] entries;
             int i = 0;
@@ -437,7 +437,7 @@ public void Reset()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
             ref object target = ref this.typesMap.GetOrAddValueRef((typeof(TMessage), typeof(TToken)));
 
@@ -463,7 +463,7 @@ private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
         /// </remarks>
         private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>
             where TMessage : class
-            where TToken : notnull, IEquatable<TToken>
+            where TToken : IEquatable<TToken>
         {
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 30173f203ed..e74c5b8e355 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Collections.Extensions
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
     internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
-        where TKey : notnull, IEquatable<TKey>
+        where TKey : IEquatable<TKey>
     {
         // See info in CoreFX labs for how this works
         private static readonly Entry[] InitialEntries = new Entry[1];
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index 106cf8daf5f..e7d3152b25b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Collections.Extensions
     /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
     /// <typeparam name="TValue">The covariant type of values in the dictionary.</typeparam>
     internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
-        where TKey : notnull, IEquatable<TKey>
+        where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Gets the value with the specified key.
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index c9cf27067ba..70bcc6f241c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Collections.Extensions
     /// </summary>
     /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
     internal interface IDictionarySlim<in TKey>
-        where TKey : notnull, IEquatable<TKey>
+        where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Gets the count of entries in the dictionary.

From 05ef4fa48453caa404c0c1003f4fe13171795ef9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 02:11:03 +0200
Subject: [PATCH 084/595] Minor code style tweaks

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 214edd6424a..23c7d154e69 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -140,10 +140,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 var key = new Recipient(recipient);
                 ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
-                if (map is null)
-                {
-                    map = new DictionarySlim<TToken, Action<TMessage>>();
-                }
+                map ??= new DictionarySlim<TToken, Action<TMessage>>();
 
                 // Add the new registration entry
                 ref Action<TMessage> handler = ref map.GetOrAddValueRef(token);
@@ -158,10 +155,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 // Make sure this registration map is tracked for the current recipient
                 ref HashSet<IDictionarySlim<Recipient>> set = ref this.recipientsMap.GetOrAddValueRef(key);
 
-                if (set is null)
-                {
-                    set = new HashSet<IDictionarySlim<Recipient>>();
-                }
+                set ??= new HashSet<IDictionarySlim<Recipient>>();
 
                 set.Add(values);
             }
@@ -441,10 +435,7 @@ private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
         {
             ref object target = ref this.typesMap.GetOrAddValueRef((typeof(TMessage), typeof(TToken)));
 
-            if (target is null)
-            {
-                target = new Mapping<TMessage, TToken>();
-            }
+            target ??= new Mapping<TMessage, TToken>();
 
             /* This method is the only one handling values in the types map, and here we
              * are sure that the object reference we have points to an instance of the right

From 0d80519dd1e8a4efaa0a96fae5f47e3e24de635f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 12:23:05 +0200
Subject: [PATCH 085/595] Simplified commands namespace structure

Also renamed namespace to Microsoft.Toolkit.Mvvm.Input to mirrow System.Windows.Input (the namespace ICommand belongs to)
---
 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs           | 3 +--
 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs        | 3 +--
 Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs    | 2 +-
 Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs | 2 +-
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs                | 3 +--
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs             | 3 +--
 UnitTests/Mvvm/Test_RelayCommand.cs                            | 2 +-
 UnitTests/Mvvm/Test_RelayCommand{T}.cs                         | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
index 6727f45ca70..517ef4c97bc 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
@@ -5,10 +5,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace Microsoft.Toolkit.Mvvm.Commands
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition of
diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
index 3884195849c..afc8b8c6b80 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -5,10 +5,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace Microsoft.Toolkit.Mvvm.Commands
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A generic command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
index 3e6503c0b45..e790dfb1b19 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace Microsoft.Toolkit.Mvvm.Commands.Interfaces
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// An interface expanding <see cref="ICommand"/> with the ability to raise
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
index 72b4707d3f9..54058ee6499 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace Microsoft.Toolkit.Mvvm.Commands.Interfaces
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A generic interface representing a more specific version of <see cref="IRelayCommand"/>.
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
index 5b83be8a631..295686c80a0 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
@@ -23,9 +23,8 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 
-namespace Microsoft.Toolkit.Mvvm.Commands
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A command whose sole purpose is to relay its functionality to other
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 9c0ba22a0d5..3930b2b3e58 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -23,9 +23,8 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Mvvm.Commands.Interfaces;
 
-namespace Microsoft.Toolkit.Mvvm.Commands
+namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A generic command whose sole purpose is to relay its functionality to other
diff --git a/UnitTests/Mvvm/Test_RelayCommand.cs b/UnitTests/Mvvm/Test_RelayCommand.cs
index c0229fc3806..39eacfb18ab 100644
--- a/UnitTests/Mvvm/Test_RelayCommand.cs
+++ b/UnitTests/Mvvm/Test_RelayCommand.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Mvvm.Commands;
+using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm
diff --git a/UnitTests/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
index 63c8b4f4190..b48f8aa5f1e 100644
--- a/UnitTests/Mvvm/Test_RelayCommand{T}.cs
+++ b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Toolkit.Mvvm.Commands;
+using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm

From 900cc9884060593bb66170ced9bb6e9c30e78258 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 12:25:16 +0200
Subject: [PATCH 086/595] Renamed Services namespace to DependencyInjection

This follows the naming from Microsoft.Extensions.DependencyInjection
---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs    | 8 ++++----
 .../{Services => DependencyInjection}/IIoc.cs             | 2 +-
 .../{Services => DependencyInjection}/Ioc.cs              | 2 +-
 UnitTests/Mvvm/Test_Ioc.cs                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{Services => DependencyInjection}/IIoc.cs (99%)
 rename Microsoft.Toolkit.Mvvm/{Services => DependencyInjection}/Ioc.cs (99%)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index af8d43cc823..3c46cedc34e 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -22,9 +22,9 @@
 // ****************************************************************************
 
 using System.Runtime.CompilerServices;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
-using Microsoft.Toolkit.Mvvm.Services;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
@@ -38,10 +38,10 @@ public abstract class ViewModelBase : ObservableObject
         /// </summary>
         /// <remarks>
         /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/>
-        /// and <see cref="Services.Ioc.Default"/> services to perform operations.
+        /// and <see cref="DependencyInjection.Ioc.Default"/> services to perform operations.
         /// </remarks>
         protected ViewModelBase()
-            : this(Messaging.Messenger.Default, Services.Ioc.Default)
+            : this(Messaging.Messenger.Default, DependencyInjection.Ioc.Default)
         {
         }
 
@@ -50,7 +50,7 @@ protected ViewModelBase()
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
         protected ViewModelBase(IMessenger messenger)
-            : this(messenger, Services.Ioc.Default)
+            : this(messenger, DependencyInjection.Ioc.Default)
         {
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Services/IIoc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/Services/IIoc.cs
rename to Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
index 1da7338c581..94d97389170 100644
--- a/Microsoft.Toolkit.Mvvm/Services/IIoc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
@@ -8,7 +8,7 @@
 
 #nullable enable
 
-namespace Microsoft.Toolkit.Mvvm.Services
+namespace Microsoft.Toolkit.Mvvm.DependencyInjection
 {
     /// <summary>
     /// An interface for a type implementing an Inversion of Control service provider.
diff --git a/Microsoft.Toolkit.Mvvm/Services/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/Services/Ioc.cs
rename to Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 5a28a23441c..c1f7dbc6471 100644
--- a/Microsoft.Toolkit.Mvvm/Services/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -11,7 +11,7 @@
 
 #nullable enable
 
-namespace Microsoft.Toolkit.Mvvm.Services
+namespace Microsoft.Toolkit.Mvvm.DependencyInjection
 {
     /// <summary>
     /// An Inversion of Control container that can be used to register and access instances of types providing services.
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index 7ddd33f668c..cf06f8090f7 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -2,7 +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 Microsoft.Toolkit.Mvvm.Services;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm

From 2913e8fb6beeb9c36bd1809e9124b98585c0ffe7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 15:24:07 +0200
Subject: [PATCH 087/595] Code style updates

---
 .../DictionarySlim{TKey,TValue}.cs            | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index e74c5b8e355..f03eea830b4 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -37,10 +37,10 @@ internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
     {
         // See info in CoreFX labs for how this works
         private static readonly Entry[] InitialEntries = new Entry[1];
-        private int _count;
-        private int _freeList = -1;
-        private int[] _buckets;
-        private Entry[] _entries;
+        private int count;
+        private int freeList = -1;
+        private int[] buckets;
+        private Entry[] entries;
 
         private struct Entry
         {
@@ -54,21 +54,21 @@ private struct Entry
         /// </summary>
         public DictionarySlim()
         {
-            _buckets = HashHelpers.SizeOneIntArray;
-            _entries = InitialEntries;
+            this.buckets = HashHelpers.SizeOneIntArray;
+            this.entries = InitialEntries;
         }
 
         /// <inheritdoc/>
-        public int Count => _count;
+        public int Count => this.count;
 
         /// <inheritdoc/>
         public TValue this[TKey key]
         {
             get
             {
-                Entry[] entries = _entries;
+                Entry[] entries = this.entries;
 
-                for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+                for (int i = this.buckets[key.GetHashCode() & (this.buckets.Length - 1)] - 1;
                     (uint)i < (uint)entries.Length;
                     i = entries[i].Next)
                 {
@@ -87,18 +87,18 @@ public TValue this[TKey key]
         /// <inheritdoc/>
         public void Clear()
         {
-            _count = 0;
-            _freeList = -1;
-            _buckets = HashHelpers.SizeOneIntArray;
-            _entries = InitialEntries;
+            this.count = 0;
+            this.freeList = -1;
+            this.buckets = HashHelpers.SizeOneIntArray;
+            this.entries = InitialEntries;
         }
 
         /// <inheritdoc cref="Dictionary{TKey,TValue}.ContainsKey"/>
         public bool ContainsKey(TKey key)
         {
-            Entry[] entries = _entries;
+            Entry[] entries = this.entries;
 
-            for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+            for (int i = this.buckets[key.GetHashCode() & (this.buckets.Length - 1)] - 1;
                  (uint)i < (uint)entries.Length;
                  i = entries[i].Next)
             {
@@ -119,9 +119,9 @@ public bool ContainsKey(TKey key)
         /// <returns>Whether or not the key was present.</returns>
         public bool TryGetValue(TKey key, out TValue value)
         {
-            Entry[] entries = _entries;
+            Entry[] entries = this.entries;
 
-            for (int i = _buckets[key.GetHashCode() & (_buckets.Length - 1)] - 1;
+            for (int i = this.buckets[key.GetHashCode() & (this.buckets.Length - 1)] - 1;
                  (uint)i < (uint)entries.Length;
                  i = entries[i].Next)
             {
@@ -141,9 +141,9 @@ public bool TryGetValue(TKey key, out TValue value)
         /// <inheritdoc/>
         public bool Remove(TKey key)
         {
-            Entry[] entries = _entries;
-            int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
-            int entryIndex = _buckets[bucketIndex] - 1;
+            Entry[] entries = this.entries;
+            int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
+            int entryIndex = this.buckets[bucketIndex] - 1;
             int lastIndex = -1;
 
             while (entryIndex != -1)
@@ -157,15 +157,15 @@ public bool Remove(TKey key)
                     }
                     else
                     {
-                        _buckets[bucketIndex] = candidate.Next + 1;
+                        this.buckets[bucketIndex] = candidate.Next + 1;
                     }
 
                     entries[entryIndex] = default;
 
-                    entries[entryIndex].Next = -3 - _freeList;
-                    _freeList = entryIndex;
+                    entries[entryIndex].Next = -3 - this.freeList;
+                    this.freeList = entryIndex;
 
-                    _count--;
+                    this.count--;
                     return true;
                 }
 
@@ -185,10 +185,10 @@ public bool Remove(TKey key)
         /// <returns>Reference to the new or existing value</returns>
         public ref TValue GetOrAddValueRef(TKey key)
         {
-            Entry[] entries = _entries;
-            int bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
+            Entry[] entries = this.entries;
+            int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
 
-            for (int i = _buckets[bucketIndex] - 1;
+            for (int i = this.buckets[bucketIndex] - 1;
                  (uint)i < (uint)entries.Length;
                  i = entries[i].Next)
             {
@@ -204,30 +204,30 @@ public ref TValue GetOrAddValueRef(TKey key)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private ref TValue AddKey(TKey key, int bucketIndex)
         {
-            Entry[] entries = _entries;
+            Entry[] entries = this.entries;
             int entryIndex;
 
-            if (_freeList != -1)
+            if (this.freeList != -1)
             {
-                entryIndex = _freeList;
-                _freeList = -3 - entries[_freeList].Next;
+                entryIndex = this.freeList;
+                this.freeList = -3 - entries[this.freeList].Next;
             }
             else
             {
-                if (_count == entries.Length || entries.Length == 1)
+                if (this.count == entries.Length || entries.Length == 1)
                 {
                     entries = Resize();
-                    bucketIndex = key.GetHashCode() & (_buckets.Length - 1);
+                    bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
                 }
 
-                entryIndex = _count;
+                entryIndex = this.count;
             }
 
             entries[entryIndex].Key = key;
-            entries[entryIndex].Next = _buckets[bucketIndex] - 1;
+            entries[entryIndex].Next = this.buckets[bucketIndex] - 1;
 
-            _buckets[bucketIndex] = entryIndex + 1;
-            _count++;
+            this.buckets[bucketIndex] = entryIndex + 1;
+            this.count++;
 
             return ref entries[entryIndex].Value;
         }
@@ -238,8 +238,8 @@ private ref TValue AddKey(TKey key, int bucketIndex)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private Entry[] Resize()
         {
-            int count = _count;
-            int newSize = _entries.Length * 2;
+            int count = this.count;
+            int newSize = this.entries.Length * 2;
 
             if ((uint)newSize > int.MaxValue)
             {
@@ -248,7 +248,7 @@ private Entry[] Resize()
 
             var entries = new Entry[newSize];
 
-            Array.Copy(_entries, 0, entries, 0, count);
+            Array.Copy(this.entries, 0, entries, 0, count);
 
             var newBuckets = new int[entries.Length];
 
@@ -259,8 +259,8 @@ private Entry[] Resize()
                 newBuckets[bucketIndex] = count + 1;
             }
 
-            _buckets = newBuckets;
-            _entries = entries;
+            this.buckets = newBuckets;
+            this.entries = entries;
 
             return entries;
         }
@@ -273,43 +273,43 @@ private Entry[] Resize()
         /// </summary>
         public ref struct Enumerator
         {
-            private readonly DictionarySlim<TKey, TValue> _dictionary;
-            private int _index;
-            private int _count;
-            private KeyValuePair<TKey, TValue> _current;
+            private readonly DictionarySlim<TKey, TValue> dictionary;
+            private int index;
+            private int count;
+            private KeyValuePair<TKey, TValue> current;
 
             internal Enumerator(DictionarySlim<TKey, TValue> dictionary)
             {
-                _dictionary = dictionary;
-                _index = 0;
-                _count = _dictionary._count;
-                _current = default;
+                this.dictionary = dictionary;
+                this.index = 0;
+                this.count = this.dictionary.count;
+                this.current = default;
             }
 
             /// <inheritdoc cref="IEnumerator.MoveNext"/>
             public bool MoveNext()
             {
-                if (_count == 0)
+                if (this.count == 0)
                 {
-                    _current = default;
+                    this.current = default;
                     return false;
                 }
 
-                _count--;
+                this.count--;
 
-                while (_dictionary._entries[_index].Next < -1)
+                while (this.dictionary.entries[this.index].Next < -1)
                 {
-                    _index++;
+                    this.index++;
                 }
 
-                _current = new KeyValuePair<TKey, TValue>(
-                    _dictionary._entries[_index].Key,
-                    _dictionary._entries[_index++].Value);
+                this.current = new KeyValuePair<TKey, TValue>(
+                    this.dictionary.entries[this.index].Key,
+                    this.dictionary.entries[this.index++].Value);
                 return true;
             }
 
             /// <inheritdoc cref="IEnumerator{T}.Current"/>
-            public KeyValuePair<TKey, TValue> Current => _current;
+            public KeyValuePair<TKey, TValue> Current => this.current;
         }
 
         /// <summary>

From 41284210b431bb98991ccfedec2ffd2fa509090f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 15:38:56 +0200
Subject: [PATCH 088/595] Fixed an incorrect using directive

---
 UnitTests/Mvvm/Test_ViewModelBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/Mvvm/Test_ViewModelBase.cs
index 650bea05e86..03c08bf23f2 100644
--- a/UnitTests/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/Mvvm/Test_ViewModelBase.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
-using Microsoft.Toolkit.Mvvm.Services;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm

From fdf01e3d297dccbf637586056e29c8100cd6d64d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 15:39:20 +0200
Subject: [PATCH 089/595] Minor performance improvements to the Messenger class

---
 .../DictionarySlim{TKey,TValue}.cs            | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index f03eea830b4..7597d309585 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -273,16 +273,16 @@ private Entry[] Resize()
         /// </summary>
         public ref struct Enumerator
         {
-            private readonly DictionarySlim<TKey, TValue> dictionary;
+            private readonly Entry[] entries;
             private int index;
             private int count;
             private KeyValuePair<TKey, TValue> current;
 
             internal Enumerator(DictionarySlim<TKey, TValue> dictionary)
             {
-                this.dictionary = dictionary;
+                this.entries = dictionary.entries;
                 this.index = 0;
-                this.count = this.dictionary.count;
+                this.count = dictionary.count;
                 this.current = default;
             }
 
@@ -292,24 +292,32 @@ public bool MoveNext()
                 if (this.count == 0)
                 {
                     this.current = default;
+
                     return false;
                 }
 
                 this.count--;
 
-                while (this.dictionary.entries[this.index].Next < -1)
+                Entry[] entries = this.entries;
+
+                while (entries[this.index].Next < -1)
                 {
                     this.index++;
                 }
 
                 this.current = new KeyValuePair<TKey, TValue>(
-                    this.dictionary.entries[this.index].Key,
-                    this.dictionary.entries[this.index++].Value);
+                    entries[this.index].Key,
+                    entries[this.index++].Value);
+
                 return true;
             }
 
             /// <inheritdoc cref="IEnumerator{T}.Current"/>
-            public KeyValuePair<TKey, TValue> Current => this.current;
+            public KeyValuePair<TKey, TValue> Current
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get => this.current;
+            }
         }
 
         /// <summary>

From 6bb3d4ccaaa5925de8d0ba47a46103a343197e3b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 16:08:35 +0200
Subject: [PATCH 090/595] Minor memory improvements to the Messenger class

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 78 +++++++++++++------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 23c7d154e69..7ac13b0acc8 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -88,7 +88,7 @@ private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>
         /// </summary>
         /// <remarks>
         /// The values are just of type <see cref="object"/> as we don't know the type parameters in advance.
-        /// Each method relies on <see cref="GetMapping{TMessage,TToken}"/> to get the type-safe instance
+        /// Each method relies on <see cref="GetOrAddMapping{TMessage,TToken}"/> to get the type-safe instance
         /// of the <see cref="Mapping{TMessage,TToken}"/> class for each pair of generic arguments in use.
         /// </remarks>
         private readonly DictionarySlim<(Type, Type), object> typesMap
@@ -114,10 +114,14 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         {
             lock (this.recipientsMap)
             {
-                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
+                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
+                {
+                    return false;
+                }
+
                 var key = new Recipient(recipient);
 
-                return values.ContainsKey(key);
+                return mapping!.ContainsKey(key);
             }
         }
 
@@ -136,7 +140,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
             lock (this.recipientsMap)
             {
                 // Get the <TMessage, TToken> registration list for this recipient
-                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
+                Mapping<TMessage, TToken> values = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
                 ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
 
@@ -278,11 +282,15 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
         {
             lock (this.recipientsMap)
             {
-                // Get the registration list (same as above)
-                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
+                // Get the registration list, if available
+                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
+                {
+                    return;
+                }
+
                 var key = new Recipient(recipient);
 
-                if (!values.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>> map))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>> map))
                 {
                     return;
                 }
@@ -297,11 +305,11 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                  * to the static mapping between existing registered recipients. */
                 if (map.Count == 0)
                 {
-                    values.Remove(key);
+                    mapping.Remove(key);
 
                     HashSet<IDictionarySlim<Recipient>> set = this.recipientsMap[key];
 
-                    set.Remove(values);
+                    set.Remove(mapping);
 
                     if (set.Count == 0)
                     {
@@ -348,10 +356,13 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
                  * inside one of the currently existing handlers. We can use memory pooling
                  * to reuse arrays, to minimize the average memory usage. In practice,
                  * we usually just need to pay the small overhead of copying the items. */
-                Mapping<TMessage, TToken> values = GetMapping<TMessage, TToken>();
+                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
+                {
+                    return;
+                }
 
                 // Count the total number of recipients (including with different tokens)
-                foreach (var pair in values)
+                foreach (var pair in mapping!)
                 {
                     i += pair.Value.Count;
                 }
@@ -367,7 +378,7 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
                  * to count the number of matching handlers to invoke later on.
                  * This will be the array slice with valid actions in the rented buffer. */
                 i = 0;
-                foreach (var pair in values)
+                foreach (var pair in mapping)
                 {
                     foreach (var entry in pair.Value)
                     {
@@ -417,19 +428,43 @@ public void Reset()
         }
 
         /// <summary>
-        /// Gets the <see cref="Mapping{TMessage,TToken}"/> instance of currently registered recipients for the
-        /// combination of types <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>, along with
-        /// their registered actions and tokens. Each recipient has an associated <see cref="DictionarySlim{TKey,TValue}"/>
-        /// mapping each token value to a specific handler on that communication channel, if available.
-        /// Using a pair of <see cref="DictionarySlim{TKey,TValue}"/> instances for the two indirect mappings allows for
-        /// quick access to all the handlers per recipient, and to the handler per token for each recipient.
+        /// Tries to get the <see cref="Mapping{TMessage,TToken}"/> instance of currently registered recipients
+        /// for the combination of types <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>.
         /// </summary>
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <returns>A <see cref="Mapping{TMessage,TToken}"/> instance with the requested type arguments.</returns>
+        /// <param name="mapping">The resulting <see cref="Mapping{TMessage,TToken}"/> instance, if found.</param>
+        /// <returns>Whether or not the required <see cref="Mapping{TMessage,TToken}"/> instance was found.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
+        private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapping)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            if (this.typesMap.TryGetValue((typeof(TMessage), typeof(TToken)), out object target))
+            {
+                /* This method and the ones above are the only ones handling values in the types map,
+                 * and here we are sure that the object reference we have points to an instance of the
+                 * right type. Using an unsafe cast skips two conditional branches and is faster. */
+                mapping = Unsafe.As<Mapping<TMessage, TToken>>(target);
+
+                return true;
+            }
+
+            mapping = null;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Mapping{TMessage,TToken}"/> instance of currently registered recipients
+        /// for the combination of types <typeparamref name="TMessage"/> and <typeparamref name="TToken"/>.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <returns>A <see cref="Mapping{TMessage,TToken}"/> instance with the requested type arguments.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -437,9 +472,6 @@ private Mapping<TMessage, TToken> GetMapping<TMessage, TToken>()
 
             target ??= new Mapping<TMessage, TToken>();
 
-            /* This method is the only one handling values in the types map, and here we
-             * are sure that the object reference we have points to an instance of the right
-             * type. Using an unsafe cast skips two conditional branches and is faster. */
             return Unsafe.As<Mapping<TMessage, TToken>>(target);
         }
 

From d077563338bbb5188919afe61b800598b173648a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 16:39:01 +0200
Subject: [PATCH 091/595] Minor bug fixes

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 7ac13b0acc8..420ce273018 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -172,9 +172,8 @@ public void Unregister(object recipient)
             {
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
-                ref HashSet<IDictionarySlim<Recipient>> set = ref this.recipientsMap.GetOrAddValueRef(key);
 
-                if (set is null)
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
                 {
                     return;
                 }
@@ -185,7 +184,7 @@ public void Unregister(object recipient)
                     map.Remove(key);
                 }
 
-                // Remove the associated set in the static map
+                // Remove the associated set in the recipients map
                 this.recipientsMap.Remove(key);
             }
         }

From 7e623c043b28f19974a7313c17e5a2e4427c4e00 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 17:14:42 +0200
Subject: [PATCH 092/595] Added Type2 struct

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 92 +++++++++++++++++--
 1 file changed, 82 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 420ce273018..b0fe4c77588 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -45,12 +45,12 @@ public sealed class Messenger : IMessenger
         //                    | /           /                                    \
         // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
         //                                            /               /          /
-        //                       __(T1)______________/_______________/          /
-        //                      /     ____(T2)______/                          /
-        //                     /     /                                        /
-        //                    /     /        ________(as object)_____________/
-        //                   /     /        /
-        // DictionarySlim<(Type, Type), object> typesMap;
+        //                       __(Type2.tToken)____/               /          /
+        //                      /_______________(Type2.tMessage)____/          /
+        //                     /                                              /
+        //                    /      ________________(as object)_____________/
+        //                   /      /
+        // DictionarySlim<Type2, object> typesMap;
         // --------------------------------------------------------------------------------------------------------
         // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
         // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
@@ -91,8 +91,8 @@ private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>
         /// Each method relies on <see cref="GetOrAddMapping{TMessage,TToken}"/> to get the type-safe instance
         /// of the <see cref="Mapping{TMessage,TToken}"/> class for each pair of generic arguments in use.
         /// </remarks>
-        private readonly DictionarySlim<(Type, Type), object> typesMap
-            = new DictionarySlim<(Type, Type), object>();
+        private readonly DictionarySlim<Type2, object> typesMap
+            = new DictionarySlim<Type2, object>();
 
         /// <summary>
         /// Gets the default <see cref="Messenger"/> instance.
@@ -440,7 +440,9 @@ private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapp
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            if (this.typesMap.TryGetValue((typeof(TMessage), typeof(TToken)), out object target))
+            var key = new Type2(typeof(TMessage), typeof(TToken));
+
+            if (this.typesMap.TryGetValue(key, out object target))
             {
                 /* This method and the ones above are the only ones handling values in the types map,
                  * and here we are sure that the object reference we have points to an instance of the
@@ -467,7 +469,8 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            ref object target = ref this.typesMap.GetOrAddValueRef((typeof(TMessage), typeof(TToken)));
+            var key = new Type2(typeof(TMessage), typeof(TToken));
+            ref object target = ref this.typesMap.GetOrAddValueRef(key);
 
             target ??= new Mapping<TMessage, TToken>();
 
@@ -538,6 +541,75 @@ public override int GetHashCode()
             }
         }
 
+        /// <summary>
+        /// A simple type representing an immutable pair of types.
+        /// </summary>
+        /// <remarks>
+        /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> as it's faster in its
+        /// <see cref="GetHashCode"/> and <see cref="IEquatable{T}.Equals(T)"/> methods, and because
+        /// unlike a value tuple it exposes its fields as immutable. Additionally, the
+        /// <see cref="tMessage"/> and <see cref="tToken"/> fields provide additional clarity reading
+        /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
+        /// </remarks>
+        public readonly struct Type2 : IEquatable<Type2>
+        {
+            /// <summary>
+            /// The type of registered message.
+            /// </summary>
+            private readonly Type tMessage;
+
+            /// <summary>
+            /// The type of registration token.
+            /// </summary>
+            private readonly Type tToken;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Type2"/> struct.
+            /// </summary>
+            /// <param name="tMessage">The type of registered message.</param>
+            /// <param name="tToken">The type of registration token.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Type2(Type tMessage, Type tToken)
+            {
+                this.tMessage = tMessage;
+                this.tToken = tToken;
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Type2 other)
+            {
+                return
+                    ReferenceEquals(this.tMessage, other.tMessage) &&
+                    ReferenceEquals(this.tToken, other.tToken);
+            }
+
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Type2 other && Equals(other);
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    /* To combine the two hashes, we can simply use the fast djb2 hash algorithm.
+                     * This is not a problem in this case since we already know that the base
+                     * RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution. */
+                    int hash = RuntimeHelpers.GetHashCode(this.tMessage);
+
+                    hash = (hash << 5) + hash;
+
+                    hash += RuntimeHelpers.GetHashCode(this.tToken);
+
+                    return hash;
+                }
+            }
+        }
+
         /// <summary>
         /// An empty type representing a generic token with no specific value.
         /// </summary>

From 1bffb0406bfbe8ac3ee97baf1ca5b61033c2bbfd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 19:17:50 +0200
Subject: [PATCH 093/595] Minor code tweaks

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index b0fe4c77588..01503698ba2 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -45,20 +45,19 @@ public sealed class Messenger : IMessenger
         //                    | /           /                                    \
         // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
         //                                            /               /          /
-        //                       __(Type2.tToken)____/               /          /
-        //                      /_______________(Type2.tMessage)____/          /
-        //                     /                                              /
-        //                    /      ________________(as object)_____________/
-        //                   /      /
-        // DictionarySlim<Type2, object> typesMap;
+        //                      ___(Type2.tToken)____/               /          /
+        //                     /________________(Type2.tMessage)____/          /
+        //                    /           ____________________________________/
+        //                   /           /
+        // DictionarySlim<Type2, IDictionarySlim<Recipient>> typesMap;
         // --------------------------------------------------------------------------------------------------------
         // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
         // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
         // dictionary, so that each recipient can have up to one registered handler for a given token, for each
         // message type. Each mapping is stored in the types map, which associates to each pair of concrete types the
-        // mapping instances. Each instances is just exposed as an object, as each will be a closed type over a different
-        // combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in the main
-        // recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
+        // mapping instances. Each instances is just exposed as an IDictionarySlim<Recipient>, as each will be a closed type over
+        // a different combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in
+        // the main recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
         // message types and token types). A recipient is stored in the main map as long as it has at least one
         // registered handler in any of the existing mappings for every message/token type combination.
         // The shared map is used to access the set of all registered handlers for a given recipient, without having
@@ -87,12 +86,12 @@ private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>
         /// The <see cref="Mapping{TMessage,TToken}"/> instance for types combination.
         /// </summary>
         /// <remarks>
-        /// The values are just of type <see cref="object"/> as we don't know the type parameters in advance.
+        /// The values are just of type <see cref="IDictionarySlim{T}"/> as we don't know the type parameters in advance.
         /// Each method relies on <see cref="GetOrAddMapping{TMessage,TToken}"/> to get the type-safe instance
         /// of the <see cref="Mapping{TMessage,TToken}"/> class for each pair of generic arguments in use.
         /// </remarks>
-        private readonly DictionarySlim<Type2, object> typesMap
-            = new DictionarySlim<Type2, object>();
+        private readonly DictionarySlim<Type2, IDictionarySlim<Recipient>> typesMap
+            = new DictionarySlim<Type2, IDictionarySlim<Recipient>>();
 
         /// <summary>
         /// Gets the default <see cref="Messenger"/> instance.
@@ -442,7 +441,7 @@ private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapp
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
 
-            if (this.typesMap.TryGetValue(key, out object target))
+            if (this.typesMap.TryGetValue(key, out IDictionarySlim<Recipient> target))
             {
                 /* This method and the ones above are the only ones handling values in the types map,
                  * and here we are sure that the object reference we have points to an instance of the
@@ -470,7 +469,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
             where TToken : IEquatable<TToken>
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
-            ref object target = ref this.typesMap.GetOrAddValueRef(key);
+            ref IDictionarySlim<Recipient> target = ref this.typesMap.GetOrAddValueRef(key);
 
             target ??= new Mapping<TMessage, TToken>();
 

From 63baa83829fa3525c9d73920a1e1a77d5ff0045c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 19:38:17 +0200
Subject: [PATCH 094/595] Fixed missing cleanup from
 Messenger.Unsubscribe(object)

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 87 ++++++++++++++-----
 1 file changed, 63 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 01503698ba2..cab45351df9 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -37,25 +37,25 @@ public sealed class Messenger : IMessenger
     {
         // The Messenger class uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
-        // DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap;
-        //                    |                         \      /
-        //                    |                          \____/_____[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
-        //                    |   ___________________________/             \____                    /
-        //                    |  /           ___________________________________\__________________/
+        // DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
+        //                    |                  \             /
+        //                    |                   \___________/_____[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
+        //                    |   ___________________________/             \____                      /
+        //                    |  /           ___________________________________\____________________/
         //                    | /           /                                    \
         // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
         //                                            /               /          /
         //                      ___(Type2.tToken)____/               /          /
         //                     /________________(Type2.tMessage)____/          /
-        //                    /           ____________________________________/
-        //                   /           /
-        // DictionarySlim<Type2, IDictionarySlim<Recipient>> typesMap;
+        //                    /       ________________________________________/
+        //                   /       /
+        // DictionarySlim<Type2, IMapping> typesMap;
         // --------------------------------------------------------------------------------------------------------
         // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
         // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
         // dictionary, so that each recipient can have up to one registered handler for a given token, for each
         // message type. Each mapping is stored in the types map, which associates to each pair of concrete types the
-        // mapping instances. Each instances is just exposed as an IDictionarySlim<Recipient>, as each will be a closed type over
+        // mapping instances. Each instances is just exposed as an IMapping, as each will be a closed type over
         // a different combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in
         // the main recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
         // message types and token types). A recipient is stored in the main map as long as it has at least one
@@ -79,8 +79,7 @@ public sealed class Messenger : IMessenger
         /// so that all the existing handlers can be removed without having to dynamically create
         /// the generic types for the containers of the various dictionaries mapping the handlers.
         /// </remarks>
-        private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>> recipientsMap
-            = new DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>();
+        private readonly DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap = new DictionarySlim<Recipient, HashSet<IMapping>>();
 
         /// <summary>
         /// The <see cref="Mapping{TMessage,TToken}"/> instance for types combination.
@@ -90,8 +89,7 @@ private readonly DictionarySlim<Recipient, HashSet<IDictionarySlim<Recipient>>>
         /// Each method relies on <see cref="GetOrAddMapping{TMessage,TToken}"/> to get the type-safe instance
         /// of the <see cref="Mapping{TMessage,TToken}"/> class for each pair of generic arguments in use.
         /// </remarks>
-        private readonly DictionarySlim<Type2, IDictionarySlim<Recipient>> typesMap
-            = new DictionarySlim<Type2, IDictionarySlim<Recipient>>();
+        private readonly DictionarySlim<Type2, IMapping> typesMap = new DictionarySlim<Type2, IMapping>();
 
         /// <summary>
         /// Gets the default <see cref="Messenger"/> instance.
@@ -156,9 +154,9 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 handler = action;
 
                 // Make sure this registration map is tracked for the current recipient
-                ref HashSet<IDictionarySlim<Recipient>> set = ref this.recipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IMapping> set = ref this.recipientsMap.GetOrAddValueRef(key);
 
-                set ??= new HashSet<IDictionarySlim<Recipient>>();
+                set ??= new HashSet<IMapping>();
 
                 set.Add(values);
             }
@@ -172,15 +170,28 @@ public void Unregister(object recipient)
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
 
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping> set))
                 {
                     return;
                 }
 
                 // Removes all the lists of registered handlers for the recipient
-                foreach (IDictionarySlim<Recipient> map in set)
+                foreach (IMapping map in set)
                 {
                     map.Remove(key);
+
+                    if (map.Count == 0)
+                    {
+                        /* Maps here are really of type Mapping<,> and with unknown type arguments.
+                         * If after removing the current recipient a given map becomes empty, it means
+                         * that there are no registered recipients at all for a given pair of message
+                         * and token types. In that case, we also remove the map from the types map.
+                         * The reason for keeping a key in each mapping is that removing items from a
+                         * dictionary (a hashed collection) only costs O(1) in the best case, while
+                         * if we had tried to iterate the whole dictionary every time we would have
+                         * paid an O(n) minimum cost for each single remove operation. */
+                        this.typesMap.Remove(map.TypeArguments);
+                    }
                 }
 
                 // Remove the associated set in the recipients map
@@ -204,7 +215,7 @@ public void Unregister<TToken>(object recipient, TToken token)
                 // Get the shared set of mappings for the recipient, if present
                 var key = new Recipient(recipient);
 
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IDictionarySlim<Recipient>> set))
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping> set))
                 {
                     return;
                 }
@@ -219,8 +230,14 @@ public void Unregister<TToken>(object recipient, TToken token)
                 try
                 {
                     // Select the items with the same token type
-                    foreach (IDictionarySlim<Recipient> item in set)
+                    foreach (IMapping item in set)
                     {
+                        /* This is technically a "suspicious cast" as there's no type that inherits
+                         * from both IMapping and IDictionarySlim<Recipient, IDictionarySlim<TToken>>.
+                         * But this is fine since IMapping instances are really instances of
+                         * Mapping<TMessage, TToken>, which in turn inherits from
+                         * DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>, which
+                         * then implements IDictionarySlim<Recipient, IDictionarySlim<TToken>>. */
                         if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> map)
                         {
                             maps[i++] = map;
@@ -254,7 +271,7 @@ public void Unregister<TToken>(object recipient, TToken token)
                                  * entirely for the current recipient, and lost the strong
                                  * reference to it as well. This is the same situation that
                                  * would've been achieved by just calling Unregister(recipient). */
-                                set.Remove(map);
+                                set.Remove(Unsafe.As<IMapping>(map));
 
                                 if (set.Count == 0)
                                 {
@@ -305,7 +322,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                 {
                     mapping.Remove(key);
 
-                    HashSet<IDictionarySlim<Recipient>> set = this.recipientsMap[key];
+                    HashSet<IMapping> set = this.recipientsMap[key];
 
                     set.Remove(mapping);
 
@@ -441,7 +458,7 @@ private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapp
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
 
-            if (this.typesMap.TryGetValue(key, out IDictionarySlim<Recipient> target))
+            if (this.typesMap.TryGetValue(key, out IMapping target))
             {
                 /* This method and the ones above are the only ones handling values in the types map,
                  * and here we are sure that the object reference we have points to an instance of the
@@ -469,7 +486,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
             where TToken : IEquatable<TToken>
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
-            ref IDictionarySlim<Recipient> target = ref this.typesMap.GetOrAddValueRef(key);
+            ref IMapping target = ref this.typesMap.GetOrAddValueRef(key);
 
             target ??= new Mapping<TMessage, TToken>();
 
@@ -485,10 +502,32 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
         /// This type is defined for simplicity and as a workaround for the lack of support for using type aliases
         /// over open generic types in C# (using type aliases can only be used for concrete, closed types).
         /// </remarks>
-        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>
+        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>, IMapping
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Mapping{TMessage, TToken}"/> class.
+            /// </summary>
+            public Mapping()
+            {
+                TypeArguments = new Type2(typeof(TMessage), typeof(TToken));
+            }
+
+            /// <inheritdoc/>
+            public Type2 TypeArguments { get; }
+        }
+
+        /// <summary>
+        /// An interface for the <see cref="Mapping{TMessage,TToken}"/> type which allows to retrieve the type
+        /// arguments from a given generic instance without having any prior knowledge about those arguments.
+        /// </summary>
+        private interface IMapping : IDictionarySlim<Recipient>
+        {
+            /// <summary>
+            /// Gets the <see cref="Type2"/> instance representing the current type arguments.
+            /// </summary>
+            Type2 TypeArguments { get; }
         }
 
         /// <summary>

From 277effc9c0286d683e426c5368e4699ec64ba042 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 22:29:14 +0200
Subject: [PATCH 095/595] Fixed missing file headers

---
 Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs | 6 +++++-
 .../Commands/Interfaces/IRelayCommand{T}.cs                 | 6 +++++-
 .../Messaging/Messages/RequestMessage{T}.cs                 | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
index e790dfb1b19..1c7dc57d482 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
@@ -1,4 +1,8 @@
-using System.Windows.Input;
+// 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.Windows.Input;
 
 namespace Microsoft.Toolkit.Mvvm.Input
 {
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
index 54058ee6499..33fedadfad4 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
@@ -1,4 +1,8 @@
-using System.Windows.Input;
+// 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.Windows.Input;
 
 namespace Microsoft.Toolkit.Mvvm.Input
 {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index 37d29fdc9e4..b22927c0374 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.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.Runtime.CompilerServices;
 
 #pragma warning disable CS8618

From 399b10b59b2bace6d38338180afbeab58b54f423 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 22:31:41 +0200
Subject: [PATCH 096/595] Minor API rename for consistency with WinUI

---
 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs        | 2 +-
 Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs     | 2 +-
 Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs | 4 ++--
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs             | 2 +-
 Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs          | 2 +-
 UnitTests/Mvvm/Test_RelayCommand.cs                         | 2 +-
 UnitTests/Mvvm/Test_RelayCommand{T}.cs                      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
index 517ef4c97bc..34dff05ab99 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
@@ -63,7 +63,7 @@ public Task? ExecutionTask
         }
 
         /// <inheritdoc/>
-        public void RaiseCanExecuteChanged()
+        public void NotifyCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
index afc8b8c6b80..11a534909bc 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
@@ -64,7 +64,7 @@ public Task? ExecutionTask
         }
 
         /// <inheritdoc/>
-        public void RaiseCanExecuteChanged()
+        public void NotifyCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
index 1c7dc57d482..05480f7d056 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
@@ -13,8 +13,8 @@ namespace Microsoft.Toolkit.Mvvm.Input
     public interface IRelayCommand : ICommand
     {
         /// <summary>
-        /// Raises the <see cref="ICommand.CanExecuteChanged" /> event.
+        /// Notifies that the <see cref="ICommand.CanExecute"/> property has changed.
         /// </summary>
-        void RaiseCanExecuteChanged();
+        void NotifyCanExecuteChanged();
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
index 295686c80a0..f8db93b0d96 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
@@ -68,7 +68,7 @@ public RelayCommand(Action execute, Func<bool> canExecute)
         }
 
         /// <inheritdoc/>
-        public void RaiseCanExecuteChanged()
+        public void NotifyCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
index 3930b2b3e58..f9e875e32f3 100644
--- a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
@@ -69,7 +69,7 @@ public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
         }
 
         /// <inheritdoc/>
-        public void RaiseCanExecuteChanged()
+        public void NotifyCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/UnitTests/Mvvm/Test_RelayCommand.cs b/UnitTests/Mvvm/Test_RelayCommand.cs
index 39eacfb18ab..255129f4226 100644
--- a/UnitTests/Mvvm/Test_RelayCommand.cs
+++ b/UnitTests/Mvvm/Test_RelayCommand.cs
@@ -26,7 +26,7 @@ public void Test_RelayCommand_AlwaysEnabled()
 
             command.CanExecuteChanged += (s, e) => args = (s, e);
 
-            command.RaiseCanExecuteChanged();
+            command.NotifyCanExecuteChanged();
 
             Assert.AreSame(args.Item1, command);
             Assert.AreSame(args.Item2, EventArgs.Empty);
diff --git a/UnitTests/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
index b48f8aa5f1e..d2e13e7ed21 100644
--- a/UnitTests/Mvvm/Test_RelayCommand{T}.cs
+++ b/UnitTests/Mvvm/Test_RelayCommand{T}.cs
@@ -30,7 +30,7 @@ public void Test_RelayCommandOfT_AlwaysEnabled()
 
             command.CanExecuteChanged += (s, e) => args = (s, e);
 
-            command.RaiseCanExecuteChanged();
+            command.NotifyCanExecuteChanged();
 
             Assert.AreSame(args.Item1, command);
             Assert.AreSame(args.Item2, EventArgs.Empty);

From 56dfbaae20927c2f0bce68728a73d651ef522d39 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 22:39:43 +0200
Subject: [PATCH 097/595] Updated project description

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

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index ee24e73b38b..cc93df2e9d9 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -7,7 +7,11 @@
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
     <Description>
       This package includes Mvvm .NET Standard code only helpers such as:
-      - Ioc: Provides a fast and minimalistic implementation of an IoC container.
+      - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface.
+      - ViewModelBase: a base class for view-models with built-in minimal dependency injection support.
+      - RelayCommand: a simple delegate command implementing the ICommand interface.
+      - Messenger: a messaging system to exchange messages through different loosely-coupled objects.
+      - Ioc: a fast and minimalistic Inversion of Control service provider.
     </Description>
     <PackageTags>UWP Toolkit Windows Mvvm Ioc extensions helpers</PackageTags>
 

From f03dadb4704d9b8df2a585ef81529807f6179295 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 22:44:45 +0200
Subject: [PATCH 098/595] Fixed an incorrect XML docs

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index f52ee731895..4755b5ada1e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -141,7 +141,7 @@ void Send<TMessage, TToken>(TMessage message, TToken token)
             where TToken : IEquatable<TToken>;
 
         /// <summary>
-        /// Resets the <see cref="Messenger"/> class and unregisters all the existing recipients.
+        /// Resets the <see cref="IMessenger"/> instance and unregisters all the existing recipients.
         /// </summary>
         void Reset();
     }

From 543172e6f356279ed939d444a90782f212714fb4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 23:18:03 +0200
Subject: [PATCH 099/595] Renamed Commands folder to Input to follow namespace

---
 Microsoft.Toolkit.Mvvm/{Commands => Input}/AsyncRelayCommand.cs   | 0
 .../{Commands => Input}/AsyncRelayCommand{T}.cs                   | 0
 .../{Commands => Input}/Interfaces/IRelayCommand.cs               | 0
 .../{Commands => Input}/Interfaces/IRelayCommand{T}.cs            | 0
 Microsoft.Toolkit.Mvvm/{Commands => Input}/RelayCommand.cs        | 0
 Microsoft.Toolkit.Mvvm/{Commands => Input}/RelayCommand{T}.cs     | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/AsyncRelayCommand.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/AsyncRelayCommand{T}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/Interfaces/IRelayCommand.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/Interfaces/IRelayCommand{T}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/RelayCommand.cs (100%)
 rename Microsoft.Toolkit.Mvvm/{Commands => Input}/RelayCommand{T}.cs (100%)

diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand.cs
rename to Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
diff --git a/Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/AsyncRelayCommand{T}.cs
rename to Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand.cs
rename to Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand.cs
diff --git a/Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/Interfaces/IRelayCommand{T}.cs
rename to Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/RelayCommand.cs
rename to Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
diff --git a/Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Commands/RelayCommand{T}.cs
rename to Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs

From 14e216bbafe462d937fd9bc90be83347341c9e5b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 23:36:08 +0200
Subject: [PATCH 100/595] Added more Messenger unregistration tests

---
 UnitTests/Mvvm/Test_Messenger.cs | 58 ++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index fdc15b625ee..934bfcd2869 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -12,7 +12,59 @@ public class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken()
+        public void Test_Messenger_UnregisterRecipientWithMessageType()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA>(recipient, m => { });
+            messenger.Unregister<MessageA>(recipient);
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Unregister(recipient, nameof(MessageA));
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithRecipient()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Unregister(recipient);
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken()
         {
             object a = new object();
 
@@ -39,7 +91,7 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Ioc_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken()
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken()
         {
             object a = new object();
 
@@ -66,7 +118,7 @@ public void Test_Ioc_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Ioc_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
         {
             object a = new object();
 

From 7c5928b3d380a4268bc08c7459c1db11f815980c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Apr 2020 23:59:23 +0200
Subject: [PATCH 101/595] Improved IMessenger XML docs

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 4755b5ada1e..6950ad8ef19 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -18,6 +18,7 @@ public interface IMessenger
         /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
         /// <param name="recipient">The target recipient to check the registration for.</param>
         /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        /// <remarks>This method will use the default channel to check for the requested registration.</remarks>
         [Pure]
         bool IsRegistered<TMessage>(object recipient)
             where TMessage : class;
@@ -42,6 +43,7 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
         void Register<TMessage>(object recipient, Action<TMessage> action)
             where TMessage : class;
 
@@ -62,6 +64,11 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// Unregisters a recipient from all registered messages.
         /// </summary>
         /// <param name="recipient">The recipient to unregister.</param>
+        /// <remarks>
+        /// This method will unregister the target recipient across all channels.
+        /// Use this method as an easy way to lose all references to a target recipient.
+        /// If the recipient has no registered handler, this method does nothing.
+        /// </remarks>
         void Unregister(object recipient);
 
         /// <summary>
@@ -69,12 +76,15 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// </summary>
         /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
         /// <param name="recipient">The recipient to unregister.</param>
-        /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
+        /// <remarks>
+        /// This method will unregister the target recipient only from the default channel.
+        /// If the recipient has no registered handler, this method does nothing.
+        /// </remarks>
         void Unregister<TMessage>(object recipient)
             where TMessage : class;
 
         /// <summary>
-        /// Unregisters a recipient from messages on a specific channel.
+        /// Unregisters a recipient from all messages on a specific channel.
         /// </summary>
         /// <typeparam name="TToken">The type of token to identify what channel to unregister from.</typeparam>
         /// <param name="recipient">The recipient to unregister.</param>

From 0bbfe9e4a6aee2a5f94fefaecaa7fe6042c62418 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 00:14:57 +0200
Subject: [PATCH 102/595] Added more fail tests in unit tests, improved
 documentation

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  3 ++
 UnitTests/Mvvm/Test_Messenger.cs              | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index cab45351df9..f6ae706acbd 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -253,6 +253,9 @@ public void Unregister<TToken>(object recipient, TToken token)
                      * matches with the token type currently in use, and operate on those instances. */
                     foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
                     {
+                        /* We don't need whether or not the map contains the recipient, as the
+                         * sequence of maps has already been copied from the set containing all
+                         * the mappings for the target recipiets: it is guaranteed to be here. */
                         IDictionarySlim<TToken> holder = map[key];
 
                         /* Remove the registered handler for the input token,
diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index 934bfcd2869..86784bc30d7 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.cs
@@ -18,9 +18,16 @@ public void Test_Messenger_UnregisterRecipientWithMessageType()
             var recipient = new object();
 
             messenger.Register<MessageA>(recipient, m => { });
+
+            // Fail check
+            messenger.Unregister<MessageA>(new object());
+
             messenger.Unregister<MessageA>(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+
+            // Fail check
+            messenger.Unregister<MessageA>(new object());
         }
 
         [TestCategory("Mvvm")]
@@ -31,9 +38,16 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+
+            // Fail check
+            messenger.Unregister<MessageA, string>(new object(), nameof(MessageA));
+
             messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+
+            // Fail check
+            messenger.Unregister<MessageA, string>(new object(), nameof(MessageA));
         }
 
         [TestCategory("Mvvm")]
@@ -44,9 +58,16 @@ public void Test_Messenger_UnregisterRecipientWithToken()
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+
+            // Fail check
+            messenger.Unregister(new object(), nameof(MessageA));
+
             messenger.Unregister(recipient, nameof(MessageA));
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+
+            // Fail check
+            messenger.Unregister(new object(), nameof(MessageA));
         }
 
         [TestCategory("Mvvm")]
@@ -57,9 +78,16 @@ public void Test_Messenger_UnregisterRecipientWithRecipient()
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+
+            // Fail check
+            messenger.Unregister(new object());
+
             messenger.Unregister(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
+
+            // Fail check
+            messenger.Unregister(new object());
         }
 
         [TestCategory("Mvvm")]

From 34c7c6d0189cdb286135ef4532e52107d34dabae Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 13:48:43 +0200
Subject: [PATCH 103/595] Added more Messenger unit tests

---
 UnitTests/Mvvm/Test_Messenger.cs | 101 ++++++++++++++++++++++---------
 1 file changed, 74 insertions(+), 27 deletions(-)

diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/Mvvm/Test_Messenger.cs
index 86784bc30d7..378e8379efc 100644
--- a/UnitTests/Mvvm/Test_Messenger.cs
+++ b/UnitTests/Mvvm/Test_Messenger.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 Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -17,77 +18,93 @@ public void Test_Messenger_UnregisterRecipientWithMessageType()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA>(recipient, m => { });
+            messenger.Unregister<MessageA>(recipient);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Unregister(recipient, nameof(MessageA));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_UnregisterRecipientWithRecipient()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Unregister(recipient);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
 
-            // Fail check
-            messenger.Unregister<MessageA>(new object());
+            messenger.Register<MessageA>(recipient, m => { });
 
             messenger.Unregister<MessageA>(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
-
-            // Fail check
-            messenger.Unregister<MessageA>(new object());
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken()
         {
             var messenger = new Messenger();
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
 
-            // Fail check
-            messenger.Unregister<MessageA, string>(new object(), nameof(MessageA));
-
             messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-
-            // Fail check
-            messenger.Unregister<MessageA, string>(new object(), nameof(MessageA));
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithToken()
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithToken()
         {
             var messenger = new Messenger();
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
 
-            // Fail check
-            messenger.Unregister(new object(), nameof(MessageA));
-
             messenger.Unregister(recipient, nameof(MessageA));
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-
-            // Fail check
-            messenger.Unregister(new object(), nameof(MessageA));
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithRecipient()
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient()
         {
             var messenger = new Messenger();
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
 
-            // Fail check
-            messenger.Unregister(new object());
-
             messenger.Unregister(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-
-            // Fail check
-            messenger.Unregister(new object());
         }
 
         [TestCategory("Mvvm")]
@@ -171,6 +188,36 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
             Assert.IsNull(result);
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_DuplicateRegistrationWithMessageType()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA>(recipient, m => { });
+
+            Assert.ThrowsException<InvalidOperationException>(() =>
+            {
+                messenger.Register<MessageA>(recipient, m => { });
+            });
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+
+            Assert.ThrowsException<InvalidOperationException>(() =>
+            {
+                messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            });
+        }
+
         public sealed class MessageA
         {
             public string Text { get; set; }

From 604cf7a3fec716476f50bde46cf7ce8866d5cbfc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 14:02:21 +0200
Subject: [PATCH 104/595] Improved internal documentation

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index f6ae706acbd..cd626651f87 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -38,14 +38,14 @@ public sealed class Messenger : IMessenger
         // The Messenger class uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
         // DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
-        //                    |                  \             /
-        //                    |                   \___________/_____[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
-        //                    |   ___________________________/             \____                      /
-        //                    |  /           ___________________________________\____________________/
-        //                    | /           /                                    \
-        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping
-        //                                            /               /          /
-        //                      ___(Type2.tToken)____/               /          /
+        //                    |                   \________________[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
+        //                    |                                            \___          /            /            /
+        //                    |   ________(recipients registrations)___________\________/            /          __/
+        //                    |  /           _______(channel registrations)_____\___________________/          /
+        //                    | /           /                                    \                            /
+        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping = Mapping<TMessage, TToken>
+        //                                            /               / \        /                   /
+        //                      ___(Type2.tToken)____/               /   \______/___________________/
         //                     /________________(Type2.tMessage)____/          /
         //                    /       ________________________________________/
         //                   /       /
@@ -54,19 +54,18 @@ public sealed class Messenger : IMessenger
         // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
         // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
         // dictionary, so that each recipient can have up to one registered handler for a given token, for each
-        // message type. Each mapping is stored in the types map, which associates to each pair of concrete types the
-        // mapping instances. Each instances is just exposed as an IMapping, as each will be a closed type over
+        // message type. Each mapping is stored in the types map, which associates each pair of concrete types to its
+        // mapping instance. Mapping instances are exposed as IMapping items, as each will be a closed type over
         // a different combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in
         // the main recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
         // message types and token types). A recipient is stored in the main map as long as it has at least one
         // registered handler in any of the existing mappings for every message/token type combination.
         // The shared map is used to access the set of all registered handlers for a given recipient, without having
         // to know in advance the type of message or token being used for the registration, and without having to
-        // use reflection. This is the same approach used in the types map, just with a more specific exposed reference
-        // type as in this case we have at least some partial knowledge of the generic type parameters of the mapped types.
-        // Note that each dictionary stored in the associated set for each recipient also implements
+        // use reflection. This is the same approach used in the types map, as we expose saved items as IMapping values too.
+        // Note that each mapping stored in the associated set for each recipient also indirectly implements
         // IDictionarySlim<Recipient, Token>, with any token type currently in use by that recipient. This allows to retrieve
-        // the type-closed mappings of registered handlers with a given token type, for an message type, for every receiver,
+        // the type-closed mappings of registered handlers with a given token type, for any message type, for every receiver,
         // again without having to use reflection. This shared map is used to unregister messages from a given recipients
         // either unconditionally, by message type, by token, or for a specific pair of message type and token value.
 
@@ -229,15 +228,9 @@ public void Unregister<TToken>(object recipient, TToken token)
 
                 try
                 {
-                    // Select the items with the same token type
                     foreach (IMapping item in set)
                     {
-                        /* This is technically a "suspicious cast" as there's no type that inherits
-                         * from both IMapping and IDictionarySlim<Recipient, IDictionarySlim<TToken>>.
-                         * But this is fine since IMapping instances are really instances of
-                         * Mapping<TMessage, TToken>, which in turn inherits from
-                         * DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>, which
-                         * then implements IDictionarySlim<Recipient, IDictionarySlim<TToken>>. */
+                        // Select all mappings using the same token type
                         if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> map)
                         {
                             maps[i++] = map;

From 295b8082e595e76abb6be63c161597ef255620bb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 17:10:04 +0200
Subject: [PATCH 105/595] Added IAsyncRelayCommand and IAsyncRelayCommand<T>
 interfaces

---
 .../Input/AsyncRelayCommand.cs                | 23 +++++++------
 .../Input/AsyncRelayCommand{T}.cs             | 32 ++++++++++++-------
 .../Input/Interfaces/IAsyncRelayCommand.cs    | 29 +++++++++++++++++
 .../Input/Interfaces/IAsyncRelayCommand{T}.cs | 23 +++++++++++++
 4 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
 create mode 100644 Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index 34dff05ab99..a45e5c33589 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -11,11 +11,11 @@ namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
     /// A command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition of
-    /// accepting a <see cref="Func{TResult}"/> returning a <see cref="Task{TResult}"/> as the execute
-    /// action, and providing a <see cref="ExecutionTask"/> property that notifies changes when
-    /// <see cref="Execute"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
+    /// accepting a <see cref="Func{TResult}"/> returning a <see cref="Task"/> as the execute
+    /// action, and providing an <see cref="ExecutionTask"/> property that notifies changes when
+    /// <see cref="ExecuteAsync"/> is invoked and when the returned <see cref="Task"/> completes.
     /// </summary>
-    public sealed class AsyncRelayCommand : ObservableObject, IRelayCommand
+    public sealed class AsyncRelayCommand : ObservableObject, IAsyncRelayCommand
     {
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute"/> is used.
@@ -52,10 +52,7 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
 
         private Task? executionTask;
 
-        /// <summary>
-        /// Gets the last scheduled <see cref="Task"/>, if available.
-        /// This property notifies a change when the <see cref="Task{TResult}"/> completes.
-        /// </summary>
+        /// <inheritdoc/>
         public Task? ExecutionTask
         {
             get => this.executionTask;
@@ -77,11 +74,19 @@ public bool CanExecute(object parameter)
 
         /// <inheritdoc/>
         public void Execute(object parameter)
+        {
+            ExecuteAsync(parameter);
+        }
+
+        /// <inheritdoc/>
+        public Task ExecuteAsync(object parameter)
         {
             if (CanExecute(parameter))
             {
-                ExecutionTask = this.execute();
+                return ExecutionTask = this.execute();
             }
+
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 11a534909bc..a296ceb8f83 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -10,13 +10,10 @@
 namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
-    /// A generic command that mirrors the functionality of <see cref="RelayCommand"/>, with the addition
-    /// of accepting a <see cref="Func{TResult}"/> returning a <see cref="Task{TResult}"/> as the execute
-    /// action, and providing a <see cref="ExecutionTask"/> property that notifies changes when
-    /// <see cref="Execute(T)"/> is invoked and when the returned <see cref="Task{TResult}"/> completes.
+    /// A generic command that provides a more specific version of <see cref="AsyncRelayCommand"/>.
     /// </summary>
     /// <typeparam name="T">The type of parameter being passed as input to the callbacks.</typeparam>
-    public sealed class AsyncRelayCommand<T> : ObservableObject, IRelayCommand<T>
+    public sealed class AsyncRelayCommand<T> : ObservableObject, IAsyncRelayCommand<T>
     {
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
@@ -53,10 +50,7 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
 
         private Task? executionTask;
 
-        /// <summary>
-        /// Gets the last scheduled <see cref="Task"/>, if available.
-        /// This property notifies a change when the <see cref="Task{TResult}"/> completes.Th
-        /// </summary>
+        /// <inheritdoc/>
         public Task? ExecutionTask
         {
             get => this.executionTask;
@@ -86,17 +80,31 @@ public bool CanExecute(object parameter)
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Execute(T parameter)
+        {
+            ExecuteAsync(parameter);
+        }
+
+        /// <inheritdoc/>
+        public void Execute(object parameter)
+        {
+            ExecuteAsync((T)parameter);
+        }
+
+        /// <inheritdoc/>
+        public Task ExecuteAsync(T parameter)
         {
             if (CanExecute(parameter))
             {
-                ExecutionTask = this.execute(parameter);
+                return ExecutionTask = this.execute(parameter);
             }
+
+            return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
-        public void Execute(object parameter)
+        public Task ExecuteAsync(object parameter)
         {
-            Execute((T)parameter);
+            return ExecuteAsync((T)parameter);
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
new file mode 100644
index 00000000000..37c33b60b7e
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -0,0 +1,29 @@
+// 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.ComponentModel;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Mvvm.Input
+{
+    /// <summary>
+    /// An interface expanding <see cref="IRelayCommand"/> to support asynchronous operations.
+    /// </summary>
+    public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Gets the last scheduled <see cref="Task"/>, if available.
+        /// This property notifies a change when the <see cref="Task"/> completes.
+        /// </summary>
+        Task? ExecutionTask { get; }
+
+        /// <summary>
+        /// Provides a more specific version of <see cref="System.Windows.Input.ICommand.Execute"/>,
+        /// also returning the <see cref="Task"/> representing the async operation being executed.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
+        Task ExecuteAsync(object parameter);
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
new file mode 100644
index 00000000000..789febb71df
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
@@ -0,0 +1,23 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Mvvm.Input
+{
+    /// <summary>
+    /// A generic interface representing a more specific version of <see cref="IAsyncRelayCommand"/>.
+    /// </summary>
+    /// <typeparam name="T">The type used as argument for the interface methods.</typeparam>
+    /// <remarks>This interface is needed to solve the diamong problem with base classes.</remarks>
+    public interface IAsyncRelayCommand<in T> : IAsyncRelayCommand, IRelayCommand<T>
+    {
+        /// <summary>
+        /// Provides a strongly-typed variant of <see cref="IAsyncRelayCommand.ExecuteAsync"/>.
+        /// </summary>
+        /// <param name="parameter">The input parameter.</param>
+        /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
+        Task ExecuteAsync(T parameter);
+    }
+}

From eab207c78e0a40e72f1eb5a128520076e73985ac Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 17:22:48 +0200
Subject: [PATCH 106/595] Minor codegen improvement

---
 .../DictionarySlim{TKey,TValue}.cs                    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 7597d309585..a65bf440786 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -243,7 +243,7 @@ private Entry[] Resize()
 
             if ((uint)newSize > int.MaxValue)
             {
-                throw new InvalidOperationException("Max capacity exceeded");
+                ThrowInvalidOperationExceptionForMaxCapacityExceeded();
             }
 
             var entries = new Entry[newSize];
@@ -328,5 +328,14 @@ private static void ThrowArgumentExceptionForKeyNotFound(TKey key)
         {
             throw new ArgumentException($"The target key {key} was not present in the dictionary");
         }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when trying to resize over the maximum capacity.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForMaxCapacityExceeded()
+        {
+            throw new InvalidOperationException("Max capacity exceeded");
+        }
     }
 }
\ No newline at end of file

From d5b8eceb4632f12f9f16a32a4e0342d7c24a6ffa Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 20:08:55 +0200
Subject: [PATCH 107/595] Added nullability notation to command parameters

---
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs        | 6 +++---
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs     | 9 ++++++---
 .../Input/Interfaces/IAsyncRelayCommand.cs               | 2 +-
 Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs             | 4 ++--
 Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs          | 8 ++++++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index a45e5c33589..f3bebc606ea 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -67,19 +67,19 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             return this.canExecute?.Invoke() != false;
         }
 
         /// <inheritdoc/>
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             ExecuteAsync(parameter);
         }
 
         /// <inheritdoc/>
-        public Task ExecuteAsync(object parameter)
+        public Task ExecuteAsync(object? parameter)
         {
             if (CanExecute(parameter))
             {
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index a296ceb8f83..4f6086bf40b 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -7,6 +7,9 @@
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
+// See comment in RelayCommand<T>
+#pragma warning disable CS8604, CS8605
+
 namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
@@ -72,7 +75,7 @@ public bool CanExecute(T parameter)
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             return CanExecute((T)parameter);
         }
@@ -85,7 +88,7 @@ public void Execute(T parameter)
         }
 
         /// <inheritdoc/>
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             ExecuteAsync((T)parameter);
         }
@@ -102,7 +105,7 @@ public Task ExecuteAsync(T parameter)
         }
 
         /// <inheritdoc/>
-        public Task ExecuteAsync(object parameter)
+        public Task ExecuteAsync(object? parameter)
         {
             return ExecuteAsync((T)parameter);
         }
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
index 37c33b60b7e..79b9ef605ef 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -24,6 +24,6 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         /// </summary>
         /// <param name="parameter">The input parameter.</param>
         /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
-        Task ExecuteAsync(object parameter);
+        Task ExecuteAsync(object? parameter);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
index f8db93b0d96..e555f3ca633 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
@@ -75,13 +75,13 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             return this.canExecute?.Invoke() != false;
         }
 
         /// <inheritdoc/>
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             if (CanExecute(parameter))
             {
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index f9e875e32f3..901b39252d3 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -24,6 +24,10 @@
 using System;
 using System.Runtime.CompilerServices;
 
+/* Suppress the nullability warnings for all (T) casts from an object? parameter.
+ * If this happens, we do want to throw an exception to notify the users. */
+#pragma warning disable CS8604, CS8605
+
 namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
@@ -82,7 +86,7 @@ public bool CanExecute(T parameter)
         }
 
         /// <inheritdoc/>
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             return CanExecute((T)parameter);
         }
@@ -98,7 +102,7 @@ public void Execute(T parameter)
         }
 
         /// <inheritdoc/>
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             Execute((T)parameter);
         }

From 97e7ace6b66d5c3750c53c96ec62a99da24ce96a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 20:19:36 +0200
Subject: [PATCH 108/595] Fixed an XML comment

---
 .../IDictionarySlim{TKey}.cs                               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 70bcc6f241c..efcf57e5a68 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 
 namespace Microsoft.Collections.Extensions
 {
@@ -19,7 +18,11 @@ internal interface IDictionarySlim<in TKey>
         /// </summary>
         int Count { get; }
 
-        /// <inheritdoc cref="Dictionary{TKey,TValue}.Remove"/>
+        /// <summary>
+        /// Removes an item from the dictionary with the specified key, if present.
+        /// </summary>
+        /// <param name="key">The key of the item to remove.</param>
+        /// <returns>Whether or not an item was removed.</returns>
         bool Remove(TKey key);
 
         /// <summary>

From 0655edb0ae03640eb3fe41f70902a1d8f69504d9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 20:19:51 +0200
Subject: [PATCH 109/595] Added nullability attributes for uncostrained T
 parameters

---
 .../Input/AsyncRelayCommand{T}.cs             | 21 ++++++++++++++++---
 .../Input/Interfaces/IAsyncRelayCommand{T}.cs |  9 +++++++-
 .../Input/Interfaces/IRelayCommand{T}.cs      | 15 +++++++++++--
 .../Input/RelayCommand{T}.cs                  | 15 +++++++++++--
 .../Microsoft.Toolkit.Mvvm.csproj             |  2 +-
 5 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 4f6086bf40b..710859cd99b 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+#if NETSTANDARD2_1
+using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -68,7 +71,11 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(T parameter)
+        public bool CanExecute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter)
         {
             return this.canExecute?.Invoke(parameter) != false;
         }
@@ -82,7 +89,11 @@ public bool CanExecute(object? parameter)
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Execute(T parameter)
+        public void Execute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter)
         {
             ExecuteAsync(parameter);
         }
@@ -94,7 +105,11 @@ public void Execute(object? parameter)
         }
 
         /// <inheritdoc/>
-        public Task ExecuteAsync(T parameter)
+        public Task ExecuteAsync(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter)
         {
             if (CanExecute(parameter))
             {
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
index 789febb71df..48f12140b66 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD2_1
+using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Threading.Tasks;
 
 namespace Microsoft.Toolkit.Mvvm.Input
@@ -18,6 +21,10 @@ public interface IAsyncRelayCommand<in T> : IAsyncRelayCommand, IRelayCommand<T>
         /// </summary>
         /// <param name="parameter">The input parameter.</param>
         /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
-        Task ExecuteAsync(T parameter);
+        Task ExecuteAsync(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
index 33fedadfad4..253937be200 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD2_1
+using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Windows.Input;
 
 namespace Microsoft.Toolkit.Mvvm.Input
@@ -18,13 +21,21 @@ public interface IRelayCommand<in T> : IRelayCommand
         /// <param name="parameter">The input parameter.</param>
         /// <returns>Whether or not the current command can be executed.</returns>
         /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
-        bool CanExecute(T parameter);
+        bool CanExecute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter);
 
         /// <summary>
         /// Provides a strongly-typed variant of <see cref="ICommand.Execute(object)"/>.
         /// </summary>
         /// <param name="parameter">The input parameter.</param>
         /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
-        void Execute(T parameter);
+        void Execute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index 901b39252d3..c23a21f4167 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -22,6 +22,9 @@
 // ****************************************************************************
 
 using System;
+#if NETSTANDARD2_1
+using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Runtime.CompilerServices;
 
 /* Suppress the nullability warnings for all (T) casts from an object? parameter.
@@ -80,7 +83,11 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(T parameter)
+        public bool CanExecute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter)
         {
             return this.canExecute?.Invoke(parameter) != false;
         }
@@ -93,7 +100,11 @@ public bool CanExecute(object? parameter)
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Execute(T parameter)
+        public void Execute(
+#if NETSTANDARD2_1
+            [AllowNull]
+#endif
+            T parameter)
         {
             if (CanExecute(parameter))
             {
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index cc93df2e9d9..27aa35714c5 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>

From 9ea2e98c319a0d68dbe9cb7387139b00af0125d9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Apr 2020 23:41:50 +0200
Subject: [PATCH 110/595] Improved nullability handling in commands

---
 .../Input/AsyncRelayCommand{T}.cs             | 32 +++++--------------
 .../Input/Interfaces/IAsyncRelayCommand{T}.cs |  9 +-----
 .../Input/Interfaces/IRelayCommand{T}.cs      | 15 ++-------
 .../Input/RelayCommand{T}.cs                  | 29 ++++++-----------
 .../Microsoft.Toolkit.Mvvm.csproj             |  2 +-
 5 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 710859cd99b..a3acba78273 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -3,16 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if NETSTANDARD2_1
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-// See comment in RelayCommand<T>
-#pragma warning disable CS8604, CS8605
-
 namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
@@ -38,6 +32,7 @@ public sealed class AsyncRelayCommand<T> : ObservableObject, IAsyncRelayCommand<
         /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class that can always execute.
         /// </summary>
         /// <param name="execute">The execution logic.</param>
+        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
         public AsyncRelayCommand(Func<T, Task> execute)
         {
             this.execute = execute;
@@ -48,6 +43,7 @@ public AsyncRelayCommand(Func<T, Task> execute)
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
+        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
         public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         {
             this.execute = execute;
@@ -71,11 +67,7 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter)
+        public bool CanExecute(T parameter)
         {
             return this.canExecute?.Invoke(parameter) != false;
         }
@@ -84,16 +76,12 @@ public bool CanExecute(
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(object? parameter)
         {
-            return CanExecute((T)parameter);
+            return CanExecute((T)parameter!);
         }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Execute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter)
+        public void Execute(T parameter)
         {
             ExecuteAsync(parameter);
         }
@@ -101,15 +89,11 @@ public void Execute(
         /// <inheritdoc/>
         public void Execute(object? parameter)
         {
-            ExecuteAsync((T)parameter);
+            ExecuteAsync((T)parameter!);
         }
 
         /// <inheritdoc/>
-        public Task ExecuteAsync(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter)
+        public Task ExecuteAsync(T parameter)
         {
             if (CanExecute(parameter))
             {
@@ -122,7 +106,7 @@ public Task ExecuteAsync(
         /// <inheritdoc/>
         public Task ExecuteAsync(object? parameter)
         {
-            return ExecuteAsync((T)parameter);
+            return ExecuteAsync((T)parameter!);
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
index 48f12140b66..789febb71df 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD2_1
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Threading.Tasks;
 
 namespace Microsoft.Toolkit.Mvvm.Input
@@ -21,10 +18,6 @@ public interface IAsyncRelayCommand<in T> : IAsyncRelayCommand, IRelayCommand<T>
         /// </summary>
         /// <param name="parameter">The input parameter.</param>
         /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
-        Task ExecuteAsync(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter);
+        Task ExecuteAsync(T parameter);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
index 253937be200..33fedadfad4 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD2_1
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Windows.Input;
 
 namespace Microsoft.Toolkit.Mvvm.Input
@@ -21,21 +18,13 @@ public interface IRelayCommand<in T> : IRelayCommand
         /// <param name="parameter">The input parameter.</param>
         /// <returns>Whether or not the current command can be executed.</returns>
         /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
-        bool CanExecute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter);
+        bool CanExecute(T parameter);
 
         /// <summary>
         /// Provides a strongly-typed variant of <see cref="ICommand.Execute(object)"/>.
         /// </summary>
         /// <param name="parameter">The input parameter.</param>
         /// <remarks>Use this overload to avoid boxing, if <typeparamref name="T"/> is a value type.</remarks>
-        void Execute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter);
+        void Execute(T parameter);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index c23a21f4167..e5f474d6832 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -22,15 +22,8 @@
 // ****************************************************************************
 
 using System;
-#if NETSTANDARD2_1
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Runtime.CompilerServices;
 
-/* Suppress the nullability warnings for all (T) casts from an object? parameter.
- * If this happens, we do want to throw an exception to notify the users. */
-#pragma warning disable CS8604, CS8605
-
 namespace Microsoft.Toolkit.Mvvm.Input
 {
     /// <summary>
@@ -59,6 +52,11 @@ public sealed class RelayCommand<T> : IRelayCommand<T>
         /// Initializes a new instance of the <see cref="RelayCommand{T}"/> class that can always execute.
         /// </summary>
         /// <param name="execute">The execution logic.</param>
+        /// <remarks>
+        /// Due to the fact that the <see cref="System.Windows.Input.ICommand"/> interface exposes methods that accept a
+        /// nullable <see cref="object"/> parameter, it is recommended that if <typeparamref name="T"/> is a reference type,
+        /// you should always declare it as nullable, and to always perform checks within <paramref name="execute"/>.
+        /// </remarks>
         public RelayCommand(Action<T> execute)
         {
             this.execute = execute;
@@ -69,6 +67,7 @@ public RelayCommand(Action<T> execute)
         /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
+        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
         public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
         {
             this.execute = execute;
@@ -83,11 +82,7 @@ public void NotifyCanExecuteChanged()
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter)
+        public bool CanExecute(T parameter)
         {
             return this.canExecute?.Invoke(parameter) != false;
         }
@@ -95,16 +90,12 @@ public bool CanExecute(
         /// <inheritdoc/>
         public bool CanExecute(object? parameter)
         {
-            return CanExecute((T)parameter);
+            return CanExecute((T)parameter!);
         }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Execute(
-#if NETSTANDARD2_1
-            [AllowNull]
-#endif
-            T parameter)
+        public void Execute(T parameter)
         {
             if (CanExecute(parameter))
             {
@@ -115,7 +106,7 @@ public void Execute(
         /// <inheritdoc/>
         public void Execute(object? parameter)
         {
-            Execute((T)parameter);
+            Execute((T)parameter!);
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 27aa35714c5..cc93df2e9d9 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>

From 06139b0e58333b30a39899c8cddecb2a26836283 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 12:40:47 +0200
Subject: [PATCH 111/595] Added TaskExtensions class

---
 .../Extensions/TaskExtensions.cs              | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 Microsoft.Toolkit/Extensions/TaskExtensions.cs

diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
new file mode 100644
index 00000000000..c0fb2fa63b6
--- /dev/null
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -0,0 +1,42 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Extensions
+{
+    /// <summary>
+    /// Helpers for working with arrays.
+    /// </summary>
+    public static class TaskExtensions
+    {
+        /// <summary>
+        /// Non-generic overload of <see cref="ResultOrDefault{T}"/>, for compatibility reasons.
+        /// </summary>
+        /// <param name="task">The input <see cref="Task"/>.</param>
+        /// <returns>The result of <paramref name="task"/>, as an <see cref="object"/>.</returns>
+        [Obsolete("This method is here for compatibility reasons, use the generic overload")]
+        public static object ResultOrDefault(this Task task)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets the result of a <see cref="Task{TResult}"/> if available, or <see langword="default"/> otherwise.
+        /// </summary>
+        /// <typeparam name="T">The type of <see cref="Task{TResult}"/> to get the result for.</typeparam>
+        /// <param name="task">The input <see cref="Task{TResult}"/> instance to get the result for.</param>
+        /// <returns>The result of <paramref name="task"/> if completed successfully, or <see langword="default"/> otherwise.</returns>
+        /// <remarks>This method does not block if <paramref name="task"/> has not completed yet.</remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static T ResultOrDefault<T>(this Task<T> task)
+        {
+            return task.Status == TaskStatus.RanToCompletion ? task.Result : default;
+        }
+    }
+}

From 474d72e89fb19dec4fe2f3c5db363ba2378da661 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 12:47:09 +0200
Subject: [PATCH 112/595] Added tests for the TaskExtensions class

---
 UnitTests/Extensions/Test_TaskExtensions.cs | 51 +++++++++++++++++++++
 UnitTests/UnitTests.csproj                  |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 UnitTests/Extensions/Test_TaskExtensions.cs

diff --git a/UnitTests/Extensions/Test_TaskExtensions.cs b/UnitTests/Extensions/Test_TaskExtensions.cs
new file mode 100644
index 00000000000..985638f05a1
--- /dev/null
+++ b/UnitTests/Extensions/Test_TaskExtensions.cs
@@ -0,0 +1,51 @@
+// 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.Threading.Tasks;
+using Microsoft.Toolkit.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_TaskExtensions
+    {
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_Nongeneric()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            Assert.ThrowsException<NotImplementedException>(() => default(Task).ResultOrDefault());
+            Assert.ThrowsException<NotImplementedException>(() => Task.CompletedTask.ResultOrDefault());
+#pragma warning restore CS0618
+        }
+
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_Generic_ValueType()
+        {
+            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
+
+            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+
+            tcs.SetResult(42);
+
+            Assert.AreEqual(42, tcs.Task.ResultOrDefault());
+        }
+
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_Generic_ReferenceType()
+        {
+            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
+
+            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+
+            tcs.SetResult(nameof(Test_TaskExtensions_Generic_ReferenceType));
+
+            Assert.AreEqual(nameof(Test_TaskExtensions_Generic_ReferenceType), tcs.Task.ResultOrDefault());
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 2f729c3c07e..127f121397b 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -129,6 +129,7 @@
     <Compile Include="Diagnostics\Test_Guard.Array.cs" />
     <Compile Include="Diagnostics\Test_Guard.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
+    <Compile Include="Extensions\Test_TaskExtensions.cs" />
     <Compile Include="Extensions\Test_TypeExtensions.cs" />
     <Compile Include="Extensions\Test_ValueTypeExtensions.cs" />
     <Compile Include="Extensions\Test_ArrayExtensions.cs" />

From c5f0b599c374c52f1baa68cdff1a8a1797341473 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 14:30:25 +0200
Subject: [PATCH 113/595] Added interoperability with IServiceProvider
 interface

---
 .../DependencyInjection/IIoc.cs               |  9 ++----
 .../IServiceProviderExtensions.cs             | 32 +++++++++++++++++++
 .../DependencyInjection/Ioc.cs                | 28 +++++++++++++++-
 3 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
index 94d97389170..7f0ed882a77 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// <summary>
     /// An interface for a type implementing an Inversion of Control service provider.
     /// </summary>
-    public interface IIoc
+    public interface IIoc : IServiceProvider
     {
         /// <summary>
         /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
@@ -89,12 +89,7 @@ void Unregister<TService>()
         bool TryGetInstance<TService>(out TService? service)
             where TService : class;
 
-        /// <summary>
-        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
+        /// <inheritdoc cref="IServiceProviderExtensions.GetInstance{TService}"/>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         TService GetInstance<TService>()
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
new file mode 100644
index 00000000000..33021ab4a64
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
@@ -0,0 +1,32 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Mvvm.DependencyInjection
+{
+    /// <summary>
+    /// Extensions for the <see cref="IIoc"/> type.
+    /// </summary>
+    public static class IServiceProviderExtensions
+    {
+        /// <summary>
+        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static TService GetInstance<TService>(this IServiceProvider provider)
+            where TService : class
+        {
+            return (TService)provider.GetService(typeof(TService));
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index c1f7dbc6471..1d0d6c9c52a 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -181,7 +181,7 @@ public bool TryGetInstance<TService>(out TService? service)
                     return false;
                 }
 
-                service = container!.Instance ?? container.Factory?.Invoke();
+                service = container!.Instance ?? container.Factory!.Invoke();
 
                 return true;
             }
@@ -200,6 +200,22 @@ public TService GetInstance<TService>()
             return service!;
         }
 
+        /// <inheritdoc/>
+        object IServiceProvider.GetService(Type serviceType)
+        {
+            lock (this.typesMap)
+            {
+                var key = new Key(serviceType);
+
+                if (!this.typesMap.TryGetValue(key, out IContainer container))
+                {
+                    ThrowInvalidOperationExceptionOnServiceNotRegistered(serviceType);
+                }
+
+                return container!.Instance ?? container.Factory!.Invoke();
+            }
+        }
+
         /// <inheritdoc/>
         public TService GetInstanceWithoutCaching<TService>()
             where TService : class
@@ -388,6 +404,16 @@ private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TServic
             throw new InvalidOperationException($"Service {typeof(TService)} not registered");
         }
 
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
+        /// </summary>
+        /// <param name="type">The type of service not found.</param>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered(Type type)
+        {
+            throw new InvalidOperationException($"Service {type} not registered");
+        }
+
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when a service doesn't expose a public parametrless constructor.
         /// </summary>

From 74cc8dc187df7c5602bb3ac32b75a334dcf94c8f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 16:04:40 +0200
Subject: [PATCH 114/595] Renamed some APIs

---
 Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs     |  8 ++++----
 .../DependencyInjection/IServiceProviderExtensions.cs  |  2 +-
 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs      | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
index 7f0ed882a77..b636f4d1d14 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
@@ -86,13 +86,13 @@ void Unregister<TService>()
         /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
         [Pure]
-        bool TryGetInstance<TService>(out TService? service)
+        bool TryGetService<TService>(out TService? service)
             where TService : class;
 
-        /// <inheritdoc cref="IServiceProviderExtensions.GetInstance{TService}"/>
+        /// <inheritdoc cref="IServiceProviderExtensions.GetService{TService}"/>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        TService GetInstance<TService>()
+        TService GetService<TService>()
             where TService : class;
 
         /// <summary>
@@ -101,7 +101,7 @@ TService GetInstance<TService>()
         /// <typeparam name="TService">The type of service to look for.</typeparam>
         /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
         [Pure]
-        TService GetInstanceWithoutCaching<TService>()
+        TService GetServiceWithoutCaching<TService>()
             where TService : class;
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
index 33021ab4a64..b33ecd64b48 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
@@ -23,7 +23,7 @@ public static class IServiceProviderExtensions
         /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService GetInstance<TService>(this IServiceProvider provider)
+        public static TService GetService<TService>(this IServiceProvider provider)
             where TService : class
         {
             return (TService)provider.GetService(typeof(TService));
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 1d0d6c9c52a..87a75debdcc 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -35,7 +35,7 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// </code>
     /// Finally, use the <see cref="Ioc"/> type to retrieve service instances to use:
     /// <code>
-    /// Ioc.Default.GetInstance&lt;ILogger>().Log("Hello world!");
+    /// Ioc.Default.GetService&lt;ILogger>().Log("Hello world!");
     /// </code>
     /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
     /// throw an exception in case the requested service has not been registered yet.
@@ -169,7 +169,7 @@ public ReadOnlyMemory<object> GetAllCreatedServices()
         }
 
         /// <inheritdoc/>
-        public bool TryGetInstance<TService>(out TService? service)
+        public bool TryGetService<TService>(out TService? service)
             where TService : class
         {
             lock (this.typesMap)
@@ -189,10 +189,10 @@ public bool TryGetInstance<TService>(out TService? service)
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public TService GetInstance<TService>()
+        public TService GetService<TService>()
             where TService : class
         {
-            if (!TryGetInstance(out TService? service))
+            if (!this.TryGetService(out TService? service))
             {
                 ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
             }
@@ -217,7 +217,7 @@ object IServiceProvider.GetService(Type serviceType)
         }
 
         /// <inheritdoc/>
-        public TService GetInstanceWithoutCaching<TService>()
+        public TService GetServiceWithoutCaching<TService>()
             where TService : class
         {
             lock (this.typesMap)

From 01662e758b772adf40defc00c6ebd229b7559556 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 16:43:50 +0200
Subject: [PATCH 115/595] Code refactorings

---
 .../DependencyInjection/IIoc.cs               | 16 -------
 .../IServiceProviderExtensions.cs             | 34 ++++++++++++-
 .../DependencyInjection/Ioc.cs                | 48 ++-----------------
 3 files changed, 35 insertions(+), 63 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
index b636f4d1d14..e17fa551eaf 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
 
 #nullable enable
 
@@ -80,21 +79,6 @@ void Unregister<TService>()
         [Pure]
         ReadOnlyMemory<object> GetAllCreatedServices();
 
-        /// <summary>
-        /// Tries to resolve an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>, if registered.</returns>
-        [Pure]
-        bool TryGetService<TService>(out TService? service)
-            where TService : class;
-
-        /// <inheritdoc cref="IServiceProviderExtensions.GetService{TService}"/>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        TService GetService<TService>()
-            where TService : class;
-
         /// <summary>
         /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
index b33ecd64b48..72d057a4f81 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
@@ -15,6 +15,19 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// </summary>
     public static class IServiceProviderExtensions
     {
+        /// <summary>
+        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
+        /// </summary>
+        /// <typeparam name="TService">The type of service to look for.</typeparam>
+        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static TService? GetService<TService>(this IServiceProvider provider)
+            where TService : class
+        {
+            return (TService?)provider.GetService(typeof(TService));
+        }
+
         /// <summary>
         /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
         /// </summary>
@@ -23,10 +36,27 @@ public static class IServiceProviderExtensions
         /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService GetService<TService>(this IServiceProvider provider)
+        public static TService GetRequiredService<TService>(this IServiceProvider provider)
             where TService : class
         {
-            return (TService)provider.GetService(typeof(TService));
+            TService? service = (TService?)provider.GetService(typeof(TService));
+
+            if (service is null)
+            {
+                ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
+            }
+
+            return service!;
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
+        /// </summary>
+        /// <typeparam name="TService">The type of service not found.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>()
+        {
+            throw new InvalidOperationException($"Service {typeof(TService)} not registered");
         }
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 87a75debdcc..53044e82846 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -169,39 +169,7 @@ public ReadOnlyMemory<object> GetAllCreatedServices()
         }
 
         /// <inheritdoc/>
-        public bool TryGetService<TService>(out TService? service)
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                if (!TryGetContainer(out Container<TService>? container))
-                {
-                    service = null;
-
-                    return false;
-                }
-
-                service = container!.Instance ?? container.Factory!.Invoke();
-
-                return true;
-            }
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public TService GetService<TService>()
-            where TService : class
-        {
-            if (!this.TryGetService(out TService? service))
-            {
-                ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
-            }
-
-            return service!;
-        }
-
-        /// <inheritdoc/>
-        object IServiceProvider.GetService(Type serviceType)
+        object? IServiceProvider.GetService(Type serviceType)
         {
             lock (this.typesMap)
             {
@@ -209,10 +177,10 @@ object IServiceProvider.GetService(Type serviceType)
 
                 if (!this.typesMap.TryGetValue(key, out IContainer container))
                 {
-                    ThrowInvalidOperationExceptionOnServiceNotRegistered(serviceType);
+                    return null;
                 }
 
-                return container!.Instance ?? container.Factory!.Invoke();
+                return container!.Instance ?? container.Factory?.Invoke();
             }
         }
 
@@ -404,16 +372,6 @@ private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TServic
             throw new InvalidOperationException($"Service {typeof(TService)} not registered");
         }
 
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
-        /// </summary>
-        /// <param name="type">The type of service not found.</param>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered(Type type)
-        {
-            throw new InvalidOperationException($"Service {type} not registered");
-        }
-
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when a service doesn't expose a public parametrless constructor.
         /// </summary>

From 2c9ec0492d19a6d77bc7e0bc0a352656481001e0 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 17:52:49 +0200
Subject: [PATCH 116/595] Refactored Ioc class to use ASP.NET service provider

Special thanks to @Aminator for the help designing the new APIs
---
 .../ComponentModel/ViewModelBase.cs           |  23 +-
 .../DependencyInjection/IIoc.cs               |  91 -----
 .../IServiceProviderExtensions.cs             |  62 ---
 .../DependencyInjection/Ioc.cs                | 369 +++---------------
 .../Microsoft.Toolkit.Mvvm.csproj             |   1 +
 UnitTests/Mvvm/Test_Ioc.cs                    |  80 +++-
 UnitTests/Mvvm/Test_ViewModelBase.cs          |  15 +-
 UnitTests/UnitTests.csproj                    |   3 +
 8 files changed, 133 insertions(+), 511 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
 delete mode 100644 Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 3c46cedc34e..462a4620c6e 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -21,6 +21,7 @@
 // <LastBaseLevel>BL0014</LastBaseLevel>
 // ****************************************************************************
 
+using System;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
@@ -38,10 +39,10 @@ public abstract class ViewModelBase : ObservableObject
         /// </summary>
         /// <remarks>
         /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/>
-        /// and <see cref="DependencyInjection.Ioc.Default"/> services to perform operations.
+        /// and <see cref="Ioc.ServiceProvider"/> instances to perform requested operations.
         /// </remarks>
         protected ViewModelBase()
-            : this(Messaging.Messenger.Default, DependencyInjection.Ioc.Default)
+            : this(Messaging.Messenger.Default, Ioc.Default.ServiceProvider)
         {
         }
 
@@ -50,16 +51,16 @@ protected ViewModelBase()
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
         protected ViewModelBase(IMessenger messenger)
-            : this(messenger, DependencyInjection.Ioc.Default)
+            : this(messenger, Ioc.Default.ServiceProvider)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
-        /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(IIoc ioc)
-            : this(Messaging.Messenger.Default, ioc)
+        /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(IServiceProvider serviceProvider)
+            : this(Messaging.Messenger.Default, serviceProvider)
         {
         }
 
@@ -67,11 +68,11 @@ protected ViewModelBase(IIoc ioc)
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
-        /// <param name="ioc">The optional <see cref="IIoc"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(IMessenger messenger, IIoc ioc)
+        /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/> instance to use to retrieve services.</param>
+        protected ViewModelBase(IMessenger messenger, IServiceProvider serviceProvider)
         {
             Messenger = messenger;
-            Ioc = ioc;
+            ServiceProvider = serviceProvider;
         }
 
         /// <summary>
@@ -80,9 +81,9 @@ protected ViewModelBase(IMessenger messenger, IIoc ioc)
         protected IMessenger Messenger { get; }
 
         /// <summary>
-        /// Gets the <see cref="IIoc"/> instance in use.
+        /// Gets the <see cref="IServiceProvider"/> instance in use.
         /// </summary>
-        protected IIoc Ioc { get; }
+        protected IServiceProvider ServiceProvider { get; }
 
         private bool isActive;
 
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
deleted file mode 100644
index e17fa551eaf..00000000000
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IIoc.cs
+++ /dev/null
@@ -1,91 +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 System.Diagnostics.Contracts;
-
-#nullable enable
-
-namespace Microsoft.Toolkit.Mvvm.DependencyInjection
-{
-    /// <summary>
-    /// An interface for a type implementing an Inversion of Control service provider.
-    /// </summary>
-    public interface IIoc : IServiceProvider
-    {
-        /// <summary>
-        /// Checks whether or not a service of type <typeparamref name="TService"/> has already been registered.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to check for registration.</typeparam>
-        /// <returns><see langword="true"/> if the service <typeparamref name="TService"/> has already been registered, <see langword="false"/> otherwise.</returns>
-        [Pure]
-        bool IsRegistered<TService>()
-            where TService : class;
-
-        /// <summary>
-        /// Registers a singleton instance of service <typeparamref name="TService"/> through the type <typeparamref name="TProvider"/>.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <typeparam name="TProvider">The type of service provider for type <typeparamref name="TService"/> to register.</typeparam>
-        /// <remarks>This method will create a new <typeparamref name="TProvider"/> instance for future use.</remarks>
-        void Register<TService, TProvider>()
-            where TService : class
-            where TProvider : class, TService, new();
-
-        /// <summary>
-        /// Registers a singleton instance of service <typeparamref name="TService"/>.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <param name="provider">The <typeparamref name="TService"/> instance to register.</param>
-        void Register<TService>(TService provider)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service <typeparamref name="TService"/> through a <see cref="Func{TResult}"/> factory.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to register.</typeparam>
-        /// <param name="factory">The factory of instances implementing the <typeparamref name="TService"/> service to use.</param>
-        void Register<TService>(Func<TService> factory)
-            where TService : class;
-
-        /// <summary>
-        /// Unregisters a service of a specified type.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to unregister.</typeparam>
-        void Unregister<TService>()
-            where TService : class;
-
-        /// <summary>
-        /// Resets the internal state of the <see cref="Ioc"/> type and unregisters all services.
-        /// </summary>
-        void Reset();
-
-        /// <summary>
-        /// Gets all the currently registered services.
-        /// </summary>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered services.</returns>
-        /// <remarks>
-        /// This will also cause the <see cref="Ioc"/> service to resolve instances of
-        /// registered services that were setup to use lazy initialization.
-        /// </remarks>
-        [Pure]
-        ReadOnlyMemory<object> GetAllServices();
-
-        /// <summary>
-        /// Gets all the currently registered and instantiated services.
-        /// </summary>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> collection of all the currently registered and instantiated services.</returns>
-        [Pure]
-        ReadOnlyMemory<object> GetAllCreatedServices();
-
-        /// <summary>
-        /// Creates an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>A new instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        [Pure]
-        TService GetServiceWithoutCaching<TService>()
-            where TService : class;
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
deleted file mode 100644
index 72d057a4f81..00000000000
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/IServiceProviderExtensions.cs
+++ /dev/null
@@ -1,62 +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 System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-#nullable enable
-
-namespace Microsoft.Toolkit.Mvvm.DependencyInjection
-{
-    /// <summary>
-    /// Extensions for the <see cref="IIoc"/> type.
-    /// </summary>
-    public static class IServiceProviderExtensions
-    {
-        /// <summary>
-        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService? GetService<TService>(this IServiceProvider provider)
-            where TService : class
-        {
-            return (TService?)provider.GetService(typeof(TService));
-        }
-
-        /// <summary>
-        /// Resolves an instance of a registered type implementing the <typeparamref name="TService"/> service.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>An instance of a registered type implementing <typeparamref name="TService"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the requested service was not registered.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TService GetRequiredService<TService>(this IServiceProvider provider)
-            where TService : class
-        {
-            TService? service = (TService?)provider.GetService(typeof(TService));
-
-            if (service is null)
-            {
-                ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
-            }
-
-            return service!;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
-        /// </summary>
-        /// <typeparam name="TService">The type of service not found.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>()
-        {
-            throw new InvalidOperationException($"Service {typeof(TService)} not registered");
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 53044e82846..1e344d12449 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -3,383 +3,114 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
-using Microsoft.Collections.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 
 #nullable enable
 
 namespace Microsoft.Toolkit.Mvvm.DependencyInjection
 {
     /// <summary>
-    /// An Inversion of Control container that can be used to register and access instances of types providing services.
-    /// It is focused on performance, and offers the ability to register service providers either through eagerly
-    /// produced instances, or by using the factory pattern. The type is also fully thread-safe.
-    /// In order to use this helper, first define a service and a service provider, like so:
+    /// A type that facilitates the use of the <see cref="IServiceProvider"/> type.
+    /// The <see cref="Ioc"/> provides the ability to configure services in a singleton, thread-safe
+    /// service provider instance, which is then automatically injected into all viewmodels inheriting
+    /// from the provided <see cref="ComponentModel.ViewModelBase"/> class. First, you should define
+    /// some services you will use in your app. Here is an example:
     /// <code>
     /// public interface ILogger
     /// {
     ///     void Log(string text);
     /// }
-    ///
+    /// </code>
+    /// <code>
     /// public class ConsoleLogger : ILogger
     /// {
     ///     void Log(string text) => Console.WriteLine(text);
     /// }
     /// </code>
-    /// Then, register your services at startup, or at some time before using them:
+    /// The <see cref="ServiceProvider"/> configuration should then be done at startup, by calling one of
+    /// the available <see cref="ConfigureServices(IServiceCollection)"/> overloads, like so:
     /// <code>
-    /// Ioc.Default.Register&lt;ILogger, ConsoleLogger>();
+    /// Ioc.Default.ConfigureServices(collection =>
+    /// {
+    ///     collection.AddSingleton&lt;ILogger, Logger>();
+    /// });
     /// </code>
-    /// Finally, use the <see cref="Ioc"/> type to retrieve service instances to use:
+    /// Finally, you can use the <see cref="ServiceProvider"/> property to retrieve the
+    /// <see cref="IServiceProvider"/> instance with the collection of all the registered services:
     /// <code>
-    /// Ioc.Default.GetService&lt;ILogger>().Log("Hello world!");
+    /// Ioc.Default.ServiceProvider.GetService&lt;ILogger>().Log("Hello world!");
     /// </code>
-    /// The <see cref="Ioc"/> type will make sure to initialize your service instance if needed, or it will
-    /// throw an exception in case the requested service has not been registered yet.
     /// </summary>
-    public sealed class Ioc : IIoc
+    public sealed class Ioc
     {
-        /// <summary>
-        /// The <see cref="IContainer"/> instance for each registered type.
-        /// </summary>
-        private readonly DictionarySlim<Key, IContainer> typesMap = new DictionarySlim<Key, IContainer>();
-
         /// <summary>
         /// Gets the default <see cref="Ioc"/> instance.
         /// </summary>
         public static Ioc Default { get; } = new Ioc();
 
-        /// <inheritdoc/>
-        public bool IsRegistered<TService>()
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                return TryGetContainer<TService>(out _);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Register<TService, TProvider>()
-            where TService : class
-            where TProvider : class, TService, new()
-        {
-            Register<TService>(new TProvider());
-        }
-
-        /// <inheritdoc/>
-        public void Register<TService>(TService provider)
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                Container<TService> container = GetContainer<TService>();
-
-                container.Factory = null;
-                container.Instance = provider;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Register<TService>(Func<TService> factory)
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                Container<TService> container = GetContainer<TService>();
-
-                container.Factory = factory;
-                container.Instance = null;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Unregister<TService>()
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                var key = new Key(typeof(TService));
-
-                this.typesMap.Remove(key);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Reset()
-        {
-            lock (this.typesMap)
-            {
-                this.typesMap.Clear();
-            }
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlyMemory<object> GetAllServices()
-        {
-            lock (this.typesMap)
-            {
-                if (this.typesMap.Count == 0)
-                {
-                    return Array.Empty<object>();
-                }
-
-                object[] services = new object[this.typesMap.Count];
-
-                int i = 0;
-                foreach (var pair in this.typesMap)
-                {
-                    services[i++] = pair.Value.Instance ?? pair.Value.Factory!();
-                }
-
-                return services;
-            }
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlyMemory<object> GetAllCreatedServices()
-        {
-            lock (this.typesMap)
-            {
-                if (this.typesMap.Count == 0)
-                {
-                    return Array.Empty<object>();
-                }
-
-                object[] services = new object[this.typesMap.Count];
-
-                int i = 0;
-                foreach (var pair in this.typesMap)
-                {
-                    object? service = pair.Value.Instance;
-
-                    if (service is null)
-                    {
-                        continue;
-                    }
-
-                    services[i++] = service;
-                }
-
-                return services.AsMemory(0, i);
-            }
-        }
-
-        /// <inheritdoc/>
-        object? IServiceProvider.GetService(Type serviceType)
-        {
-            lock (this.typesMap)
-            {
-                var key = new Key(serviceType);
-
-                if (!this.typesMap.TryGetValue(key, out IContainer container))
-                {
-                    return null;
-                }
-
-                return container!.Instance ?? container.Factory?.Invoke();
-            }
-        }
-
-        /// <inheritdoc/>
-        public TService GetServiceWithoutCaching<TService>()
-            where TService : class
-        {
-            lock (this.typesMap)
-            {
-                if (!TryGetContainer(out Container<TService>? container))
-                {
-                    ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>();
-                }
-
-                Func<TService>? factory = container!.Factory;
-
-                if (!(factory is null))
-                {
-                    return factory();
-                }
-
-                TService service = container.Instance!;
-
-                if (service.GetType().GetConstructor(Type.EmptyTypes) is null)
-                {
-                    ThrowInvalidOperationExceptionOnServiceWithNoConstructor<TService>(service.GetType());
-                }
-
-                Type serviceType = service.GetType();
-                Expression[] expressions = { Expression.New(serviceType) };
-                Expression body = Expression.Block(serviceType, expressions);
-                factory = Expression.Lambda<Func<TService>>(body).Compile();
-
-                // Cache for later use
-                container.Factory = factory;
-
-                return factory();
-            }
-        }
-
         /// <summary>
-        /// Tries to get a <see cref="Container{T}"/> instance for a specific service type.
+        /// An <see cref="object"/> used to synchronize access to <see cref="ServiceProvider"/>.
         /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <param name="container">The resulting <see cref="Container{T}"/>, if found.</param>
-        /// <returns>Whether or not the container was present.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool TryGetContainer<TService>(out Container<TService>? container)
-            where TService : class
-        {
-            var key = new Key(typeof(TService));
+        private readonly object dummy = new object();
 
-            if (this.typesMap.TryGetValue(key, out IContainer local))
-            {
-                // We can use a fast cast here as the type is always known
-                container = Unsafe.As<Container<TService>>(local);
-
-                return true;
-            }
-
-            container = null;
-
-            return false;
-        }
+        private IServiceProvider? serviceProvider;
 
         /// <summary>
-        /// Gets the <see cref="Container{T}"/> instance for a specific service type.
-        /// </summary>
-        /// <typeparam name="TService">The type of service to look for.</typeparam>
-        /// <returns>A <see cref="Container{T}"/> instance with the requested type argument.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private Container<TService> GetContainer<TService>()
-            where TService : class
-        {
-            var key = new Key(typeof(TService));
-            ref IContainer target = ref this.typesMap.GetOrAddValueRef(key);
-
-            if (target is null)
-            {
-                target = new Container<TService>();
-            }
-
-            return Unsafe.As<Container<TService>>(target);
-        }
-
-        /// <summary>
-        /// A simple type representing a registered type.
+        /// Gets the shared <see cref="IServiceProvider"/> instance to use.
         /// </summary>
         /// <remarks>
-        /// This type is used to enable fast indexing in the type mapping, and is used to externally
-        /// inject the <see cref="IEquatable{T}"/> interface to <see cref="Type"/>.
+        /// Make sure to call any of the <see cref="ConfigureServices(IServiceCollection)"/> overloads
+        /// before accessing this property, otherwise it'll just fallback to an empty collection.
         /// </remarks>
-        private readonly struct Key : IEquatable<Key>
+        public IServiceProvider ServiceProvider
         {
-            /// <summary>
-            /// The registered type.
-            /// </summary>
-            private readonly Type type;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Key"/> struct.
-            /// </summary>
-            /// <param name="type">The input <see cref="Type"/> instance.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Key(Type type)
-            {
-                this.type = type;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Key other)
-            {
-                return ReferenceEquals(this.type, other.type);
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj)
-            {
-                return obj is Key other && Equals(other);
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public override int GetHashCode()
+            get
             {
-                return RuntimeHelpers.GetHashCode(this.type);
+                lock (dummy)
+                {
+                    return serviceProvider ??= new ServiceCollection().BuildServiceProvider();
+                }
             }
         }
 
         /// <summary>
-        /// Internal container type for services of type <typeparamref name="T"/>.
+        /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
-        /// <typeparam name="T">The type of services to store in this type.</typeparam>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "The type is private")]
-        private sealed class Container<T> : IContainer
-            where T : class
+        /// <param name="setup">The configuration delegate to use to add services.</param>
+        public void ConfigureServices(Action<IServiceCollection> setup)
         {
-            /// <inheritdoc/>
-            public object Lock { get; } = new object();
-
-            /// <summary>
-            /// The optional <see cref="Func{T}"/> instance to produce instances of the service <typeparamref name="T"/>.
-            /// </summary>
-            public Func<T>? Factory;
+            var collection = new ServiceCollection();
 
-            /// <summary>
-            /// The current <typeparamref name="T"/> instance being produced, if available.
-            /// </summary>
-            public T? Instance;
+            setup(collection);
 
-            /// <inheritdoc/>
-            Func<object>? IContainer.Factory => this.Factory;
-
-            /// <inheritdoc/>
-            object? IContainer.Instance => this.Instance;
+            ConfigureServices(collection);
         }
 
         /// <summary>
-        /// A interface for the <see cref="Container{T}"/> type.
+        /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
-        private interface IContainer
+        /// <param name="collection">The input <see cref="IServiceCollection"/> instance to use.</param>
+        public void ConfigureServices(IServiceCollection collection)
         {
-            /// <summary>
-            /// Gets an <see cref="object"/> used to synchronize accesses to the <see cref="Factory"/> and <see cref="Instance"/> fields.
-            /// </summary>
-            object Lock { get; }
-
-            /// <summary>
-            /// Gets the optional <see cref="Func{T}"/> instance to produce instances of the service.
-            /// </summary>
-            Func<object>? Factory { get; }
-
-            /// <summary>
-            /// Gets the current instance being produced, if available.
-            /// </summary>
-            object? Instance { get; }
-        }
+            lock (dummy)
+            {
+                if (!(this.serviceProvider is null))
+                {
+                    ThrowInvalidOperationExceptionForRepeatedConfiguration();
+                }
 
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when a service of a given type is not found.
-        /// </summary>
-        /// <typeparam name="TService">The type of service not found.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionOnServiceNotRegistered<TService>()
-        {
-            throw new InvalidOperationException($"Service {typeof(TService)} not registered");
+                this.serviceProvider ??= collection.BuildServiceProvider();
+            }
         }
 
         /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when a service doesn't expose a public parametrless constructor.
+        /// Throws an <see cref="InvalidOperationException"/> when a configuration is attempted more than once.
         /// </summary>
-        /// <typeparam name="TService">The type of service not found.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionOnServiceWithNoConstructor<TService>(Type type)
+        private static void ThrowInvalidOperationExceptionForRepeatedConfiguration()
         {
-            throw new InvalidOperationException($"Type {type} implementing service {typeof(TService)} does not expose a public constructor");
+            throw new InvalidOperationException("The default service provider has already been configured");
         }
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index cc93df2e9d9..c015958b32b 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -20,6 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
 
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index cf06f8090f7..d89e47e577d 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -2,6 +2,8 @@
 // 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.Extensions.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -12,40 +14,76 @@ public class Test_Ioc
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Ioc_SampleUsage()
+        public void Test_Ioc_DefaultServiceProvider()
         {
-            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
+            var ioc = new Ioc();
 
-            Ioc.Default.Register<INameService, BobService>();
+            IServiceProvider
+                providerA = ioc.ServiceProvider,
+                providerB = ioc.ServiceProvider;
 
-            Assert.IsTrue(Ioc.Default.IsRegistered<INameService>());
+            Assert.IsNotNull(providerA);
+            Assert.IsNotNull(providerB);
+            Assert.AreSame(providerA, providerB);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_LambdaInitialization()
+        {
+            var ioc = new Ioc();
+
+            ioc.ConfigureServices(services =>
+            {
+                services.AddSingleton<INameService, AliceService>();
+            });
 
-            var services = Ioc.Default.GetAllServices();
+            var service = ioc.ServiceProvider.GetRequiredService<INameService>();
 
-            Assert.AreEqual(services.Length, 1);
-            Assert.IsInstanceOfType(services.Span[0], typeof(INameService));
-            Assert.IsInstanceOfType(services.Span[0], typeof(BobService));
+            Assert.IsNotNull(service);
+            Assert.IsInstanceOfType(service, typeof(AliceService));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_CollectionInitialization()
+        {
+            var ioc = new Ioc();
 
-            Ioc.Default.Unregister<INameService>();
+            var services = new ServiceCollection();
 
-            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
+            services.AddSingleton<INameService, AliceService>();
 
-            Ioc.Default.Register<INameService>(() => new AliceService());
+            ioc.ConfigureServices(services);
 
-            Assert.IsTrue(Ioc.Default.IsRegistered<INameService>());
+            var service = ioc.ServiceProvider.GetRequiredService<INameService>();
 
-            services = Ioc.Default.GetAllServices();
+            Assert.IsNotNull(service);
+            Assert.IsInstanceOfType(service, typeof(AliceService));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_RepeatedLambdaInitialization()
+        {
+            var ioc = new Ioc();
+
+            ioc.ConfigureServices(services => { });
+
+            Assert.ThrowsException<InvalidOperationException>(() => ioc.ConfigureServices(services => { }));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_RepeatedCollectionInitialization()
+        {
+            var ioc = new Ioc();
 
-            Assert.AreEqual(services.Length, 1);
-            Assert.IsInstanceOfType(services.Span[0], typeof(INameService));
-            Assert.IsInstanceOfType(services.Span[0], typeof(AliceService));
+            var services = new ServiceCollection();
 
-            Ioc.Default.Reset();
+            ioc.ConfigureServices(services);
 
-            Assert.IsFalse(Ioc.Default.IsRegistered<INameService>());
-            Assert.AreEqual(Ioc.Default.GetAllServices().Length, 0);
+            Assert.ThrowsException<InvalidOperationException>(() => ioc.ConfigureServices(services));
         }
 
         public interface INameService
diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/Mvvm/Test_ViewModelBase.cs
index 03c08bf23f2..e91391531d4 100644
--- a/UnitTests/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/Mvvm/Test_ViewModelBase.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 Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
@@ -37,7 +38,7 @@ public void Test_ViewModelBase_Defaults()
             var viewmodel = new SomeViewModel<int>();
 
             Assert.AreSame(viewmodel.CurrentMessenger, Messenger.Default);
-            Assert.AreSame(viewmodel.CurrentIoc, Ioc.Default);
+            Assert.AreSame(viewmodel.CurrentServiceProvider, Ioc.Default.ServiceProvider);
         }
 
         [TestCategory("Mvvm")]
@@ -45,11 +46,11 @@ public void Test_ViewModelBase_Defaults()
         public void Test_ViewModelBase_Injection()
         {
             var messenger = new Messenger();
-            var ioc = new Ioc();
-            var viewmodel = new SomeViewModel<int>(messenger, ioc);
+            var services = new Ioc().ServiceProvider;
+            var viewmodel = new SomeViewModel<int>(messenger, services);
 
             Assert.AreSame(viewmodel.CurrentMessenger, messenger);
-            Assert.AreSame(viewmodel.CurrentIoc, ioc);
+            Assert.AreSame(viewmodel.CurrentServiceProvider, services);
         }
 
         [TestCategory("Mvvm")]
@@ -78,12 +79,12 @@ public SomeViewModel()
             {
             }
 
-            public SomeViewModel(IMessenger messenger, IIoc ioc)
-                : base(messenger, ioc)
+            public SomeViewModel(IMessenger messenger, IServiceProvider serviceProvider)
+                : base(messenger, serviceProvider)
             {
             }
 
-            public IIoc CurrentIoc => Ioc;
+            public IServiceProvider CurrentServiceProvider => ServiceProvider;
 
             public IMessenger CurrentMessenger => Messenger;
 
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 127f121397b..7a1b47166a0 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -103,6 +103,9 @@
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
+      <Version>3.1.3</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.9</Version>
     </PackageReference>

From 36a819f5e12c0978c980aac31a0cdba2e799de8e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 18:23:33 +0200
Subject: [PATCH 117/595] Added support for ServiceProviderOptions

---
 .../DependencyInjection/Ioc.cs                | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 1e344d12449..1237070c1cd 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -79,12 +79,22 @@ public IServiceProvider ServiceProvider
         /// </summary>
         /// <param name="setup">The configuration delegate to use to add services.</param>
         public void ConfigureServices(Action<IServiceCollection> setup)
+        {
+            ConfigureServices(setup, new ServiceProviderOptions());
+        }
+
+        /// <summary>
+        /// Initializes the shared <see cref="IServiceProvider"/> instance.
+        /// </summary>
+        /// <param name="setup">The configuration delegate to use to add services.</param>
+        /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
+        public void ConfigureServices(Action<IServiceCollection> setup, ServiceProviderOptions options)
         {
             var collection = new ServiceCollection();
 
             setup(collection);
 
-            ConfigureServices(collection);
+            ConfigureServices(collection, options);
         }
 
         /// <summary>
@@ -92,6 +102,16 @@ public void ConfigureServices(Action<IServiceCollection> setup)
         /// </summary>
         /// <param name="collection">The input <see cref="IServiceCollection"/> instance to use.</param>
         public void ConfigureServices(IServiceCollection collection)
+        {
+            ConfigureServices(collection, new ServiceProviderOptions());
+        }
+
+        /// <summary>
+        /// Initializes the shared <see cref="IServiceProvider"/> instance.
+        /// </summary>
+        /// <param name="collection">The input <see cref="IServiceCollection"/> instance to use.</param>
+        /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
+        public void ConfigureServices(IServiceCollection collection, ServiceProviderOptions options)
         {
             lock (dummy)
             {
@@ -100,7 +120,7 @@ public void ConfigureServices(IServiceCollection collection)
                     ThrowInvalidOperationExceptionForRepeatedConfiguration();
                 }
 
-                this.serviceProvider ??= collection.BuildServiceProvider();
+                this.serviceProvider ??= collection.BuildServiceProvider(options);
             }
         }
 

From 717fb9ad39df24620d2e3b100922c4f1892857cc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Apr 2020 19:33:07 +0200
Subject: [PATCH 118/595] Updated project description

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

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index c015958b32b..2f178ec813e 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -11,7 +11,7 @@
       - ViewModelBase: a base class for view-models with built-in minimal dependency injection support.
       - RelayCommand: a simple delegate command implementing the ICommand interface.
       - Messenger: a messaging system to exchange messages through different loosely-coupled objects.
-      - Ioc: a fast and minimalistic Inversion of Control service provider.
+      - Ioc: a helper class to configure dependency injection service containers.
     </Description>
     <PackageTags>UWP Toolkit Windows Mvvm Ioc extensions helpers</PackageTags>
 

From 86d3b49f5b3175f1c27d64efc8036abe434aea2f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 20 Apr 2020 19:44:35 +0200
Subject: [PATCH 119/595] Ioc optimization, ViewModelBase refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🚀 Removed locking overhead in the Ioc.ServiceProvider property
✅ Removed IServiceProvider property from ViewModelBase to better follow the proper DI pattern (thanks @Aminator for the suggestion)
---
 .../ComponentModel/ViewModelBase.cs           | 33 ++-----------
 .../DependencyInjection/Ioc.cs                | 47 +++++++++++++------
 UnitTests/Mvvm/Test_Ioc.cs                    | 10 +---
 UnitTests/Mvvm/Test_ViewModelBase.cs          | 15 ++----
 4 files changed, 42 insertions(+), 63 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 462a4620c6e..2f68aead8d2 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -21,9 +21,7 @@
 // <LastBaseLevel>BL0014</LastBaseLevel>
 // ****************************************************************************
 
-using System;
 using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
@@ -38,11 +36,11 @@ public abstract class ViewModelBase : ObservableObject
         /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
         /// </summary>
         /// <remarks>
-        /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/>
-        /// and <see cref="Ioc.ServiceProvider"/> instances to perform requested operations.
+        /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/> instance
+        /// to perform requested operations. It will also be available locally through the <see cref="Messenger"/> property.
         /// </remarks>
         protected ViewModelBase()
-            : this(Messaging.Messenger.Default, Ioc.Default.ServiceProvider)
+            : this(Messaging.Messenger.Default)
         {
         }
 
@@ -51,28 +49,8 @@ protected ViewModelBase()
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
         protected ViewModelBase(IMessenger messenger)
-            : this(messenger, Ioc.Default.ServiceProvider)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(IServiceProvider serviceProvider)
-            : this(Messaging.Messenger.Default, serviceProvider)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
-        /// </summary>
-        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
-        /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/> instance to use to retrieve services.</param>
-        protected ViewModelBase(IMessenger messenger, IServiceProvider serviceProvider)
         {
             Messenger = messenger;
-            ServiceProvider = serviceProvider;
         }
 
         /// <summary>
@@ -80,11 +58,6 @@ protected ViewModelBase(IMessenger messenger, IServiceProvider serviceProvider)
         /// </summary>
         protected IMessenger Messenger { get; }
 
-        /// <summary>
-        /// Gets the <see cref="IServiceProvider"/> instance in use.
-        /// </summary>
-        protected IServiceProvider ServiceProvider { get; }
-
         private bool isActive;
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 1237070c1cd..43fe799a49a 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using Microsoft.Extensions.DependencyInjection;
 
 #nullable enable
@@ -49,11 +50,6 @@ public sealed class Ioc
         /// </summary>
         public static Ioc Default { get; } = new Ioc();
 
-        /// <summary>
-        /// An <see cref="object"/> used to synchronize access to <see cref="ServiceProvider"/>.
-        /// </summary>
-        private readonly object dummy = new object();
-
         private IServiceProvider? serviceProvider;
 
         /// <summary>
@@ -67,10 +63,25 @@ public IServiceProvider ServiceProvider
         {
             get
             {
-                lock (dummy)
+                /* As per section I.12.6.6 of the official CLI ECMA-335 spec:
+                 * "[...] read and write access to properly aligned memory locations no larger than the native
+                 * word size is atomic when all the write accesses to a location are the same size. Atomic writes
+                 * shall alter no bits other than those written. Unless explicit layout control is used [...],
+                 * data elements no larger than the natural word size [...] shall be properly aligned.
+                 * Object references shall be treated as though they are stored in the native word size."
+                 * The field being accessed here is of native int size (reference type), and is only ever accessed
+                 * directly and atomically by a compare exhange instruction (see below), or here. We can therefore
+                 * assume this read is thread safe with respect to accesses to this property or to invocations to one
+                 * of the available configuration methods. So we can just read the field directly and make the necessary
+                 * check with our local copy, without the need of paying the locking overhead from this get accessor. */
+                IServiceProvider? provider = this.serviceProvider;
+
+                if (provider is null)
                 {
-                    return serviceProvider ??= new ServiceCollection().BuildServiceProvider();
+                    ThrowInvalidOperationExceptionForMissingInitialization();
                 }
+
+                return provider!;
             }
         }
 
@@ -113,17 +124,25 @@ public void ConfigureServices(IServiceCollection collection)
         /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
         public void ConfigureServices(IServiceCollection collection, ServiceProviderOptions options)
         {
-            lock (dummy)
-            {
-                if (!(this.serviceProvider is null))
-                {
-                    ThrowInvalidOperationExceptionForRepeatedConfiguration();
-                }
+            IServiceProvider newServices = collection.BuildServiceProvider(options);
 
-                this.serviceProvider ??= collection.BuildServiceProvider(options);
+            IServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, newServices, null);
+
+            if (!(oldServices is null))
+            {
+                ThrowInvalidOperationExceptionForRepeatedConfiguration();
             }
         }
 
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when the <see cref="ServiceProvider"/> property is used before initialization.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowInvalidOperationExceptionForMissingInitialization()
+        {
+            throw new InvalidOperationException("The service provider has not been configured yet");
+        }
+
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when a configuration is attempted more than once.
         /// </summary>
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index d89e47e577d..5eeef9db497 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -14,17 +14,11 @@ public class Test_Ioc
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Ioc_DefaultServiceProvider()
+        public void Test_Ioc_ServicesNotConfigured()
         {
             var ioc = new Ioc();
 
-            IServiceProvider
-                providerA = ioc.ServiceProvider,
-                providerB = ioc.ServiceProvider;
-
-            Assert.IsNotNull(providerA);
-            Assert.IsNotNull(providerB);
-            Assert.AreSame(providerA, providerB);
+            Assert.ThrowsException<InvalidOperationException>(() => ioc.ServiceProvider);
         }
 
         [TestCategory("Mvvm")]
diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/Mvvm/Test_ViewModelBase.cs
index e91391531d4..558d03d4419 100644
--- a/UnitTests/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/Mvvm/Test_ViewModelBase.cs
@@ -2,9 +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 Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -38,7 +36,6 @@ public void Test_ViewModelBase_Defaults()
             var viewmodel = new SomeViewModel<int>();
 
             Assert.AreSame(viewmodel.CurrentMessenger, Messenger.Default);
-            Assert.AreSame(viewmodel.CurrentServiceProvider, Ioc.Default.ServiceProvider);
         }
 
         [TestCategory("Mvvm")]
@@ -46,11 +43,9 @@ public void Test_ViewModelBase_Defaults()
         public void Test_ViewModelBase_Injection()
         {
             var messenger = new Messenger();
-            var services = new Ioc().ServiceProvider;
-            var viewmodel = new SomeViewModel<int>(messenger, services);
+            var viewmodel = new SomeViewModel<int>(messenger);
 
             Assert.AreSame(viewmodel.CurrentMessenger, messenger);
-            Assert.AreSame(viewmodel.CurrentServiceProvider, services);
         }
 
         [TestCategory("Mvvm")]
@@ -58,7 +53,7 @@ public void Test_ViewModelBase_Injection()
         public void Test_ViewModelBase_Broadcast()
         {
             var messenger = new Messenger();
-            var viewmodel = new SomeViewModel<int>(messenger, null);
+            var viewmodel = new SomeViewModel<int>(messenger);
 
             PropertyChangedMessage<int> message = null;
 
@@ -79,13 +74,11 @@ public SomeViewModel()
             {
             }
 
-            public SomeViewModel(IMessenger messenger, IServiceProvider serviceProvider)
-                : base(messenger, serviceProvider)
+            public SomeViewModel(IMessenger messenger)
+                : base(messenger)
             {
             }
 
-            public IServiceProvider CurrentServiceProvider => ServiceProvider;
-
             public IMessenger CurrentMessenger => Messenger;
 
             private T data;

From 719e77d34314c59830db56b0a7cf1b198041f1fa Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 20 Apr 2020 20:01:17 +0200
Subject: [PATCH 120/595] Code refactoring, improved API surface

---
 .../DependencyInjection/Ioc.cs                | 69 +++++++++----------
 UnitTests/Mvvm/Test_Ioc.cs                    |  6 +-
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 43fe799a49a..19e858f84d5 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -14,9 +14,8 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// <summary>
     /// A type that facilitates the use of the <see cref="IServiceProvider"/> type.
     /// The <see cref="Ioc"/> provides the ability to configure services in a singleton, thread-safe
-    /// service provider instance, which is then automatically injected into all viewmodels inheriting
-    /// from the provided <see cref="ComponentModel.ViewModelBase"/> class. First, you should define
-    /// some services you will use in your app. Here is an example:
+    /// service provider instance, which can then be used to resolve service instances.
+    /// The first step to use this feature is to declare some services, for instance:
     /// <code>
     /// public interface ILogger
     /// {
@@ -29,7 +28,7 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     ///     void Log(string text) => Console.WriteLine(text);
     /// }
     /// </code>
-    /// The <see cref="ServiceProvider"/> configuration should then be done at startup, by calling one of
+    /// Then the services configuration should then be done at startup, by calling one of
     /// the available <see cref="ConfigureServices(IServiceCollection)"/> overloads, like so:
     /// <code>
     /// Ioc.Default.ConfigureServices(collection =>
@@ -37,52 +36,46 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     ///     collection.AddSingleton&lt;ILogger, Logger>();
     /// });
     /// </code>
-    /// Finally, you can use the <see cref="ServiceProvider"/> property to retrieve the
-    /// <see cref="IServiceProvider"/> instance with the collection of all the registered services:
+    /// Finally, you can use the <see cref="Ioc"/> instance (which implements <see cref="IServiceProvider"/>)
+    /// to retrieve the service instances from anywhere in your application, by doing as follows:
     /// <code>
-    /// Ioc.Default.ServiceProvider.GetService&lt;ILogger>().Log("Hello world!");
+    /// Ioc.Default.GetService&lt;ILogger>().Log("Hello world!");
     /// </code>
     /// </summary>
-    public sealed class Ioc
+    public sealed class Ioc : IServiceProvider
     {
         /// <summary>
         /// Gets the default <see cref="Ioc"/> instance.
         /// </summary>
         public static Ioc Default { get; } = new Ioc();
 
-        private IServiceProvider? serviceProvider;
-
         /// <summary>
-        /// Gets the shared <see cref="IServiceProvider"/> instance to use.
+        /// The <see cref="ServiceProvider"/> instance to use, if initialized.
         /// </summary>
-        /// <remarks>
-        /// Make sure to call any of the <see cref="ConfigureServices(IServiceCollection)"/> overloads
-        /// before accessing this property, otherwise it'll just fallback to an empty collection.
-        /// </remarks>
-        public IServiceProvider ServiceProvider
+        private ServiceProvider? serviceProvider;
+
+        /// <inheritdoc/>
+        object? IServiceProvider.GetService(Type serviceType)
         {
-            get
+            /* As per section I.12.6.6 of the official CLI ECMA-335 spec:
+             * "[...] read and write access to properly aligned memory locations no larger than the native
+             * word size is atomic when all the write accesses to a location are the same size. Atomic writes
+             * shall alter no bits other than those written. Unless explicit layout control is used [...],
+             * data elements no larger than the natural word size [...] shall be properly aligned.
+             * Object references shall be treated as though they are stored in the native word size."
+             * The field being accessed here is of native int size (reference type), and is only ever accessed
+             * directly and atomically by a compare exhange instruction (see below), or here. We can therefore
+             * assume this read is thread safe with respect to accesses to this property or to invocations to one
+             * of the available configuration methods. So we can just read the field directly and make the necessary
+             * check with our local copy, without the need of paying the locking overhead from this get accessor. */
+            ServiceProvider? provider = this.serviceProvider;
+
+            if (provider is null)
             {
-                /* As per section I.12.6.6 of the official CLI ECMA-335 spec:
-                 * "[...] read and write access to properly aligned memory locations no larger than the native
-                 * word size is atomic when all the write accesses to a location are the same size. Atomic writes
-                 * shall alter no bits other than those written. Unless explicit layout control is used [...],
-                 * data elements no larger than the natural word size [...] shall be properly aligned.
-                 * Object references shall be treated as though they are stored in the native word size."
-                 * The field being accessed here is of native int size (reference type), and is only ever accessed
-                 * directly and atomically by a compare exhange instruction (see below), or here. We can therefore
-                 * assume this read is thread safe with respect to accesses to this property or to invocations to one
-                 * of the available configuration methods. So we can just read the field directly and make the necessary
-                 * check with our local copy, without the need of paying the locking overhead from this get accessor. */
-                IServiceProvider? provider = this.serviceProvider;
-
-                if (provider is null)
-                {
-                    ThrowInvalidOperationExceptionForMissingInitialization();
-                }
-
-                return provider!;
+                ThrowInvalidOperationExceptionForMissingInitialization();
             }
+
+            return provider!.GetService(serviceType);
         }
 
         /// <summary>
@@ -124,9 +117,9 @@ public void ConfigureServices(IServiceCollection collection)
         /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
         public void ConfigureServices(IServiceCollection collection, ServiceProviderOptions options)
         {
-            IServiceProvider newServices = collection.BuildServiceProvider(options);
+            ServiceProvider newServices = collection.BuildServiceProvider(options);
 
-            IServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, newServices, null);
+            ServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, newServices, null);
 
             if (!(oldServices is null))
             {
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/Mvvm/Test_Ioc.cs
index 5eeef9db497..69cba2ad8c6 100644
--- a/UnitTests/Mvvm/Test_Ioc.cs
+++ b/UnitTests/Mvvm/Test_Ioc.cs
@@ -18,7 +18,7 @@ public void Test_Ioc_ServicesNotConfigured()
         {
             var ioc = new Ioc();
 
-            Assert.ThrowsException<InvalidOperationException>(() => ioc.ServiceProvider);
+            Assert.ThrowsException<InvalidOperationException>(() => ioc.GetService<IServiceProvider>());
         }
 
         [TestCategory("Mvvm")]
@@ -32,7 +32,7 @@ public void Test_Ioc_LambdaInitialization()
                 services.AddSingleton<INameService, AliceService>();
             });
 
-            var service = ioc.ServiceProvider.GetRequiredService<INameService>();
+            var service = ioc.GetRequiredService<INameService>();
 
             Assert.IsNotNull(service);
             Assert.IsInstanceOfType(service, typeof(AliceService));
@@ -50,7 +50,7 @@ public void Test_Ioc_CollectionInitialization()
 
             ioc.ConfigureServices(services);
 
-            var service = ioc.ServiceProvider.GetRequiredService<INameService>();
+            var service = ioc.GetRequiredService<INameService>();
 
             Assert.IsNotNull(service);
             Assert.IsInstanceOfType(service, typeof(AliceService));

From dcb059ffd9f9be1c714b9b2353a46fe15ded7a3b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 20 Apr 2020 21:48:12 +0200
Subject: [PATCH 121/595] Minor code style tweaks

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs | 8 ++++----
 UnitTests/Mvvm/Test_ViewModelBase.cs                   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 2f68aead8d2..7d13e08b8ff 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -72,11 +72,11 @@ public bool IsActive
                 {
                     if (value)
                     {
-                        OnActivate();
+                        OnActivated();
                     }
                     else
                     {
-                        OnDeactivate();
+                        OnDeactivated();
                     }
                 }
             }
@@ -86,7 +86,7 @@ public bool IsActive
         /// Raised whenever the <see cref="IsActive"/> property is set to <see langword="true"/>.
         /// Use this method to register to messages and do other initialization for this instance.
         /// </summary>
-        protected virtual void OnActivate()
+        protected virtual void OnActivated()
         {
         }
 
@@ -95,7 +95,7 @@ protected virtual void OnActivate()
         /// Use this method to unregister from messages and do general cleanup for this instance.
         /// </summary>
         /// <remarks>The base implementation unregisters all messages for this recipient (with no token).</remarks>
-        protected virtual void OnDeactivate()
+        protected virtual void OnDeactivated()
         {
             Messenger.Unregister(this);
         }
diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/Mvvm/Test_ViewModelBase.cs
index 558d03d4419..a2d22123da3 100644
--- a/UnitTests/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/Mvvm/Test_ViewModelBase.cs
@@ -91,14 +91,14 @@ public T Data
 
             public bool IsActivatedCheck { get; private set; }
 
-            protected override void OnActivate()
+            protected override void OnActivated()
             {
                 IsActivatedCheck = true;
             }
 
-            protected override void OnDeactivate()
+            protected override void OnDeactivated()
             {
-                base.OnDeactivate();
+                base.OnDeactivated();
 
                 IsActivatedCheck = false;
             }

From 2f7c49e02ba5066caae9316b2d91f414391f7c05 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 22 Apr 2020 13:48:50 +0200
Subject: [PATCH 122/595] Added Set<T> overload with target expression

---
 .../ComponentModel/ObservableObject.cs        | 96 ++++++++++++++++++-
 UnitTests/Mvvm/Test_ObservableObject.cs       | 48 ++++++++++
 2 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 4516189ccb5..8d601add5fd 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -89,11 +89,96 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
             return true;
         }
 
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>,
+        /// with the difference being that this method is used to relay properties from a wrapped model in the
+        /// current instance. This type is useful when creating wrapping, bindable objects that operate over
+        /// models that lack support for notification (eg. for CRUD operations).
+        /// Suppose we have this model (eg. for a database row in a table):
+        /// <code>
+        /// public class Person
+        /// {
+        ///     public string Name { get; set; }
+        /// }
+        /// </code>
+        /// We can then use a property to wrap instances of this type into our observable model (which supports
+        /// notifications), injecting the notification to theproperties of that model, like so:
+        /// <code>
+        /// public class BindablePerson : ObservableObject
+        /// {
+        ///     public Model { get; }
+        ///
+        ///     public BindablePerson(Person model)
+        ///     {
+        ///         Model = model;
+        ///     }
+        ///
+        ///     public string Name
+        ///     {
+        ///         get => Model.Name;
+        ///         set => Set(() => Model.Name, value);
+        ///     }
+        /// }
+        /// </code>
+        /// This way we can then use the wrapping object in our application, and all those "proxy" properties will
+        /// also raise notifications when changed. Note that this method is not meant to be a replacement for
+        /// <see cref="Set{T}(ref T,T,string)"/>, which offers better performance and less memory usage. Only use this
+        /// overload when relaying properties to a model that doesn't support notifications, and only if you can't
+        /// implement notifications to that model directly (eg. by having it inherit from <see cref="ObservableObject"/>).
+        /// </summary>
+        /// <typeparam name="T">The type of property to set.</typeparam>
+        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same. Additionally, <paramref name="propertyExpression"/>
+        /// must return a property from a model that is stored as another property in the current instance.
+        /// This method only supports one level of indirection: <paramref name="propertyExpression"/> can only
+        /// be used to access properties of a model that is directly stored as a property of the current instance.
+        /// Additionally, this method can only be used if the wrapped item is a reference type.
+        /// </remarks>
+        protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
+        {
+            // Get the target property info
+            if (!(propertyExpression.Body is MemberExpression targetExpression &&
+                  targetExpression.Member is PropertyInfo targetPropertyInfo &&
+                  targetExpression.Expression is MemberExpression parentExpression &&
+                  parentExpression.Member is PropertyInfo parentPropertyInfo &&
+                  parentExpression.Expression is ConstantExpression instanceExpression &&
+                  instanceExpression.Value is object instance))
+            {
+                ThrowArgumentExceptionForInvalidPropertyExpression();
+
+                // This is never executed, as the method above always throws
+                return false;
+            }
+
+            object parent = parentPropertyInfo.GetValue(instance);
+            T oldValue = (T)targetPropertyInfo.GetValue(parent);
+
+            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            {
+                return false;
+            }
+
+            this.OnPropertyChanging(propertyName);
+
+            targetPropertyInfo.SetValue(parent, newValue);
+
+            this.OnPropertyChanged(propertyName);
+
+            return true;
+        }
+
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// The behavior mirrors that of <see cref="Set{T}"/>, with the difference being that this method
+        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
         /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
         /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
         /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
@@ -189,6 +274,15 @@ async void MonitorTask()
             return true;
         }
 
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
+        {
+            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
         /// </summary>
diff --git a/UnitTests/Mvvm/Test_ObservableObject.cs b/UnitTests/Mvvm/Test_ObservableObject.cs
index 9d1f5deee57..802d371eef3 100644
--- a/UnitTests/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/Mvvm/Test_ObservableObject.cs
@@ -54,6 +54,54 @@ public T Data
             }
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableObject_ProxyCrud()
+        {
+            var model = new WrappingModel { Person = new Person { Name = "Alice" } };
+
+            (PropertyChangingEventArgs, string) changing = default;
+            (PropertyChangedEventArgs, string) changed = default;
+
+            model.PropertyChanging += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changing = (e, model.Name);
+            };
+
+            model.PropertyChanged += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changed = (e, model.Name);
+            };
+
+            model.Name = "Bob";
+
+            Assert.AreEqual(changing.Item1?.PropertyName, nameof(WrappingModel.Name));
+            Assert.AreEqual(changing.Item2, "Alice");
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModel.Name));
+            Assert.AreEqual(changed.Item2, "Bob");
+            Assert.AreEqual(model.Person.Name, "Bob");
+        }
+
+        public class Person
+        {
+            public string Name { get; set; }
+        }
+
+        public class WrappingModel : ObservableObject
+        {
+            public Person Person { get; set; }
+
+            public string Name
+            {
+                get => Person.Name;
+                set => Set(() => Person.Name, value);
+            }
+        }
+
         [TestCategory("Mvvm")]
         [TestMethod]
         public async Task Test_ObservableObject_NotifyTask()

From 468929cf16a66c6631889f759d1bf31d8db49e19 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 22 Apr 2020 15:19:36 +0200
Subject: [PATCH 123/595] Added ValueChangedMessage<T> type

---
 .../Messages/PropertyChangedMessage{T}.cs     |  8 +++---
 .../Messages/ValueChangedMessage{T}.cs        | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index 8b0f57fc2e0..39a09728ba6 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -37,10 +37,10 @@ public class PropertyChangedMessage<T>
         /// <param name="newValue">The value that the property has after the change.</param>
         public PropertyChangedMessage(object sender, string propertyName, T oldValue, T newValue)
         {
-            this.Sender = sender;
-            this.PropertyName = propertyName;
-            this.OldValue = oldValue;
-            this.NewValue = newValue;
+            Sender = sender;
+            PropertyName = propertyName;
+            OldValue = oldValue;
+            NewValue = newValue;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs
new file mode 100644
index 00000000000..6266e438e33
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs
@@ -0,0 +1,27 @@
+// 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.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A base message that signals whenever a specific value has changed.
+    /// </summary>
+    /// <typeparam name="T">The type of value that has changed.</typeparam>
+    public class ValueChangedMessage<T>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValueChangedMessage{T}"/> class.
+        /// </summary>
+        /// <param name="value">The value that has changed.</param>
+        public ValueChangedMessage(T value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the value that has changed.
+        /// </summary>
+        public T Value { get; }
+    }
+}
\ No newline at end of file

From d1ae930d186eb1834d032e1c8bd3fcfb1f0798ef Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 14 May 2020 00:57:29 +0200
Subject: [PATCH 124/595] Updated multiline comments style

---
 .../ComponentModel/ObservableObject.cs        |  28 ++---
 .../DependencyInjection/Ioc.cs                |  22 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 104 +++++++++---------
 3 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 8d601add5fd..56276286446 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -214,10 +214,10 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
                 return false;
             }
 
-            /* Check the status of the new task before assigning it to the
-             * target field. This is so that in case the task is either
-             * null or already completed, we can avoid the overhead of
-             * scheduling the method to monitor its completion. */
+            // Check the status of the new task before assigning it to the
+            // target field. This is so that in case the task is either
+            // null or already completed, we can avoid the overhead of
+            // scheduling the method to monitor its completion.
             bool isAlreadyCompletedOrNull = newValue?.IsCompleted ?? true;
 
             this.OnPropertyChanging(propertyName);
@@ -231,8 +231,8 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
                 return true;
             }
 
-            /* Get the target field to set. This is needed because we can't
-             * capture the ref field in a closure (for the async method). */
+            // Get the target field to set. This is needed because we can't
+            // capture the ref field in a closure (for the async method).
             if (!((fieldExpression.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
             {
                 ThrowArgumentExceptionForInvalidFieldExpression();
@@ -241,14 +241,14 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
                 return false;
             }
 
-            /* We use a local async function here so that the main method can
-             * remain synchronous and return a value that can be immediately
-             * used by the caller. This mirrors Set<T>(ref T, T, string).
-             * We use an async void function instead of a Task-returning function
-             * so that if a binding update caused by the property change notification
-             * causes a crash, it is immediately reported in the application instead of
-             * the exception being ignored (as the returned task wouldn't be awaited),
-             * which would result in a confusing behavior for users. */
+            // We use a local async function here so that the main method can
+            // remain synchronous and return a value that can be immediately
+            // used by the caller. This mirrors Set<T>(ref T, T, string).
+            // We use an async void function instead of a Task-returning function
+            // so that if a binding update caused by the property change notification
+            // causes a crash, it is immediately reported in the application instead of
+            // the exception being ignored (as the returned task wouldn't be awaited),
+            // which would result in a confusing behavior for users.
             async void MonitorTask()
             {
                 try
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 19e858f84d5..c356790c9b0 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -57,17 +57,17 @@ public sealed class Ioc : IServiceProvider
         /// <inheritdoc/>
         object? IServiceProvider.GetService(Type serviceType)
         {
-            /* As per section I.12.6.6 of the official CLI ECMA-335 spec:
-             * "[...] read and write access to properly aligned memory locations no larger than the native
-             * word size is atomic when all the write accesses to a location are the same size. Atomic writes
-             * shall alter no bits other than those written. Unless explicit layout control is used [...],
-             * data elements no larger than the natural word size [...] shall be properly aligned.
-             * Object references shall be treated as though they are stored in the native word size."
-             * The field being accessed here is of native int size (reference type), and is only ever accessed
-             * directly and atomically by a compare exhange instruction (see below), or here. We can therefore
-             * assume this read is thread safe with respect to accesses to this property or to invocations to one
-             * of the available configuration methods. So we can just read the field directly and make the necessary
-             * check with our local copy, without the need of paying the locking overhead from this get accessor. */
+            // As per section I.12.6.6 of the official CLI ECMA-335 spec:
+            // "[...] read and write access to properly aligned memory locations no larger than the native
+            // word size is atomic when all the write accesses to a location are the same size. Atomic writes
+            // shall alter no bits other than those written. Unless explicit layout control is used [...],
+            // data elements no larger than the natural word size [...] shall be properly aligned.
+            // Object references shall be treated as though they are stored in the native word size."
+            // The field being accessed here is of native int size (reference type), and is only ever accessed
+            // directly and atomically by a compare exhange instruction (see below), or here. We can therefore
+            // assume this read is thread safe with respect to accesses to this property or to invocations to one
+            // of the available configuration methods. So we can just read the field directly and make the necessary
+            // check with our local copy, without the need of paying the locking overhead from this get accessor.
             ServiceProvider? provider = this.serviceProvider;
 
             if (provider is null)
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index cd626651f87..b6d619a6194 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -181,14 +181,14 @@ public void Unregister(object recipient)
 
                     if (map.Count == 0)
                     {
-                        /* Maps here are really of type Mapping<,> and with unknown type arguments.
-                         * If after removing the current recipient a given map becomes empty, it means
-                         * that there are no registered recipients at all for a given pair of message
-                         * and token types. In that case, we also remove the map from the types map.
-                         * The reason for keeping a key in each mapping is that removing items from a
-                         * dictionary (a hashed collection) only costs O(1) in the best case, while
-                         * if we had tried to iterate the whole dictionary every time we would have
-                         * paid an O(n) minimum cost for each single remove operation. */
+                        // Maps here are really of type Mapping<,> and with unknown type arguments.
+                        // If after removing the current recipient a given map becomes empty, it means
+                        // that there are no registered recipients at all for a given pair of message
+                        // and token types. In that case, we also remove the map from the types map.
+                        // The reason for keeping a key in each mapping is that removing items from a
+                        // dictionary (a hashed collection) only costs O(1) in the best case, while
+                        // if we had tried to iterate the whole dictionary every time we would have
+                        // paid an O(n) minimum cost for each single remove operation.
                         this.typesMap.Remove(map.TypeArguments);
                     }
                 }
@@ -219,10 +219,10 @@ public void Unregister<TToken>(object recipient, TToken token)
                     return;
                 }
 
-                /* Copy the candidate mappings for the target recipient to a local
-                 * array, as we can't modify the contents of the set while iterating it.
-                 * The rented buffer is oversized and will also include mappings for
-                 * handlers of messages that are registered through a different token. */
+                // Copy the candidate mappings for the target recipient to a local
+                // array, as we can't modify the contents of the set while iterating it.
+                // The rented buffer is oversized and will also include mappings for
+                // handlers of messages that are registered through a different token.
                 var maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set.Count);
                 int i = 0;
 
@@ -237,22 +237,22 @@ public void Unregister<TToken>(object recipient, TToken token)
                         }
                     }
 
-                    /* Iterate through all the local maps. These are all the currently
-                     * existing maps of handlers for messages of any given type, with a token
-                     * of the current type, for the target recipient. We heavily rely on
-                     * interfaces here to be able to iterate through all the available mappings
-                     * without having to know the concrete type in advance, and without having
-                     * to deal with reflection: we can just check if the type of the closed interface
-                     * matches with the token type currently in use, and operate on those instances. */
+                    // Iterate through all the local maps. These are all the currently
+                    // existing maps of handlers for messages of any given type, with a token
+                    // of the current type, for the target recipient. We heavily rely on
+                    // interfaces here to be able to iterate through all the available mappings
+                    // without having to know the concrete type in advance, and without having
+                    // to deal with reflection: we can just check if the type of the closed interface
+                    // matches with the token type currently in use, and operate on those instances.
                     foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
                     {
-                        /* We don't need whether or not the map contains the recipient, as the
-                         * sequence of maps has already been copied from the set containing all
-                         * the mappings for the target recipiets: it is guaranteed to be here. */
+                        // We don't need whether or not the map contains the recipient, as the
+                        // sequence of maps has already been copied from the set containing all
+                        // the mappings for the target recipiets: it is guaranteed to be here.
                         IDictionarySlim<TToken> holder = map[key];
 
-                        /* Remove the registered handler for the input token,
-                         * for the current message type (unknown from here). */
+                        // Remove the registered handler for the input token,
+                        // for the current message type (unknown from here).
                         holder.Remove(token);
 
                         if (holder.Count == 0)
@@ -262,11 +262,11 @@ public void Unregister<TToken>(object recipient, TToken token)
 
                             if (map.Count == 0)
                             {
-                                /* If no handlers are left at all for the recipient, across all
-                                 * message types and token types, remove the set of mappings
-                                 * entirely for the current recipient, and lost the strong
-                                 * reference to it as well. This is the same situation that
-                                 * would've been achieved by just calling Unregister(recipient). */
+                                // If no handlers are left at all for the recipient, across all
+                                // message types and token types, remove the set of mappings
+                                // entirely for the current recipient, and lost the strong
+                                // reference to it as well. This is the same situation that
+                                // would've been achieved by just calling Unregister(recipient).
                                 set.Remove(Unsafe.As<IMapping>(map));
 
                                 if (set.Count == 0)
@@ -309,11 +309,11 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                 // Remove the target handler
                 map.Remove(token);
 
-                /* If the map is empty, it means that the current recipient has no remaining
-                 * registered handlers for the current <TMessage, TToken> combination, regardless,
-                 * of the specific token value (ie. the channel used to receive messages of that type).
-                 * We can remove the map entirely from this container, and remove the link to the map itself
-                 * to the static mapping between existing registered recipients. */
+                // If the map is empty, it means that the current recipient has no remaining
+                // registered handlers for the current <TMessage, TToken> combination, regardless,
+                // of the specific token value (ie. the channel used to receive messages of that type).
+                // We can remove the map entirely from this container, and remove the link to the map itself
+                // to the static mapping between existing registered recipients.
                 if (map.Count == 0)
                 {
                     mapping.Remove(key);
@@ -362,11 +362,11 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
 
             lock (this.recipientsMap)
             {
-                /* We need to make a local copy of the currently registered handlers,
-                 * since users might try to unregister (or register) new handlers from
-                 * inside one of the currently existing handlers. We can use memory pooling
-                 * to reuse arrays, to minimize the average memory usage. In practice,
-                 * we usually just need to pay the small overhead of copying the items. */
+                // We need to make a local copy of the currently registered handlers,
+                // since users might try to unregister (or register) new handlers from
+                // inside one of the currently existing handlers. We can use memory pooling
+                // to reuse arrays, to minimize the average memory usage. In practice,
+                // we usually just need to pay the small overhead of copying the items.
                 if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
                 {
                     return;
@@ -381,13 +381,13 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
                 // Rent the array to copy handlers to
                 entries = ArrayPool<Action<TMessage>>.Shared.Rent(i);
 
-                /* Copy the handlers to the local collection.
-                 * Both types being enumerate expose a struct enumerator,
-                 * so we're not actually allocating the enumerator here.
-                 * The array is oversized at this point, since it also includes
-                 * handlers for different tokens. We can reuse the same variable
-                 * to count the number of matching handlers to invoke later on.
-                 * This will be the array slice with valid actions in the rented buffer. */
+                // Copy the handlers to the local collection.
+                // Both types being enumerate expose a struct enumerator,
+                // so we're not actually allocating the enumerator here.
+                // The array is oversized at this point, since it also includes
+                // handlers for different tokens. We can reuse the same variable
+                // to count the number of matching handlers to invoke later on.
+                // This will be the array slice with valid actions in the rented buffer.
                 i = 0;
                 foreach (var pair in mapping)
                 {
@@ -456,9 +456,9 @@ private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapp
 
             if (this.typesMap.TryGetValue(key, out IMapping target))
             {
-                /* This method and the ones above are the only ones handling values in the types map,
-                 * and here we are sure that the object reference we have points to an instance of the
-                 * right type. Using an unsafe cast skips two conditional branches and is faster. */
+                // This method and the ones above are the only ones handling values in the types map,
+                // and here we are sure that the object reference we have points to an instance of the
+                // right type. Using an unsafe cast skips two conditional branches and is faster.
                 mapping = Unsafe.As<Mapping<TMessage, TToken>>(target);
 
                 return true;
@@ -630,9 +630,9 @@ public override int GetHashCode()
             {
                 unchecked
                 {
-                    /* To combine the two hashes, we can simply use the fast djb2 hash algorithm.
-                     * This is not a problem in this case since we already know that the base
-                     * RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution. */
+                    // To combine the two hashes, we can simply use the fast djb2 hash algorithm.
+                    // This is not a problem in this case since we already know that the base
+                    // RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution.
                     int hash = RuntimeHelpers.GetHashCode(this.tMessage);
 
                     hash = (hash << 5) + hash;

From 0b36b2184eb9b1f4e7540f03533406071fa90984 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 14 May 2020 11:50:54 +0200
Subject: [PATCH 125/595] Added lbugnion/mvvmlight license to
 ThirdPartyNotices.txt

---
 ThirdPartyNotices.txt | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 128e038252e..875eae5e24c 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -5,8 +5,9 @@ Do Not Translate or Localize
 
 This project incorporates components from the projects listed below. The original copyright notices and the licenses under which the .NET Foundation received such components are set forth below. The .NET Foundation reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
 
-1.	PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents)
+1.	PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents).
 2.	MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
+3.	lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from.
 
 %% PedroLamas/DeferredEvents NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -57,3 +58,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
 END OF FrecherxDachs/UwpNotificationNetCoreTest NOTICES AND INFORMATION
+
+%% lbugnion/mvvmlight NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2009 - 2018 Laurent Bugnion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF lbugnion/mvvmlight NOTICES AND INFORMATION

From 84eb8562827e40f9c8e792ab67e40633a0332ff6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 14 May 2020 11:56:39 +0200
Subject: [PATCH 126/595] Added note to refer to the ThirdPartyNotices.txt file

---
 .../ComponentModel/ObservableObject.cs        | 20 ++----------------
 .../ComponentModel/ViewModelBase.cs           | 21 ++-----------------
 Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs  | 21 ++-----------------
 .../Input/RelayCommand{T}.cs                  | 21 ++-----------------
 .../Messages/PropertyChangedMessage{T}.cs     | 20 ++----------------
 5 files changed, 10 insertions(+), 93 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 56276286446..6215177a961 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -1,24 +1,8 @@
 // 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.
-
-#pragma warning disable SA1512
-
-// Original file header:
-// ****************************************************************************
-// <copyright file="ObservableObject.cs" company="GalaSoft Laurent Bugnion">
-// Copyright © GalaSoft Laurent Bugnion 2011-2016
-// </copyright>
-// ****************************************************************************
-// <author>Laurent Bugnion</author>
-// <email>laurent@galasoft.ch</email>
-// <date>10.4.2011</date>
-// <project>GalaSoft.MvvmLight.Messaging</project>
-// <web>http://www.mvvmlight.net</web>
-// <license>
-// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
-// </license>
-// ****************************************************************************
+// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
 using System.Collections.Generic;
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 7d13e08b8ff..0665106846f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -1,25 +1,8 @@
 // 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.
-
-#pragma warning disable SA1512
-
-// Original file header:
-// ****************************************************************************
-// <copyright file="ViewModelBase.cs" company="GalaSoft Laurent Bugnion">
-// Copyright © GalaSoft Laurent Bugnion 2009-2016
-// </copyright>
-// ****************************************************************************
-// <author>Laurent Bugnion</author>
-// <email>laurent@galasoft.ch</email>
-// <date>22.4.2009</date>
-// <project>GalaSoft.MvvmLight</project>
-// <web>http://www.mvvmlight.net</web>
-// <license>
-// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
-// </license>
-// <LastBaseLevel>BL0014</LastBaseLevel>
-// ****************************************************************************
+// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// more info in ThirdPartyNotices.txt in the root of the project.
 
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
index e555f3ca633..ae49a217a1e 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
@@ -1,25 +1,8 @@
 // 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.
-
-#pragma warning disable SA1512
-
-// <copyright file="RelayCommand.cs" company="GalaSoft Laurent Bugnion">
-// Copyright © GalaSoft Laurent Bugnion 2009-2016
-// </copyright>
-// ****************************************************************************
-// <author>Laurent Bugnion</author>
-// <email>laurent@galasoft.ch</email>
-// <date>22.4.2009</date>
-// <project>GalaSoft.MvvmLight</project>
-// <web>http://www.mvvmlight.net</web>
-// <license>
-// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
-// </license>
-// ****************************************************************************
-// <credits>This class was developed by Josh Smith (http://joshsmithonwpf.wordpress.com) and
-// slightly modified with his permission.</credits>
-// ****************************************************************************
+// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
 using System.Runtime.CompilerServices;
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index e5f474d6832..ed4354f2644 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -1,25 +1,8 @@
 // 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.
-
-#pragma warning disable SA1512
-
-// <copyright file="RelayCommand.cs" company="GalaSoft Laurent Bugnion">
-// Copyright © GalaSoft Laurent Bugnion 2009-2016
-// </copyright>
-// ****************************************************************************
-// <author>Laurent Bugnion</author>
-// <email>laurent@galasoft.ch</email>
-// <date>22.4.2009</date>
-// <project>GalaSoft.MvvmLight</project>
-// <web>http://www.mvvmlight.net</web>
-// <license>
-// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
-// </license>
-// ****************************************************************************
-// <credits>This class was developed by Josh Smith (http://joshsmithonwpf.wordpress.com) and
-// slightly modified with his permission.</credits>
-// ****************************************************************************
+// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
 using System.Runtime.CompilerServices;
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index 39a09728ba6..d55f50edc8f 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -1,24 +1,8 @@
 // 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.
-
-#pragma warning disable SA1512
-
-// Original file header:
-// ****************************************************************************
-// <copyright file="PropertyChangedMessage`1.cs" company="GalaSoft Laurent Bugnion">
-// Copyright © GalaSoft Laurent Bugnion 2009-2016
-// </copyright>
-// ****************************************************************************
-// <author>Laurent Bugnion</author>
-// <email>laurent@galasoft.ch</email>
-// <date>13.4.2009</date>
-// <project>GalaSoft.MvvmLight.Messaging</project>
-// <web>http://www.mvvmlight.net</web>
-// <license>
-// See license.txt in this project or http://www.galasoft.ch/license_MIT.txt
-// </license>
-// ****************************************************************************
+// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// more info in ThirdPartyNotices.txt in the root of the project.
 
 namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
 {

From a86d1c5b4a136eb2beaeb5c8179d362c904d37bb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 14 May 2020 13:55:06 +0200
Subject: [PATCH 127/595] Fixed file headers

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs    | 5 ++++-
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs       | 5 ++++-
 Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs                 | 5 ++++-
 Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs              | 5 ++++-
 .../Messaging/Messages/PropertyChangedMessage{T}.cs          | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 6215177a961..486905e8a21 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -1,6 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
+
+#pragma warning disable SA1512
+
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 0665106846f..ccc5416a771 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -1,6 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
+
+#pragma warning disable SA1512
+
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
index ae49a217a1e..2dc82713118 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
@@ -1,6 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
+
+#pragma warning disable SA1512
+
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index ed4354f2644..fd51056eeec 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -1,6 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
+
+#pragma warning disable SA1512
+
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index d55f50edc8f..cba2ce4599c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -1,6 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
+
+#pragma warning disable SA1512
+
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 

From 0cc2aef497d0e0640a291a2cea231398cd667fca Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 15 May 2020 00:45:07 +0200
Subject: [PATCH 128/595] Minor code fixes

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index b6d619a6194..04dec9f8c4b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
-using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
 
@@ -103,7 +102,6 @@ public bool IsRegistered<TMessage>(object recipient)
         }
 
         /// <inheritdoc/>
-        [Pure]
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
@@ -446,7 +444,6 @@ public void Reset()
         /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
         /// <param name="mapping">The resulting <see cref="Mapping{TMessage,TToken}"/> instance, if found.</param>
         /// <returns>Whether or not the required <see cref="Mapping{TMessage,TToken}"/> instance was found.</returns>
-        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapping)
             where TMessage : class
@@ -585,7 +582,7 @@ public override int GetHashCode()
         /// <see cref="tMessage"/> and <see cref="tToken"/> fields provide additional clarity reading
         /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
         /// </remarks>
-        public readonly struct Type2 : IEquatable<Type2>
+        private readonly struct Type2 : IEquatable<Type2>
         {
             /// <summary>
             /// The type of registered message.

From 5d6189e28839da1514af2a47534b8964a5681697 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 22:30:29 +0200
Subject: [PATCH 129/595] Code refactoring to ObservableObject and
 ViewModelBase

---
 .../ComponentModel/ObservableObject.cs        | 57 +++++++++++++++++++
 .../ComponentModel/ViewModelBase.cs           | 51 +----------------
 .../Messages/PropertyChangedMessage{T}.cs     |  6 +-
 3 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 486905e8a21..5af1ec17507 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -14,6 +14,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
@@ -46,6 +48,25 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
             this.PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
 
+        /// <summary>
+        /// Broadcasts a <see cref="PropertyChangedMessage{T}"/> with the specified
+        /// parameters, without using any particular token (so using the default channel).
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The value of the property before it changed.</param>
+        /// <param name="newValue">The value of the property after it changed.</param>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        /// <remarks>
+        /// You should override this method if you wish to customize the channel being
+        /// used to send the message (eg. if you need to use a specific token for the channel).
+        /// </remarks>
+        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
+        {
+            var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
+
+            Messenger.Default.Send(message);
+        }
+
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
@@ -76,6 +97,42 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
             return true;
         }
 
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.Set{T}(ref T, T, string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method, the
+        /// <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            if (!broadcast)
+            {
+                return Set(ref field, newValue, propertyName);
+            }
+
+            T oldValue = field;
+
+            if (Set(ref field, newValue, propertyName))
+            {
+                Broadcast(oldValue, newValue, propertyName);
+
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index ccc5416a771..a214ad1f342 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -86,59 +86,12 @@ protected virtual void OnDeactivated()
             Messenger.Unregister(this);
         }
 
-        /// <summary>
-        /// Broadcasts a <see cref="PropertyChangedMessage{T}"/> with the specified
-        /// parameters, without using any particular token (so using the default channel).
-        /// </summary>
-        /// <typeparam name="T">The type of the property that changed.</typeparam>
-        /// <param name="oldValue">The value of the property before it changed.</param>
-        /// <param name="newValue">The value of the property after it changed.</param>
-        /// <param name="propertyName">The name of the property that changed.</param>
-        /// <remarks>
-        /// You should override this method if you wish to customize the channel being
-        /// used to send the message (eg. if you need to use a specific token for the channel).
-        /// </remarks>
-        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
+        /// <inheritdoc/>
+        protected override void Broadcast<T>(T oldValue, T newValue, string propertyName)
         {
             var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
             Messenger.Send(message);
         }
-
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed,
-        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
-        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
-        /// </summary>
-        /// <typeparam name="T">The type of the property that changed.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// This method is just like <see cref="ObservableObject.Set{T}(ref T, T, string)"/>, just with the addition
-        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method, the
-        /// <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
-        /// are not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
-        {
-            if (!broadcast)
-            {
-                return Set(ref field, newValue, propertyName);
-            }
-
-            T oldValue = field;
-
-            if (Set(ref field, newValue, propertyName))
-            {
-                Broadcast(oldValue, newValue, propertyName);
-
-                return true;
-            }
-
-            return false;
-        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index cba2ce4599c..bab5e4b6364 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
 #pragma warning disable SA1512
 
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
@@ -22,7 +24,7 @@ public class PropertyChangedMessage<T>
         /// <param name="propertyName">The name of the property that changed.</param>
         /// <param name="oldValue">The value that the property had before the change.</param>
         /// <param name="newValue">The value that the property has after the change.</param>
-        public PropertyChangedMessage(object sender, string propertyName, T oldValue, T newValue)
+        public PropertyChangedMessage(ObservableObject sender, string propertyName, T oldValue, T newValue)
         {
             Sender = sender;
             PropertyName = propertyName;
@@ -33,7 +35,7 @@ public PropertyChangedMessage(object sender, string propertyName, T oldValue, T
         /// <summary>
         /// Gets the original sender of the broadcast message.
         /// </summary>
-        public object Sender { get; }
+        public ObservableObject Sender { get; }
 
         /// <summary>
         /// Gets the name of the property that changed.

From 0de744142814fbdcc64142bde6d9b65b531ad0a8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 22:31:49 +0200
Subject: [PATCH 130/595] Enabled ViewModelBase.IsActive broadcast

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index a214ad1f342..a65e03da47d 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -54,7 +54,7 @@ public bool IsActive
             get => this.isActive;
             set
             {
-                if (Set(ref this.isActive, value))
+                if (Set(ref this.isActive, value, true))
                 {
                     if (value)
                     {

From fa4b2efd11910db01e6b1f4895fb1fe4fcb66347 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 22:52:05 +0200
Subject: [PATCH 131/595] Added .NET Standard 2.1 target

---
 .../Microsoft.Toolkit.Mvvm.csproj                   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 2f178ec813e..991dcba5161 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
@@ -19,9 +19,18 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
+  <!-- .NET Standard 2.0 doesn't have the Span<T> types -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+  </ItemGroup>
+
+  <!-- .NET Standard 2.1 doesn't have the Unsafe class -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
 
 </Project>

From 24557f987d4e8f6fa0ff5508b4830adc0bc4ac7e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:15:38 +0200
Subject: [PATCH 132/595] Added default implementations to IMessenger

---
 .../Messaging/IMessenger.cs                   | 54 ++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 6950ad8ef19..ebcef3e07cd 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -21,7 +21,14 @@ public interface IMessenger
         /// <remarks>This method will use the default channel to check for the requested registration.</remarks>
         [Pure]
         bool IsRegistered<TMessage>(object recipient)
-            where TMessage : class;
+            where TMessage : class
+#if NETSTANDARD2_1
+        {
+            return IsRegistered<TMessage, Messenger.Unit>(recipient, default);
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
@@ -45,7 +52,14 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
         void Register<TMessage>(object recipient, Action<TMessage> action)
-            where TMessage : class;
+            where TMessage : class
+#if NETSTANDARD2_1
+        {
+            Register(recipient, default(Messenger.Unit), action);
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Registers a recipient for a given type of message.
@@ -81,7 +95,14 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// If the recipient has no registered handler, this method does nothing.
         /// </remarks>
         void Unregister<TMessage>(object recipient)
-            where TMessage : class;
+            where TMessage : class
+#if NETSTANDARD2_1
+        {
+            Unregister<TMessage, Messenger.Unit>(recipient, default);
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Unregisters a recipient from all messages on a specific channel.
@@ -115,7 +136,14 @@ void Unregister<TMessage, TToken>(object recipient, TToken token)
         /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
         /// </remarks>
         void Send<TMessage>()
-            where TMessage : class, new();
+            where TMessage : class, new()
+#if NETSTANDARD2_1
+        {
+            Send(new TMessage(), default(Messenger.Unit));
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
@@ -123,7 +151,14 @@ void Send<TMessage>()
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <param name="message">The message to send.</param>
         void Send<TMessage>(TMessage message)
-            where TMessage : class;
+            where TMessage : class
+#if NETSTANDARD2_1
+        {
+            Send(message, default(Messenger.Unit));
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
@@ -137,7 +172,14 @@ void Send<TMessage>(TMessage message)
         /// </remarks>
         void Send<TMessage, TToken>(TToken token)
             where TMessage : class, new()
-            where TToken : IEquatable<TToken>;
+            where TToken : IEquatable<TToken>
+#if NETSTANDARD2_1
+        {
+            Send(new TMessage(), token);
+        }
+#else
+        ;
+#endif
 
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.

From e0199abd7d193932bbe40018c7e4dea5e75c998d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:19:12 +0200
Subject: [PATCH 133/595] Renamed IMessengerExtensions class

---
 .../{IMessengerExtensions.cs => MessengerExtensions.cs}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{IMessengerExtensions.cs => MessengerExtensions.cs} (99%)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
similarity index 99%
rename from Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index f56742e7a3a..24695e18283 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <summary>
     /// Extensions for the <see cref="IMessenger"/> type.
     /// </summary>
-    public static class IMessengerExtensions
+    public static class MessengerExtensions
     {
         /// <summary>
         /// Sends a request of the specified type to all registered recipients, and returns the received response.

From 81c64ffaff8093c912c1fdcd7caf07cb3599ff77 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:37:22 +0200
Subject: [PATCH 134/595] Copied the Unit type to the extensions class

---
 .../Messaging/MessengerExtensions.Unit.cs     | 41 +++++++++++++++++++
 .../Messaging/MessengerExtensions.cs          |  6 +--
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
new file mode 100644
index 00000000000..d467a4e2dcc
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
@@ -0,0 +1,41 @@
+// 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.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging
+{
+    /// <summary>
+    /// Extensions for the <see cref="IMessenger"/> type.
+    /// </summary>
+    public static partial class MessengerExtensions
+    {
+        /// <summary>
+        /// An empty type representing a generic token with no specific value.
+        /// </summary>
+        private struct Unit : IEquatable<Unit>
+        {
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Unit other)
+            {
+                return true;
+            }
+
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Unit;
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public override int GetHashCode()
+            {
+                return 0;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 24695e18283..1bebb27094e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <summary>
     /// Extensions for the <see cref="IMessenger"/> type.
     /// </summary>
-    public static class MessengerExtensions
+    public static partial class MessengerExtensions
     {
         /// <summary>
         /// Sends a request of the specified type to all registered recipients, and returns the received response.
@@ -29,7 +29,7 @@ public static class MessengerExtensions
         public static TResult Request<TMessage, TResult>(this IMessenger messenger)
             where TMessage : RequestMessage<TResult>, new()
         {
-            return Request<TMessage, TResult, Messenger.Unit>(messenger, new TMessage(), default);
+            return Request<TMessage, TResult, Unit>(messenger, new TMessage(), default);
         }
 
         /// <summary>
@@ -44,7 +44,7 @@ public static TResult Request<TMessage, TResult>(this IMessenger messenger)
         public static TResult Request<TMessage, TResult>(this IMessenger messenger, TMessage message)
             where TMessage : RequestMessage<TResult>
         {
-            return Request<TMessage, TResult, Messenger.Unit>(messenger, message, default);
+            return Request<TMessage, TResult, Unit>(messenger, message, default);
         }
 
         /// <summary>

From 015913a14590d1e76addd08beb1149a3a25f369e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:42:46 +0200
Subject: [PATCH 135/595] Added new IMessenger extensions

---
 .../Messaging/MessengerExtensions.Default.cs  | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
new file mode 100644
index 00000000000..0809c0fd5e1
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
@@ -0,0 +1,107 @@
+// 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.Diagnostics.Contracts;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging
+{
+    /// <summary>
+    /// Extensions for the <see cref="IMessenger"/> type.
+    /// </summary>
+    public static partial class MessengerExtensions
+    {
+        /// <summary>
+        /// Checks whether or not a given recipient has already been registered for a message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to check the registration.</param>
+        /// <param name="recipient">The target recipient to check the registration for.</param>
+        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
+        /// <remarks>This method will use the default channel to check for the requested registration.</remarks>
+        [Pure]
+        public static bool IsRegistered<TMessage>(this IMessenger messenger, object recipient)
+            where TMessage : class
+        {
+            return messenger.IsRegistered<TMessage, Unit>(recipient, default);
+        }
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
+        public static void Register<TMessage>(this IMessenger messenger, object recipient, Action<TMessage> action)
+            where TMessage : class
+        {
+            messenger.Register(recipient, default(Unit), action);
+        }
+
+        /// <summary>
+        /// Unregisters a recipient from messages of a given type.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to unregister the recipient.</param>
+        /// <param name="recipient">The recipient to unregister.</param>
+        /// <remarks>
+        /// This method will unregister the target recipient only from the default channel.
+        /// If the recipient has no registered handler, this method does nothing.
+        /// </remarks>
+        public static void Unregister<TMessage>(this IMessenger messenger, object recipient)
+            where TMessage : class
+        {
+            messenger.Unregister<TMessage, Unit>(recipient, default);
+        }
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
+        /// <remarks>
+        /// This method is a shorthand for <see cref="Send{TMessage}(IMessenger,TMessage)"/> when the
+        /// message type exposes a parameterless constructor: it will automatically create
+        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
+        /// </remarks>
+        public static void Send<TMessage>(this IMessenger messenger)
+            where TMessage : class, new()
+        {
+            messenger.Send(new TMessage(), default(Unit));
+        }
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
+        /// <param name="message">The message to send.</param>
+        public static void Send<TMessage>(this IMessenger messenger, TMessage message)
+            where TMessage : class
+        {
+            messenger.Send(message, default(Unit));
+        }
+
+        /// <summary>
+        /// Sends a message of the specified type to all registered recipients.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to send.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <remarks>
+        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
+        /// just like <see cref="Send{TMessage}(IMessenger)"/>, and then send it to the right recipients.
+        /// </remarks>
+        public static void Send<TMessage, TToken>(this IMessenger messenger, TToken token)
+            where TMessage : class, new()
+            where TToken : IEquatable<TToken>
+        {
+            messenger.Send(new TMessage(), token);
+        }
+    }
+}

From 2a754809aad6d571893af1bfde1aeca7619009d2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:43:40 +0200
Subject: [PATCH 136/595] Removed unnecessary interface methods

---
 .../Messaging/IMessenger.cs                   | 110 ------------------
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  43 -------
 2 files changed, 153 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index ebcef3e07cd..68b965aeb63 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -12,24 +12,6 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// </summary>
     public interface IMessenger
     {
-        /// <summary>
-        /// Checks whether or not a given recipient has already been registered for a message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to check for the given recipient.</typeparam>
-        /// <param name="recipient">The target recipient to check the registration for.</param>
-        /// <returns>Whether or not <paramref name="recipient"/> has already been registered for the specified message.</returns>
-        /// <remarks>This method will use the default channel to check for the requested registration.</remarks>
-        [Pure]
-        bool IsRegistered<TMessage>(object recipient)
-            where TMessage : class
-#if NETSTANDARD2_1
-        {
-            return IsRegistered<TMessage, Messenger.Unit>(recipient, default);
-        }
-#else
-        ;
-#endif
-
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
         /// </summary>
@@ -43,24 +25,6 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
-        /// <summary>
-        /// Registers a recipient for a given type of message.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
-        /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
-        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
-        void Register<TMessage>(object recipient, Action<TMessage> action)
-            where TMessage : class
-#if NETSTANDARD2_1
-        {
-            Register(recipient, default(Messenger.Unit), action);
-        }
-#else
-        ;
-#endif
-
         /// <summary>
         /// Registers a recipient for a given type of message.
         /// </summary>
@@ -85,25 +49,6 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// </remarks>
         void Unregister(object recipient);
 
-        /// <summary>
-        /// Unregisters a recipient from messages of a given type.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to stop receiving.</typeparam>
-        /// <param name="recipient">The recipient to unregister.</param>
-        /// <remarks>
-        /// This method will unregister the target recipient only from the default channel.
-        /// If the recipient has no registered handler, this method does nothing.
-        /// </remarks>
-        void Unregister<TMessage>(object recipient)
-            where TMessage : class
-#if NETSTANDARD2_1
-        {
-            Unregister<TMessage, Messenger.Unit>(recipient, default);
-        }
-#else
-        ;
-#endif
-
         /// <summary>
         /// Unregisters a recipient from all messages on a specific channel.
         /// </summary>
@@ -126,61 +71,6 @@ void Unregister<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <remarks>
-        /// This method is a shorthand for <see cref="Send{TMessage}(TMessage)"/> when the
-        /// message type exposes a parameterless constructor: it will automatically create
-        /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
-        /// </remarks>
-        void Send<TMessage>()
-            where TMessage : class, new()
-#if NETSTANDARD2_1
-        {
-            Send(new TMessage(), default(Messenger.Unit));
-        }
-#else
-        ;
-#endif
-
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <param name="message">The message to send.</param>
-        void Send<TMessage>(TMessage message)
-            where TMessage : class
-#if NETSTANDARD2_1
-        {
-            Send(message, default(Messenger.Unit));
-        }
-#else
-        ;
-#endif
-
-        /// <summary>
-        /// Sends a message of the specified type to all registered recipients.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of message to send.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <remarks>
-        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
-        /// just like <see cref="Send{TMessage}()"/>, and then send it to the right recipients.
-        /// </remarks>
-        void Send<TMessage, TToken>(TToken token)
-            where TMessage : class, new()
-            where TToken : IEquatable<TToken>
-#if NETSTANDARD2_1
-        {
-            Send(new TMessage(), token);
-        }
-#else
-        ;
-#endif
-
         /// <summary>
         /// Sends a message of the specified type to all registered recipients.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 04dec9f8c4b..97eb5443972 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -94,13 +94,6 @@ public sealed class Messenger : IMessenger
         /// </summary>
         public static Messenger Default { get; } = new Messenger();
 
-        /// <inheritdoc/>
-        public bool IsRegistered<TMessage>(object recipient)
-            where TMessage : class
-        {
-            return IsRegistered<TMessage, Unit>(recipient, default);
-        }
-
         /// <inheritdoc/>
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             where TMessage : class
@@ -119,13 +112,6 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
-        /// <inheritdoc/>
-        public void Register<TMessage>(object recipient, Action<TMessage> action)
-            where TMessage : class
-        {
-            Register(recipient, default(Unit), action);
-        }
-
         /// <inheritdoc/>
         public void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
             where TMessage : class
@@ -196,13 +182,6 @@ public void Unregister(object recipient)
             }
         }
 
-        /// <inheritdoc/>
-        public void Unregister<TMessage>(object recipient)
-            where TMessage : class
-        {
-            Unregister<TMessage, Unit>(recipient, default);
-        }
-
         /// <inheritdoc/>
         public void Unregister<TToken>(object recipient, TToken token)
             where TToken : IEquatable<TToken>
@@ -328,28 +307,6 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
             }
         }
 
-        /// <inheritdoc/>
-        public void Send<TMessage>()
-            where TMessage : class, new()
-        {
-            Send(new TMessage(), default(Unit));
-        }
-
-        /// <inheritdoc/>
-        public void Send<TMessage>(TMessage message)
-            where TMessage : class
-        {
-            Send(message, default(Unit));
-        }
-
-        /// <inheritdoc/>
-        public void Send<TMessage, TToken>(TToken token)
-            where TMessage : class, new()
-            where TToken : IEquatable<TToken>
-        {
-            Send(new TMessage(), token);
-        }
-
         /// <inheritdoc/>
         public void Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class

From f0fb4cbeec63cfc79121ee0dba6172d077f7a1d1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:44:07 +0200
Subject: [PATCH 137/595] Removed .NET Standard 2.1 target

---
 .../Microsoft.Toolkit.Mvvm.csproj                   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 991dcba5161..e09d7a9a56b 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
@@ -19,17 +19,8 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
-  <!-- .NET Standard 2.0 doesn't have the Span<T> types -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Memory" Version="4.5.4" />
-  </ItemGroup>
-
-  <!-- .NET Standard 2.1 doesn't have the Unsafe class -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
-  </ItemGroup>
-
   <ItemGroup>
+    <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
   </ItemGroup>
 

From 93c653e602f80e77313ce57a2d81a690bccf8784 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:48:40 +0200
Subject: [PATCH 138/595] Removed original Unit type

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 97eb5443972..56850b12d42 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -598,32 +598,6 @@ public override int GetHashCode()
             }
         }
 
-        /// <summary>
-        /// An empty type representing a generic token with no specific value.
-        /// </summary>
-        internal struct Unit : IEquatable<Unit>
-        {
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Unit other)
-            {
-                return true;
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj)
-            {
-                return obj is Unit;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public override int GetHashCode()
-            {
-                return 0;
-            }
-        }
-
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
         /// </summary>

From bcf2476b87738d0875f25b5349a8edf6d0fcc8d3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 16 May 2020 23:51:22 +0200
Subject: [PATCH 139/595] Renamed request extensions file

---
 .../{MessengerExtensions.cs => MessengerExtensions.Request.cs}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{MessengerExtensions.cs => MessengerExtensions.Request.cs} (100%)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs

From 672e861f242dbc4a0a628273da4dcbb3c5093192 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 17 May 2020 00:46:59 +0200
Subject: [PATCH 140/595] Minor XML docs improvements

---
 .../ComponentModel/ObservableObject.cs                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 5af1ec17507..c8a94a6f258 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -99,8 +99,8 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
-        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
-        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="PropertyChanged"/> event.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
@@ -109,9 +109,9 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// This method is just like <see cref="ObservableObject.Set{T}(ref T, T, string)"/>, just with the addition
-        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method, the
-        /// <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// This method is just like <see cref="Set{T}(ref T, T, string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
+        /// the <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
         protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)

From 8b29a06cef7008253fa746f7f0979e2abd566a2a Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Mon, 18 May 2020 20:33:04 +0100
Subject: [PATCH 141/595] Add .net standard 1.4 target to Microsoft.Toolkit
 project.

---
 Microsoft.Toolkit/Diagnostics/Guard.cs        |  3 ++
 .../Extensions/TypeExtensions.cs              | 33 ++++++++++++++++++-
 Microsoft.Toolkit/Microsoft.Toolkit.csproj    |  9 ++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Guard.cs b/Microsoft.Toolkit/Diagnostics/Guard.cs
index fb57977ba2d..c67d9260f2a 100644
--- a/Microsoft.Toolkit/Diagnostics/Guard.cs
+++ b/Microsoft.Toolkit/Diagnostics/Guard.cs
@@ -6,6 +6,9 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
+#if NETSTANDARD1_4
+using Microsoft.Toolkit.Extensions;
+#endif
 
 #nullable enable
 
diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index bcc6cea4415..bf556a84a08 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -6,6 +6,9 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+#if NETSTANDARD1_4
+using System.Reflection;
+#endif
 using System.Runtime.CompilerServices;
 
 #nullable enable
@@ -62,7 +65,12 @@ static string FormatDisplayString(Type type)
                 }
 
                 // Generic types
-                if (type.IsGenericType &&
+                if (
+#if NETSTANDARD1_4
+                    type.GetTypeInfo().IsGenericType &&
+#else
+                    type.IsGenericType &&
+#endif
                     type.FullName is { } fullName &&
                     fullName.Split('`') is { } tokens &&
                     tokens.Length > 0 &&
@@ -113,5 +121,28 @@ tokens[0] is { } genericName &&
             // be removed once this issue is resolved: https://github.com/dotnet/roslyn/issues/5835.
             return DisplayNames.GetValue(type, t => FormatDisplayString(t));
         }
+
+#if NETSTANDARD1_4
+        /// <summary>
+        /// Returns an array of types representing the generic arguments.
+        /// </summary>
+        /// <param name="type">The input type.</param>
+        /// <returns>An array of types representing the generic arguments.</returns>
+        public static Type[] GetGenericArguments(this Type type)
+        {
+            return type.GetTypeInfo().GenericTypeParameters;
+        }
+
+        /// <summary>
+        /// Returns whether <paramref name="type"/> is an instance of <paramref name="value"/>.
+        /// </summary>
+        /// <param name="type">The input type.</param>
+        /// <param name="value">The type to check against.</param>
+        /// <returns>True if it is <paramref name="type"/> is an instance of <paramref name="value"/> false if not.</returns>
+        public static bool IsInstanceOfType(this Type type, object value)
+        {
+            return type.GetTypeInfo().IsAssignableFrom(value.GetType().GetTypeInfo());
+        }
+#endif
     }
 }
diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
index f8ec09a5960..ce9764155d2 100644
--- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj
+++ b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Title>Windows Community Toolkit .NET Standard</Title>
@@ -16,6 +16,13 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
+  <!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or System.Diagnostics.Contracts-->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
+    <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+  </ItemGroup>
+
   <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Memory" Version="4.5.4" />

From 2e24efd4a5135c156f0311af8c0ec6bfa624c92a Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Mon, 18 May 2020 21:06:57 +0100
Subject: [PATCH 142/595] Update Microsoft.Toolkit/Extensions/TypeExtensions.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index bf556a84a08..5272ddff3f0 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -128,7 +128,7 @@ tokens[0] is { } genericName &&
         /// </summary>
         /// <param name="type">The input type.</param>
         /// <returns>An array of types representing the generic arguments.</returns>
-        public static Type[] GetGenericArguments(this Type type)
+        private static Type[] GetGenericArguments(this Type type)
         {
             return type.GetTypeInfo().GenericTypeParameters;
         }

From e4aaa5e0b4d1a532852b7d7f1f8381e4069f0c23 Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Mon, 18 May 2020 21:07:02 +0100
Subject: [PATCH 143/595] Update Microsoft.Toolkit/Extensions/TypeExtensions.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index 5272ddff3f0..af6cc51f986 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -139,7 +139,7 @@ private static Type[] GetGenericArguments(this Type type)
         /// <param name="type">The input type.</param>
         /// <param name="value">The type to check against.</param>
         /// <returns>True if it is <paramref name="type"/> is an instance of <paramref name="value"/> false if not.</returns>
-        public static bool IsInstanceOfType(this Type type, object value)
+        internal static bool IsInstanceOfType(this Type type, object value)
         {
             return type.GetTypeInfo().IsAssignableFrom(value.GetType().GetTypeInfo());
         }

From 894a03cfd49b23de130e1da9ec8d1043c774fa62 Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Mon, 18 May 2020 21:07:09 +0100
Subject: [PATCH 144/595] Update Microsoft.Toolkit/Extensions/TypeExtensions.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index af6cc51f986..bf4eff079ad 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -138,7 +138,7 @@ private static Type[] GetGenericArguments(this Type type)
         /// </summary>
         /// <param name="type">The input type.</param>
         /// <param name="value">The type to check against.</param>
-        /// <returns>True if it is <paramref name="type"/> is an instance of <paramref name="value"/> false if not.</returns>
+        /// <returns>Returns <see langword="true"/> if <paramref name="type"/> is an instance of <paramref name="value"/>, <see langword="false"/> otherwise.</returns>
         internal static bool IsInstanceOfType(this Type type, object value)
         {
             return type.GetTypeInfo().IsAssignableFrom(value.GetType().GetTypeInfo());

From f87bb5ad981613d4f5a652183c104627dddc3c8c Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Mon, 18 May 2020 21:07:14 +0100
Subject: [PATCH 145/595] Update Microsoft.Toolkit/Microsoft.Toolkit.csproj

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Microsoft.Toolkit.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
index ce9764155d2..6d05a80b88f 100644
--- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj
+++ b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
@@ -16,7 +16,7 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
-  <!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or System.Diagnostics.Contracts-->
+  <!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or the [Pure] attribute -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
@@ -80,4 +80,4 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>

From 99d8806a4a75ae58a53006dafdd7016f6dd661c2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 26 May 2020 22:37:43 +0200
Subject: [PATCH 146/595] Moved Mvvm tests to shared project

---
 UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj      | 2 ++
 UnitTests/{ => UnitTests.Shared}/Mvvm/Test_Ioc.cs         | 0
 UnitTests/{ => UnitTests.Shared}/Mvvm/Test_Messenger.cs   | 0
 .../{ => UnitTests.Shared}/Mvvm/Test_ObservableObject.cs  | 0
 .../{ => UnitTests.Shared}/Mvvm/Test_RelayCommand.cs      | 0
 .../{ => UnitTests.Shared}/Mvvm/Test_RelayCommand{T}.cs   | 0
 .../{ => UnitTests.Shared}/Mvvm/Test_ViewModelBase.cs     | 0
 UnitTests/UnitTests.Shared/UnitTests.Shared.projitems     | 6 ++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj              | 8 +-------
 9 files changed, 9 insertions(+), 7 deletions(-)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_Ioc.cs (100%)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_Messenger.cs (100%)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_ObservableObject.cs (100%)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_RelayCommand.cs (100%)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_RelayCommand{T}.cs (100%)
 rename UnitTests/{ => UnitTests.Shared}/Mvvm/Test_ViewModelBase.cs (100%)

diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index c16dbc80a03..0cfc007898f 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -10,9 +10,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
     <ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
   </ItemGroup>
 
diff --git a/UnitTests/Mvvm/Test_Ioc.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_Ioc.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
diff --git a/UnitTests/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_Messenger.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
diff --git a/UnitTests/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_ObservableObject.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
diff --git a/UnitTests/Mvvm/Test_RelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_RelayCommand.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs
diff --git a/UnitTests/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_RelayCommand{T}.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
diff --git a/UnitTests/Mvvm/Test_ViewModelBase.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
similarity index 100%
rename from UnitTests/Mvvm/Test_ViewModelBase.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index c281bd27bdf..37096ae6724 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -21,5 +21,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Ioc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ViewModelBase.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index e99d8f2399e..bbb1ebe1bb8 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -148,12 +148,6 @@
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />
     <Compile Include="Helpers\Test_BackgroundTaskHelper.cs" />
     <Compile Include="Helpers\Test_CollectionCapableDeepLinkParser.cs" />
-    <Compile Include="Mvvm\Test_RelayCommand{T}.cs" />
-    <Compile Include="Mvvm\Test_RelayCommand.cs" />
-    <Compile Include="Mvvm\Test_ViewModelBase.cs" />
-    <Compile Include="Mvvm\Test_ObservableObject.cs" />
-    <Compile Include="Mvvm\Test_Messenger.cs" />
-    <Compile Include="Mvvm\Test_Ioc.cs" />
     <Compile Include="Helpers\Test_ColorHelper.cs" />
     <Compile Include="Helpers\Test_ConnectionHelper.cs" />
     <Compile Include="Helpers\Test_ScreenUnitHelper.cs" />
@@ -494,4 +488,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

From d5fbe0531447f87e2638b781a3902b4df586677b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 28 May 2020 15:00:41 +0200
Subject: [PATCH 147/595] Fixed merge error in 3rd party notices

---
 ThirdPartyNotices.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 104a11505a1..a076d882249 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -5,7 +5,7 @@ Do Not Translate or Localize
 
 This project incorporates components from the projects listed below. The original copyright notices and the licenses under which the .NET Foundation received such components are set forth below. The .NET Foundation reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
 
-1.	PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents).
+1.	PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in Microsoft.Toolkit.Uwp/Deferred.
 2.	MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
 3.	lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from.
 4.  PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.

From 803ae555cb9a28305694de77b9472e497b9a9fd3 Mon Sep 17 00:00:00 2001
From: Matthew <40522069+matthew4850@users.noreply.github.com>
Date: Thu, 28 May 2020 17:20:29 +0100
Subject: [PATCH 148/595] Update Microsoft.Toolkit/Extensions/TypeExtensions.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index bf4eff079ad..3d84b9aed68 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -138,7 +138,7 @@ private static Type[] GetGenericArguments(this Type type)
         /// </summary>
         /// <param name="type">The input type.</param>
         /// <param name="value">The type to check against.</param>
-        /// <returns>Returns <see langword="true"/> if <paramref name="type"/> is an instance of <paramref name="value"/>, <see langword="false"/> otherwise.</returns>
+        /// <returns><see langword="true"/> if <paramref name="type"/> is an instance of <paramref name="value"/>, <see langword="false"/> otherwise.</returns>
         internal static bool IsInstanceOfType(this Type type, object value)
         {
             return type.GetTypeInfo().IsAssignableFrom(value.GetType().GetTypeInfo());

From 283af26bdb6e772f4114a60dcf363173f282b082 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 2 Jun 2020 03:00:58 +0200
Subject: [PATCH 149/595] Updated Microsoft.Extensions.DependencyInjection
 package

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs | 1 -
 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj   | 2 +-
 UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj   | 2 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index a65e03da47d..a99ef2db956 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -7,7 +7,6 @@
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
-using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index e09d7a9a56b..a21cb4f156f 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
   </ItemGroup>
 
 </Project>
diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index 0cfc007898f..a596b6c7e4e 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index bbb1ebe1bb8..b9f10e8865d 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -104,7 +104,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>3.1.3</Version>
+      <Version>3.1.4</Version>
     </PackageReference>
     <PackageReference Include="FluentAssertions">
       <Version>5.10.2</Version>

From bb97787c8472953fe3b80927c14052880cf4b17d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 2 Jun 2020 03:02:19 +0200
Subject: [PATCH 150/595] Tweaked some XML docs

---
 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs | 4 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index c356790c9b0..91940774568 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -33,13 +33,13 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// <code>
     /// Ioc.Default.ConfigureServices(collection =>
     /// {
-    ///     collection.AddSingleton&lt;ILogger, Logger>();
+    ///     collection.AddSingleton&lt;ILogger, Logger&gt;();
     /// });
     /// </code>
     /// Finally, you can use the <see cref="Ioc"/> instance (which implements <see cref="IServiceProvider"/>)
     /// to retrieve the service instances from anywhere in your application, by doing as follows:
     /// <code>
-    /// Ioc.Default.GetService&lt;ILogger>().Log("Hello world!");
+    /// Ioc.Default.GetService&lt;ILogger&gt;().Log("Hello world!");
     /// </code>
     /// </summary>
     public sealed class Ioc : IServiceProvider
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 56850b12d42..f3365e8c027 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -21,14 +21,14 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// </code>
     /// Then, register your a recipient for this message:
     /// <code>
-    /// Messenger.Default.Register&lt;LoginCompletedMessage>(this, m =>
+    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, m =>
     /// {
     ///     // Handle the message here...
     /// });
     /// </code>
     /// Finally, send a message when needed, like so:
     /// <code>
-    /// Messenger.Default.Send&lt;LoginCompletedMessage>();
+    /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
     /// </code>
     /// For info on the other available features, check the <see cref="IMessenger"/> interface.
     /// </summary>

From 65fa3030e075234fe9d5fc49c1268e0f86df4dbb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 2 Jun 2020 14:24:48 +0200
Subject: [PATCH 151/595] Added support for proxy fields with LINQ expression

---
 .../ComponentModel/ObservableObject.cs        | 10 +++-
 .../Mvvm/Test_ObservableObject.cs             | 55 +++++++++++++++++--
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index c8a94a6f258..a8ccdb18960 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -187,11 +187,15 @@ protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName
         /// </remarks>
         protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
         {
+            PropertyInfo? parentPropertyInfo;
+            FieldInfo? parentFieldInfo = null;
+
             // Get the target property info
             if (!(propertyExpression.Body is MemberExpression targetExpression &&
                   targetExpression.Member is PropertyInfo targetPropertyInfo &&
                   targetExpression.Expression is MemberExpression parentExpression &&
-                  parentExpression.Member is PropertyInfo parentPropertyInfo &&
+                  (!((parentPropertyInfo = parentExpression.Member as PropertyInfo) is null) ||
+                   !((parentFieldInfo = parentExpression.Member as FieldInfo) is null)) &&
                   parentExpression.Expression is ConstantExpression instanceExpression &&
                   instanceExpression.Value is object instance))
             {
@@ -201,7 +205,9 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
                 return false;
             }
 
-            object parent = parentPropertyInfo.GetValue(instance);
+            object parent = parentPropertyInfo is null
+                ? parentFieldInfo!.GetValue(instance)
+                : parentPropertyInfo.GetValue(instance);
             T oldValue = (T)targetPropertyInfo.GetValue(parent);
 
             if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 802d371eef3..2ed4d0d6e67 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -56,9 +56,9 @@ public T Data
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableObject_ProxyCrud()
+        public void Test_ObservableObject_ProxyCrudWithProperty()
         {
-            var model = new WrappingModel { Person = new Person { Name = "Alice" } };
+            var model = new WrappingModelWithProperty { Person = new Person { Name = "Alice" } };
 
             (PropertyChangingEventArgs, string) changing = default;
             (PropertyChangedEventArgs, string) changed = default;
@@ -79,9 +79,9 @@ public void Test_ObservableObject_ProxyCrud()
 
             model.Name = "Bob";
 
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(WrappingModel.Name));
+            Assert.AreEqual(changing.Item1?.PropertyName, nameof(WrappingModelWithProperty.Name));
             Assert.AreEqual(changing.Item2, "Alice");
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModel.Name));
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModelWithProperty.Name));
             Assert.AreEqual(changed.Item2, "Bob");
             Assert.AreEqual(model.Person.Name, "Bob");
         }
@@ -91,7 +91,7 @@ public class Person
             public string Name { get; set; }
         }
 
-        public class WrappingModel : ObservableObject
+        public class WrappingModelWithProperty : ObservableObject
         {
             public Person Person { get; set; }
 
@@ -102,6 +102,51 @@ public string Name
             }
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableObject_ProxyCrudWithField()
+        {
+            var model = new WrappingModelWithField { Person = new Person { Name = "Alice" } };
+
+            (PropertyChangingEventArgs, string) changing = default;
+            (PropertyChangedEventArgs, string) changed = default;
+
+            model.PropertyChanging += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changing = (e, model.Name);
+            };
+
+            model.PropertyChanged += (s, e) =>
+            {
+                Assert.AreSame(model, s);
+
+                changed = (e, model.Name);
+            };
+
+            model.Name = "Bob";
+
+            Assert.AreEqual(changing.Item1?.PropertyName, nameof(WrappingModelWithField.Name));
+            Assert.AreEqual(changing.Item2, "Alice");
+            Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModelWithField.Name));
+            Assert.AreEqual(changed.Item2, "Bob");
+            Assert.AreEqual(model.Person.Name, "Bob");
+        }
+
+        public class WrappingModelWithField : ObservableObject
+        {
+#pragma warning disable SA1401 // Fields should be private
+            public Person Person;
+#pragma warning restore SA1401
+
+            public string Name
+            {
+                get => Person.Name;
+                set => Set(() => Person.Name, value);
+            }
+        }
+
         [TestCategory("Mvvm")]
         [TestMethod]
         public async Task Test_ObservableObject_NotifyTask()

From 0b7d0a0dd17959965fe036205b5c3d4c598ed0ce Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 4 Jun 2020 18:58:59 +0200
Subject: [PATCH 152/595] Improved value type parameters when canExecute is not
 used

---
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs | 7 +++++++
 Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs      | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index a3acba78273..6d1faefcf1c 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -76,6 +76,13 @@ public bool CanExecute(T parameter)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(object? parameter)
         {
+            if (typeof(T).IsValueType &&
+                parameter is null &&
+                this.canExecute is null)
+            {
+                return true;
+            }
+
             return CanExecute((T)parameter!);
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index fd51056eeec..5a98aa6e8c9 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -70,6 +70,13 @@ public void NotifyCanExecuteChanged()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(T parameter)
         {
+            if (typeof(T).IsValueType &&
+                parameter is null &&
+                this.canExecute is null)
+            {
+                return true;
+            }
+
             return this.canExecute?.Invoke(parameter) != false;
         }
 

From 69a9ff3a3e5ac867ab1b54f48ada36830b5bec9c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 5 Jun 2020 19:59:12 +0200
Subject: [PATCH 153/595] Code refactoring, improved Request pattern APIs

---
 .../Messaging/Messages/RequestMessage{T}.cs   |  24 +++-
 .../Messaging/MessengerExtensions.Default.cs  |  16 ++-
 .../Messaging/MessengerExtensions.Request.cs  | 105 ------------------
 3 files changed, 34 insertions(+), 111 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index b22927c0374..2da46c37d0b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.CompilerServices;
 
 #pragma warning disable CS8618
 
@@ -25,6 +24,7 @@ public class RequestMessage<T>
         /// <summary>
         /// Gets the message response.
         /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when <see cref="IsResponseReceived"/> is <see langword="false"/>.</exception>
         public T Result
         {
             get
@@ -33,7 +33,7 @@ public T Result
                 {
                     if (!this.IsResponseReceived)
                     {
-                        ThrowInvalidOperationExceptionForDuplicateReporResult();
+                        ThrowInvalidOperationExceptionForNoResponseReceived();
                     }
 
                     return this.result;
@@ -50,6 +50,7 @@ public T Result
         /// Reports a result for the current request message.
         /// </summary>
         /// <param name="result">The result to report for the message.</param>
+        /// <exception cref="InvalidOperationException">Thrown if <see cref="Result"/> has already been set.</exception>
         public void ReportResult(T result)
         {
             lock (this.dummy)
@@ -64,10 +65,27 @@ public void ReportResult(T result)
             }
         }
 
+        /// <summary>
+        /// Implicitly gets the response from a given <see cref="RequestMessage{T}"/> instance
+        /// </summary>
+        /// <param name="message">The input <see cref="RequestMessage{T}"/> instance</param>
+        /// <exception cref="InvalidOperationException">Thrown when <see cref="IsResponseReceived"/> is <see langword="false"/>.</exception>
+        public static implicit operator T(RequestMessage<T> message)
+        {
+            return message.Result;
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a response is not available.
+        /// </summary>
+        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
+        {
+            throw new InvalidOperationException("No response was received for the given request message");
+        }
+
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when <see cref="ReportResult"/> is called twice.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForDuplicateReporResult()
         {
             throw new InvalidOperationException("A result has already been reported for the current message");
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
index 0809c0fd5e1..282a21a86cd 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
@@ -63,15 +63,20 @@ public static void Unregister<TMessage>(this IMessenger messenger, object recipi
         /// </summary>
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
+        /// <returns>The message that has been sent.</returns>
         /// <remarks>
         /// This method is a shorthand for <see cref="Send{TMessage}(IMessenger,TMessage)"/> when the
         /// message type exposes a parameterless constructor: it will automatically create
         /// a new <typeparamref name="TMessage"/> instance and send that to its recipients.
         /// </remarks>
-        public static void Send<TMessage>(this IMessenger messenger)
+        public static TMessage Send<TMessage>(this IMessenger messenger)
             where TMessage : class, new()
         {
-            messenger.Send(new TMessage(), default(Unit));
+            var message = new TMessage();
+
+            messenger.Send(message, default(Unit));
+
+            return message;
         }
 
         /// <summary>
@@ -93,15 +98,20 @@ public static void Send<TMessage>(this IMessenger messenger, TMessage message)
         /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
         /// <param name="token">The token indicating what channel to use.</param>
+        /// <returns>The message that has been sen.</returns>
         /// <remarks>
         /// This method will automatically create a new <typeparamref name="TMessage"/> instance
         /// just like <see cref="Send{TMessage}(IMessenger)"/>, and then send it to the right recipients.
         /// </remarks>
-        public static void Send<TMessage, TToken>(this IMessenger messenger, TToken token)
+        public static TMessage Send<TMessage, TToken>(this IMessenger messenger, TToken token)
             where TMessage : class, new()
             where TToken : IEquatable<TToken>
         {
+            var message = new TMessage();
+
             messenger.Send(new TMessage(), token);
+
+            return message;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs
deleted file mode 100644
index 1bebb27094e..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Request.cs
+++ /dev/null
@@ -1,105 +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 System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.Toolkit.Mvvm.Messaging
-{
-    /// <summary>
-    /// Extensions for the <see cref="IMessenger"/> type.
-    /// </summary>
-    public static partial class MessengerExtensions
-    {
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        /// <remarks>
-        /// This method is a shorthand for <see cref="Request{TMessage,TResult}(IMessenger,TMessage)"/> when the
-        /// message type exposes a parameterless constructor: it will automatically create
-        /// a new <typeparamref name="TMessage"/> request message and use that to perform the request.
-        /// </remarks>
-        public static TResult Request<TMessage, TResult>(this IMessenger messenger)
-            where TMessage : RequestMessage<TResult>, new()
-        {
-            return Request<TMessage, TResult, Unit>(messenger, new TMessage(), default);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
-        /// <param name="message">The message to send.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public static TResult Request<TMessage, TResult>(this IMessenger messenger, TMessage message)
-            where TMessage : RequestMessage<TResult>
-        {
-            return Request<TMessage, TResult, Unit>(messenger, message, default);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        /// <remarks>
-        /// This method will automatically create a new <typeparamref name="TMessage"/> instance
-        /// just like <see cref="Request{TMessage,TResult}(IMessenger)"/>, and then send it to the right recipients.
-        /// </remarks>
-        public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TToken token)
-            where TMessage : RequestMessage<TResult>, new()
-            where TToken : IEquatable<TToken>
-        {
-            return Request<TMessage, TResult, TToken>(messenger, new TMessage(), token);
-        }
-
-        /// <summary>
-        /// Sends a request of the specified type to all registered recipients, and returns the received response.
-        /// </summary>
-        /// <typeparam name="TMessage">The type of request message to send.</typeparam>
-        /// <typeparam name="TResult">The type of response to expect.</typeparam>
-        /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
-        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the request.</param>
-        /// <param name="message">The request message to send.</param>
-        /// <param name="token">The token indicating what channel to use.</param>
-        /// <returns>The <typeparamref name="TResult"/> response value for the given message.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if no response is received for the message.</exception>
-        public static TResult Request<TMessage, TResult, TToken>(this IMessenger messenger, TMessage message, TToken token)
-            where TMessage : RequestMessage<TResult>
-            where TToken : IEquatable<TToken>
-        {
-            messenger.Send(message, token);
-
-            if (!message.IsResponseReceived)
-            {
-                ThrowInvalidOperationExceptionForNoResponseReceived();
-            }
-
-            return message.Result;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
-        {
-            throw new InvalidOperationException("No response was received for the given request message");
-        }
-    }
-}

From 7df8a857f33f38c06fb1363f7d14e60386fd2bf2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 5 Jun 2020 21:40:48 +0200
Subject: [PATCH 154/595] Minor API tweaks and comments improvements

---
 .../Messaging/IMessenger.cs                   |  3 ++-
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 22 +++++++++++--------
 .../Messaging/MessengerExtensions.Default.cs  |  5 +++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 68b965aeb63..9795d126a74 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -78,7 +78,8 @@ void Unregister<TMessage, TToken>(object recipient, TToken token)
         /// <typeparam name="TToken">The type of token to identify what channel to use to send the message.</typeparam>
         /// <param name="message">The message to send.</param>
         /// <param name="token">The token indicating what channel to use.</param>
-        void Send<TMessage, TToken>(TMessage message, TToken token)
+        /// <returns>The message that was sent (ie. <paramref name="message"/>).</returns>
+        TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index f3365e8c027..fe3c68e3f05 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -308,7 +308,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public void Send<TMessage, TToken>(TMessage message, TToken token)
+        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -317,14 +317,10 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
 
             lock (this.recipientsMap)
             {
-                // We need to make a local copy of the currently registered handlers,
-                // since users might try to unregister (or register) new handlers from
-                // inside one of the currently existing handlers. We can use memory pooling
-                // to reuse arrays, to minimize the average memory usage. In practice,
-                // we usually just need to pay the small overhead of copying the items.
+                // Check whether there are any registered recipients
                 if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
                 {
-                    return;
+                    return message;
                 }
 
                 // Count the total number of recipients (including with different tokens)
@@ -333,7 +329,11 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
                     i += pair.Value.Count;
                 }
 
-                // Rent the array to copy handlers to
+                // We need to make a local copy of the currently registered handlers,
+                // since users might try to unregister (or register) new handlers from
+                // inside one of the currently existing handlers. We can use memory pooling
+                // to reuse arrays, to minimize the average memory usage. In practice,
+                // we usually just need to pay the small overhead of copying the items.
                 entries = ArrayPool<Action<TMessage>>.Shared.Rent(i);
 
                 // Copy the handlers to the local collection.
@@ -367,11 +367,15 @@ public void Send<TMessage, TToken>(TMessage message, TToken token)
             }
             finally
             {
-                // Remove references to avoid leaks coming from the shader memory pool
+                // Remove references to avoid leaks coming from the shader memory pool.
+                // We manually create a span and clear it as a small optimization, as
+                // arrays rented from the pool can be larger than the requested size.
                 entries.AsSpan(0, i).Clear();
 
                 ArrayPool<Action<TMessage>>.Shared.Return(entries);
             }
+
+            return message;
         }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
index 282a21a86cd..768b660c18f 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
@@ -85,10 +85,11 @@ public static TMessage Send<TMessage>(this IMessenger messenger)
         /// <typeparam name="TMessage">The type of message to send.</typeparam>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send the message.</param>
         /// <param name="message">The message to send.</param>
-        public static void Send<TMessage>(this IMessenger messenger, TMessage message)
+        /// <returns>The message that was sent (ie. <paramref name="message"/>).</returns>
+        public static TMessage Send<TMessage>(this IMessenger messenger, TMessage message)
             where TMessage : class
         {
-            messenger.Send(message, default(Unit));
+            return messenger.Send(message, default(Unit));
         }
 
         /// <summary>

From c6b4cb652de8a563c0a727d43ff11f344655624e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 5 Jun 2020 21:46:41 +0200
Subject: [PATCH 155/595] Minor bug fix

---
 Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index 5a98aa6e8c9..11ad5ba5853 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -69,6 +69,12 @@ public void NotifyCanExecuteChanged()
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool CanExecute(T parameter)
+        {
+            return this.canExecute?.Invoke(parameter) != false;
+        }
+
+        /// <inheritdoc/>
+        public bool CanExecute(object? parameter)
         {
             if (typeof(T).IsValueType &&
                 parameter is null &&
@@ -77,12 +83,6 @@ parameter is null &&
                 return true;
             }
 
-            return this.canExecute?.Invoke(parameter) != false;
-        }
-
-        /// <inheritdoc/>
-        public bool CanExecute(object? parameter)
-        {
             return CanExecute((T)parameter!);
         }
 

From f288704f77224dd8d427d7cb0a36c24d0909283b Mon Sep 17 00:00:00 2001
From: Riza Marhaban <riza.marhaban@hotmail.com>
Date: Wed, 10 Jun 2020 07:54:40 +0800
Subject: [PATCH 156/595] fixes for case adding data at the end of the textbox

---
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index aa06c2fd5da..046a6d68b7a 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -300,7 +300,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
             // case adding data at the end of the textbox
             if (oldSelectionStart >= oldText.Length && !isDeleteOrBackspace)
             {
-                textbox.Text = oldText;
+                textbox.Text = textbox.Text.Substring(0, oldText.Length);
                 if (oldText.Length >= 0)
                 {
                     textbox.SelectionStart = oldText.Length;

From 4ea26c504c6601e60389c0f1d2137d4396d56037 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 20:42:13 +0200
Subject: [PATCH 157/595] Added missing attributes/annotations

---
 .../Enumerables/ReadOnlySpanEnumerable{T}.cs                | 6 ++++--
 .../Enumerables/ReadOnlySpanTokenizer{T}.cs                 | 6 ++++--
 .../Enumerables/SpanEnumerable{T}.cs                        | 6 ++++--
 .../Enumerables/SpanTokenizer{T}.cs                         | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
index 29d42924536..c732861d670 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -42,8 +43,9 @@ public ReadOnlySpanEnumerable(ReadOnlySpan<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanEnumerable{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanEnumerable<T> GetEnumerator() => this;
+        public readonly ReadOnlySpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -67,7 +69,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Item Current
+        public readonly Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
index 3977f5829f8..37bc6168f10 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -54,8 +55,9 @@ public ReadOnlySpanTokenizer(ReadOnlySpan<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanTokenizer{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanTokenizer<T> GetEnumerator() => this;
+        public readonly ReadOnlySpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -94,7 +96,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public ReadOnlySpan<T> Current
+        public readonly ReadOnlySpan<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
index 791f509339d..3648a5e5140 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -42,8 +43,9 @@ public SpanEnumerable(Span<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanEnumerable{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanEnumerable<T> GetEnumerator() => this;
+        public readonly SpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -67,7 +69,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Item Current
+        public readonly Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
index 953eb535f0b..da8a9dce040 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -54,8 +55,9 @@ public SpanTokenizer(Span<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanTokenizer{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanTokenizer<T> GetEnumerator() => this;
+        public readonly SpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -94,7 +96,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Span<T> Current
+        public readonly Span<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);

From ee8c71cba218e912e864fb014261c08607658125 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 20:46:32 +0200
Subject: [PATCH 158/595] Initial update on ThrowHelper visibility

---
 .../Generated/ThrowHelper.Collection.g.cs     | 178 +++++++++---------
 .../Generated/ThrowHelper.Collection.tt       |  24 +--
 .../ThrowHelper.Collection.Generic.cs         |   8 +-
 .../ThrowHelper.Comparable.Generic.cs         |  30 +--
 .../ThrowHelper.Comparable.Numeric.cs         |  18 +-
 .../Diagnostics/ThrowHelper.IO.cs             |  10 +-
 .../Diagnostics/ThrowHelper.String.cs         |  38 ++--
 .../Diagnostics/ThrowHelper.Tasks.cs          |  22 +--
 .../ThrowHelper.ThrowExceptions.cs            |   8 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs  |  38 ++--
 10 files changed, 187 insertions(+), 187 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
index b0df73a80e3..d104090bb41 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
@@ -18,14 +18,14 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
         }
@@ -35,7 +35,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -45,7 +45,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -55,7 +55,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -65,7 +65,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -75,7 +75,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -85,7 +85,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -95,7 +95,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -105,7 +105,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Sp
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -115,7 +115,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -125,7 +125,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -135,7 +135,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
         }
@@ -145,7 +145,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, str
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -155,7 +155,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> sp
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -165,7 +165,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -175,7 +175,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -185,7 +185,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -195,7 +195,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
         }
@@ -205,7 +205,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnly
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -215,7 +215,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> so
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -225,7 +225,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnly
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -235,7 +235,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -245,7 +245,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
         }
@@ -255,7 +255,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -265,7 +265,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -275,7 +275,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -285,7 +285,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memo
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -295,7 +295,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -305,7 +305,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -315,7 +315,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -325,7 +325,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -335,7 +335,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -345,7 +345,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -355,7 +355,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
         }
@@ -365,7 +365,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -375,7 +375,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -385,7 +385,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -395,7 +395,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -405,7 +405,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -415,7 +415,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
         }
@@ -425,7 +425,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnly
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -435,7 +435,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -445,7 +445,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnly
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -455,7 +455,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -465,7 +465,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must be empty, had a size of {array.Length.ToAssertString()}");
         }
@@ -475,7 +475,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -485,7 +485,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int siz
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size not equal to {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -495,7 +495,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size over {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -505,7 +505,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size of at least {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -515,7 +515,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] a
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -525,7 +525,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int si
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {size}, had a size of {array.Length.ToAssertString()}");
         }
@@ -535,7 +535,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] arra
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -545,7 +545,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] de
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -555,7 +555,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] sour
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {array.Length.ToAssertString()} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -565,7 +565,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {array.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -575,7 +575,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must be empty, had a size of {list.Count.ToAssertString()}");
         }
@@ -585,7 +585,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -595,7 +595,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -605,7 +605,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size over {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -615,7 +615,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size of at least {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -625,7 +625,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -635,7 +635,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {list.Count.ToAssertString()}");
         }
@@ -645,7 +645,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -655,7 +655,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, Li
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -665,7 +665,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {list.Count.ToAssertString()} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -675,7 +675,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {list.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -685,7 +685,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
         }
@@ -695,7 +695,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -705,7 +705,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> col
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -715,7 +715,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -725,7 +725,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -735,7 +735,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IColl
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -745,7 +745,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> co
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -755,7 +755,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -765,7 +765,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> sou
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -775,7 +775,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -785,7 +785,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -795,7 +795,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int ind
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> collection, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
         }
@@ -805,7 +805,7 @@ public static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> co
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -815,7 +815,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollectio
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -825,7 +825,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollec
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -835,7 +835,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyColle
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -845,7 +845,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IRead
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -855,7 +855,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollecti
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
         }
@@ -865,7 +865,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnl
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -875,7 +875,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollectio
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
         }
@@ -885,7 +885,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnl
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -895,7 +895,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
index 98d72977851..2c64db2769d 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
@@ -15,7 +15,7 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
 <#
 GenerateTextForItems(EnumerableTypes, item =>
@@ -26,7 +26,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must be empty, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -36,7 +36,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -46,7 +46,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size not equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -56,7 +56,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size over {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -66,7 +66,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size of at least {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -76,7 +76,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -86,7 +86,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
         }
@@ -96,7 +96,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
         }
@@ -106,7 +106,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
         }
@@ -116,7 +116,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
         }
@@ -126,7 +126,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
index db4b4037756..64553be2387 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEmpty{T}(Span{T},string)"/> fails.
@@ -23,7 +23,7 @@ internal static partial class ThrowHelper
         /// <remarks>This method is needed because <see cref="Span{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
+        internal static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must not be empty");
         }
@@ -35,7 +35,7 @@ public static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         /// <remarks>This method is needed because <see cref="ReadOnlySpan{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string name)
+        internal static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must not be empty");
         }
@@ -46,7 +46,7 @@ public static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string
         /// <typeparam name="T">The item of items in the input collection.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotEmpty<T>(string name)
+        internal static void ThrowArgumentExceptionForIsNotEmpty<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be empty");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
index b2dd7d2e4c6..ecf172241e4 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsDefault{T}"/> fails.
@@ -22,7 +22,7 @@ internal static partial class ThrowHelper
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
+        internal static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
             where T : struct
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be the default value {default(T).ToAssertString()}, was {value.ToAssertString()}");
@@ -34,7 +34,7 @@ public static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
+        internal static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
             where T : struct
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be the default value {default(T).ToAssertString()}");
@@ -46,7 +46,7 @@ public static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, string name)
+        internal static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -57,7 +57,7 @@ public static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, stri
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, string name)
+        internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -68,7 +68,7 @@ public static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, s
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -79,7 +79,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T m
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than or equal to {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -90,7 +90,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T v
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than {minimum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -101,7 +101,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than or equal to {minimum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -112,7 +112,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -123,7 +123,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T mi
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -134,7 +134,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -145,7 +145,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T mi
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -156,7 +156,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
@@ -167,7 +167,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T va
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
index d3a2171f6a1..fef5019e6e6 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
@@ -14,14 +14,14 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(int,int,uint,string)"/> fails.
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uint delta, string name)
+        internal static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
         }
@@ -31,7 +31,7 @@ public static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target, uint delta, string name)
+        internal static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
         }
@@ -41,7 +41,7 @@ public static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCloseTo(long value, long target, ulong delta, string name)
+        internal static void ThrowArgumentExceptionForIsCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
         }
@@ -51,7 +51,7 @@ public static void ThrowArgumentExceptionForIsCloseTo(long value, long target, u
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target, ulong delta, string name)
+        internal static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
         }
@@ -61,7 +61,7 @@ public static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCloseTo(float value, float target, float delta, string name)
+        internal static void ThrowArgumentExceptionForIsCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
         }
@@ -71,7 +71,7 @@ public static void ThrowArgumentExceptionForIsCloseTo(float value, float target,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCloseTo(float value, float target, float delta, string name)
+        internal static void ThrowArgumentExceptionForIsNotCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
         }
@@ -81,7 +81,7 @@ public static void ThrowArgumentExceptionForIsNotCloseTo(float value, float targ
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCloseTo(double value, double target, double delta, string name)
+        internal static void ThrowArgumentExceptionForIsCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
         }
@@ -91,7 +91,7 @@ public static void ThrowArgumentExceptionForIsCloseTo(double value, double targe
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCloseTo(double value, double target, double delta, string name)
+        internal static void ThrowArgumentExceptionForIsNotCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
index a4f750b9b3e..b8cfebe6b6e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
@@ -15,14 +15,14 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.CanRead"/> fails.
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
+        internal static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support reading");
         }
@@ -32,7 +32,7 @@ public static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
+        internal static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support writing");
         }
@@ -42,7 +42,7 @@ public static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
+        internal static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support seeking");
         }
@@ -52,7 +52,7 @@ public static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsAtStartPosition(Stream stream, string name)
+        internal static void ThrowArgumentExceptionForIsAtStartPosition(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) must be at position {0.ToAssertString()}, was at {stream.Position.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
index d986ebb67dd..cccc21f6421 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
@@ -13,14 +13,14 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNullOrEmpty"/> fails.
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or empty, was {text.ToAssertString()}");
         }
@@ -30,7 +30,7 @@ public static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or empty, was {(text is null ? "null" : "empty")}");
         }
@@ -40,7 +40,7 @@ public static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or whitespace, was {text.ToAssertString()}");
         }
@@ -50,7 +50,7 @@ public static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, str
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or whitespace, was {(text is null ? "null" : "whitespace")}");
         }
@@ -60,7 +60,7 @@ public static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsEmpty(string text, string name)
+        internal static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be empty, was {text.ToAssertString()}");
         }
@@ -70,7 +70,7 @@ public static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
+        internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be empty");
         }
@@ -80,7 +80,7 @@ public static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsWhitespace(string text, string name)
+        internal static void ThrowArgumentExceptionForIsWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be whitespace, was {text.ToAssertString()}");
         }
@@ -90,7 +90,7 @@ public static void ThrowArgumentExceptionForIsWhitespace(string text, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotWhitespace(string text, string name)
+        internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be whitespace, was {text.ToAssertString()}");
         }
@@ -100,7 +100,7 @@ public static void ThrowArgumentExceptionForIsNotWhitespace(string text, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
         }
@@ -110,7 +110,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not have a size equal to {size}, was {text.ToAssertString()}");
         }
@@ -120,7 +120,7 @@ public static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size over {size}, had a size of {text.Length} and was {text.ToAssertString()}");
         }
@@ -130,7 +130,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size of at least {size}, had a size of {text.Length} and was {text.ToAssertString()}");
         }
@@ -140,7 +140,7 @@ public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string t
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThan(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than {size}, had a size of {text.Length} and was {text.ToAssertString()}");
         }
@@ -150,7 +150,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThan(string text, int siz
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text, int size, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than or equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
         }
@@ -160,7 +160,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -170,7 +170,7 @@ public static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string source, string destination, string name)
+        internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
         }
@@ -180,7 +180,7 @@ public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string sour
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {text.Length.ToAssertString()} to be a valid index for the target string, was {index.ToAssertString()}");
         }
@@ -190,7 +190,7 @@ public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, st
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
+        internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {text.Length.ToAssertString()} to be an invalid index for the target string, was {index.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
index f25af5139d6..2689a32cec2 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
@@ -15,14 +15,14 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCompleted"/> fails.
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed, had status {task.Status.ToAssertString()}");
         }
@@ -32,7 +32,7 @@ public static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCompleted(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsNotCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed, had status {task.Status.ToAssertString()}");
         }
@@ -42,7 +42,7 @@ public static void ThrowArgumentExceptionForIsNotCompleted(Task task, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed successfully, had status {task.Status.ToAssertString()}");
         }
@@ -52,7 +52,7 @@ public static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed successfully, had status {task.Status.ToAssertString()}");
         }
@@ -62,7 +62,7 @@ public static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be faulted, had status {task.Status.ToAssertString()}");
         }
@@ -72,7 +72,7 @@ public static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be faulted, had status {task.Status.ToAssertString()}");
         }
@@ -82,7 +82,7 @@ public static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be canceled, had status {task.Status.ToAssertString()}");
         }
@@ -92,7 +92,7 @@ public static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name)
+        internal static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be canceled, had status {task.Status.ToAssertString()}");
         }
@@ -102,7 +102,7 @@ public static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStatus status, string name)
+        internal static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must have status {status}, had status {task.Status.ToAssertString()}");
         }
@@ -112,7 +112,7 @@ public static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStat
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForHasStatusNotEqualTo(Task task, TaskStatus status, string name)
+        internal static void ThrowArgumentExceptionForHasStatusNotEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not have status {status.ToAssertString()}");
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 705f10fad4a..d3c15e79ace 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Returns a formatted representation of the input value.
@@ -38,7 +38,7 @@ private static string ToAssertString(this object? obj)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with <paramref name="message"/> and <paramref name="name"/>.</exception>
         [DoesNotReturn]
-        private static void ThrowArgumentException(string name, string message)
+        internal static void ThrowArgumentException(string name, string message)
         {
             throw new ArgumentException(message, name);
         }
@@ -50,7 +50,7 @@ private static void ThrowArgumentException(string name, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentNullException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
         [DoesNotReturn]
-        private static void ThrowArgumentNullException(string name, string message)
+        internal static void ThrowArgumentNullException(string name, string message)
         {
             throw new ArgumentNullException(name, message);
         }
@@ -62,7 +62,7 @@ private static void ThrowArgumentNullException(string name, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
         [DoesNotReturn]
-        private static void ThrowArgumentOutOfRangeException(string name, string message)
+        internal static void ThrowArgumentOutOfRangeException(string name, string message)
         {
             throw new ArgumentOutOfRangeException(name, message);
         }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index aad8c57b9f0..d95e2320274 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Toolkit.Diagnostics
     /// <summary>
     /// Helper methods to throw exceptions
     /// </summary>
-    internal static partial class ThrowHelper
+    public static partial class ThrowHelper
     {
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="class"/>) fails.
@@ -22,7 +22,7 @@ internal static partial class ThrowHelper
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
+        internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
             where T : class
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be null, was {value.ToAssertString()} ({value.GetType().ToTypeString()})");
@@ -34,7 +34,7 @@ public static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
+        internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
             where T : struct
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T?).ToTypeString()}) must be null, was {value.ToAssertString()} ({typeof(T).ToTypeString()})");
@@ -46,7 +46,7 @@ public static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
+        internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         {
             ThrowArgumentNullException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be not null)");
         }
@@ -57,7 +57,7 @@ public static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
+        internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -68,7 +68,7 @@ public static void ThrowArgumentExceptionForIsOfType<T>(object value, string nam
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
+        internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -78,7 +78,7 @@ public static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
+        internal static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -88,7 +88,7 @@ public static void ThrowArgumentExceptionForIsOfType(object value, Type type, st
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
+        internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -99,7 +99,7 @@ public static void ThrowArgumentExceptionForIsNotOfType(object value, Type type,
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
+        internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -110,7 +110,7 @@ public static void ThrowArgumentExceptionForIsAssignableToType<T>(object value,
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
+        internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -120,7 +120,7 @@ public static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object valu
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
+        internal static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -130,7 +130,7 @@ public static void ThrowArgumentExceptionForIsAssignableToType(object value, Typ
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
+        internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
@@ -141,7 +141,7 @@ public static void ThrowArgumentExceptionForIsNotAssignableToType(object value,
         /// <typeparam name="T">The type of input values being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
+        internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
             where T : unmanaged
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");
@@ -153,7 +153,7 @@ public static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
+        internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
             where T : class
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be the same instance as the target object");
@@ -165,7 +165,7 @@ public static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
+        internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
             where T : class
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be the same instance as the target object");
@@ -176,7 +176,7 @@ public static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsTrue(string name)
+        internal static void ThrowArgumentExceptionForIsTrue(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false");
         }
@@ -186,7 +186,7 @@ public static void ThrowArgumentExceptionForIsTrue(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsTrue(string name, string message)
+        internal static void ThrowArgumentExceptionForIsTrue(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false: {message.ToAssertString()}");
         }
@@ -196,7 +196,7 @@ public static void ThrowArgumentExceptionForIsTrue(string name, string message)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsFalse(string name)
+        internal static void ThrowArgumentExceptionForIsFalse(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true");
         }
@@ -206,7 +206,7 @@ public static void ThrowArgumentExceptionForIsFalse(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForIsFalse(string name, string message)
+        internal static void ThrowArgumentExceptionForIsFalse(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true: {message.ToAssertString()}");
         }

From a90acfc8f80b7f163df6f45a01445a5fe301051b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 20:54:51 +0200
Subject: [PATCH 159/595] Improved construction of
 ArgumentOutOfRangeException-s

---
 .../Generated/ThrowHelper.Collection.g.cs     | 32 +++++++++----------
 .../Generated/ThrowHelper.Collection.tt       |  4 +--
 .../ThrowHelper.Comparable.Generic.cs         | 20 ++++++------
 .../Diagnostics/ThrowHelper.String.cs         |  4 +--
 .../ThrowHelper.ThrowExceptions.cs            |  5 +--
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
index d104090bb41..8c9026be221 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
@@ -117,7 +117,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -127,7 +127,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -227,7 +227,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -237,7 +237,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -337,7 +337,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -347,7 +347,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -447,7 +447,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -457,7 +457,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -557,7 +557,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] so
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {array.Length.ToAssertString()} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {array.Length.ToAssertString()} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -567,7 +567,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {array.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {array.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -667,7 +667,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {list.Count.ToAssertString()} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {list.Count.ToAssertString()} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -677,7 +677,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {list.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {list.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -777,7 +777,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IColle
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -787,7 +787,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -887,7 +887,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadO
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -897,7 +897,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
         }
     }
 }
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
index 2c64db2769d..c52adafacda 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
@@ -118,7 +118,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -128,7 +128,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
         }
 <#
 });
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
index ecf172241e4..aa45dc82702 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
@@ -70,7 +70,7 @@ internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target,
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -81,7 +81,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than or equal to {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than or equal to {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than {minimum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than {minimum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -103,7 +103,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than or equal to {minimum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than or equal to {minimum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -136,7 +136,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value,
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -158,7 +158,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value,
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
 
         /// <summary>
@@ -169,7 +169,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
         }
     }
 }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
index cccc21f6421..8de060c0b1e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
@@ -182,7 +182,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string so
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {text.Length.ToAssertString()} to be a valid index for the target string, was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {text.Length.ToAssertString()} to be a valid index for the target string, was {index.ToAssertString()}");
         }
 
         /// <summary>
@@ -192,7 +192,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index,
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
         {
-            ThrowArgumentOutOfRangeException(name, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {text.Length.ToAssertString()} to be an invalid index for the target string, was {index.ToAssertString()}");
+            ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {text.Length.ToAssertString()} to be an invalid index for the target string, was {index.ToAssertString()}");
         }
     }
 }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index d3c15e79ace..733cb1699a1 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -59,12 +59,13 @@ internal static void ThrowArgumentNullException(string name, string message)
         /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
         /// </summary>
         /// <param name="name">The argument name.</param>
+        /// <param name="value">The current argument value.</param>
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentOutOfRangeException(string name, string message)
+        internal static void ThrowArgumentOutOfRangeException(string name, object value, string message)
         {
-            throw new ArgumentOutOfRangeException(name, message);
+            throw new ArgumentOutOfRangeException(name, value, message);
         }
     }
 }

From b63b34b8f73605cf956c9cec5a5f631122f3b64f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 21:54:05 +0200
Subject: [PATCH 160/595] Made current thrower public, minor API additions

---
 .../ThrowHelper.ThrowExceptions.cs            | 64 +++++++++++++++++--
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 733cb1699a1..f252704e67b 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -31,6 +31,28 @@ private static string ToAssertString(this object? obj)
             };
         }
 
+        /// <summary>
+        /// Throws a new <see cref="AccessViolationException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="AccessViolationException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowAccessViolationException(string message)
+        {
+            throw new AccessViolationException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string message)
+        {
+            throw new ArgumentException(message);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentException"/>.
         /// </summary>
@@ -38,11 +60,22 @@ private static string ToAssertString(this object? obj)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with <paramref name="message"/> and <paramref name="name"/>.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentException(string name, string message)
+        public static void ThrowArgumentException(string name, string message)
         {
             throw new ArgumentException(message, name);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="ArgumentNullException">Thrown with <paramref name="name"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentNullException(string name)
+        {
+            throw new ArgumentNullException(name);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentNullException"/>.
         /// </summary>
@@ -50,7 +83,7 @@ internal static void ThrowArgumentException(string name, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentNullException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentNullException(string name, string message)
+        public static void ThrowArgumentNullException(string name, string message)
         {
             throw new ArgumentNullException(name, message);
         }
@@ -59,11 +92,34 @@ internal static void ThrowArgumentNullException(string name, string message)
         /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
         /// </summary>
         /// <param name="name">The argument name.</param>
-        /// <param name="value">The current argument value.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name)
+        {
+            throw new ArgumentOutOfRangeException(name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentOutOfRangeException(string name, object value, string message)
+        public static void ThrowArgumentOutOfRangeException(string name, string message)
+        {
+            throw new ArgumentOutOfRangeException(name, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="value">The current argument value.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/>, <paramref name="value"/> and <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
         {
             throw new ArgumentOutOfRangeException(name, value, message);
         }

From 33b83ab677eb114fe11880dc09dd7598fb9fc965 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 22:07:28 +0200
Subject: [PATCH 161/595] Added more throw helper APIs

---
 .../ThrowHelper.ThrowExceptions.cs            | 269 ++++++++++++++++--
 1 file changed, 253 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index f252704e67b..d0dd0a3ed75 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Threading;
 
 #nullable enable
 
@@ -15,22 +16,6 @@ namespace Microsoft.Toolkit.Diagnostics
     /// </summary>
     public static partial class ThrowHelper
     {
-        /// <summary>
-        /// Returns a formatted representation of the input value.
-        /// </summary>
-        /// <param name="obj">The input <see cref="object"/> to format.</param>
-        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
-        [Pure]
-        private static string ToAssertString(this object? obj)
-        {
-            return obj switch
-            {
-                string _ => $"\"{obj}\"",
-                null => "null",
-                _ => $"<{obj}>"
-            };
-        }
-
         /// <summary>
         /// Throws a new <see cref="AccessViolationException"/>.
         /// </summary>
@@ -123,5 +108,257 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
         {
             throw new ArgumentOutOfRangeException(name, value, message);
         }
+
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="FormatException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowFormatException(string message)
+        {
+            throw new FormatException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="IndexOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="IndexOutOfRangeException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowIndexOutOfRangeException(string message)
+        {
+            throw new IndexOutOfRangeException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowInsufficientMemoryException(string message)
+        {
+            throw new InsufficientMemoryException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidOperationException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidOperationException(string message)
+        {
+            throw new InvalidOperationException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingFieldException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string message)
+        {
+            throw new MissingFieldException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="fieldName">The target field being retrieved.</param>
+        /// <exception cref="MissingFieldException">Thrown with <paramref name="className"/> and <paramref name="fieldName"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string className, string fieldName)
+        {
+            throw new MissingFieldException(className, fieldName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMemberException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string message)
+        {
+            throw new MissingMemberException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="memberName">The target member being retrieved.</param>
+        /// <exception cref="MissingMemberException">Thrown with <paramref name="className"/> and <paramref name="memberName"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string className, string memberName)
+        {
+            throw new MissingMemberException(className, memberName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMethodException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string message)
+        {
+            throw new MissingMethodException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="methodName">The target method being retrieved.</param>
+        /// <exception cref="MissingMethodException">Thrown with <paramref name="className"/> and <paramref name="methodName"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string className, string methodName)
+        {
+            throw new MissingMethodException(className, methodName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="NotSupportedException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowNotSupportedException(string message)
+        {
+            throw new NotSupportedException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="NullReferenceException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="NullReferenceException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowNullReferenceException(string message)
+        {
+            throw new NullReferenceException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="objectName"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowObjectDisposedException(string objectName)
+        {
+            throw new ObjectDisposedException(objectName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="objectName"/> and <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowObjectDisposedException(string objectName, string message)
+        {
+            throw new ObjectDisposedException(objectName, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="OperationCanceledException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowOperationCanceledException(string message)
+        {
+            throw new OperationCanceledException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with <paramref name="token"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowOperationCanceledException(CancellationToken token)
+        {
+            throw new OperationCanceledException(token);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="message"/> and <paramref name="token"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowThrowOperationCanceledException(string message, CancellationToken token)
+        {
+            throw new OperationCanceledException(message, token);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OutOfMemoryException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="OutOfMemoryException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowOutOfMemoryException(string message)
+        {
+            throw new OutOfMemoryException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowPlatformNotSupportedException(string message)
+        {
+            throw new PlatformNotSupportedException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="TimeoutException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="TimeoutException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowTimeoutException(string message)
+        {
+            throw new TimeoutException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with <paramref name="message"/>.</exception>
+        [DoesNotReturn]
+        public static void ThrowUnauthorizedAccessException(string message)
+        {
+            throw new UnauthorizedAccessException(message);
+        }
+
+        /// <summary>
+        /// Returns a formatted representation of the input value.
+        /// </summary>
+        /// <param name="obj">The input <see cref="object"/> to format.</param>
+        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
+        [Pure]
+        private static string ToAssertString(this object? obj)
+        {
+            return obj switch
+            {
+                string _ => $"\"{obj}\"",
+                null => "null",
+                _ => $"<{obj}>"
+            };
+        }
     }
 }

From 480b8609933e71cc363a0df58fbdcba1fb12d895 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 14 Jun 2020 22:19:01 +0200
Subject: [PATCH 162/595] Removed some throw helpers according to docs

See https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/using-standard-exception-types
---
 .../ThrowHelper.ThrowExceptions.cs            | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index d0dd0a3ed75..765f6f555a7 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -16,17 +16,6 @@ namespace Microsoft.Toolkit.Diagnostics
     /// </summary>
     public static partial class ThrowHelper
     {
-        /// <summary>
-        /// Throws a new <see cref="AccessViolationException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="AccessViolationException">Thrown with <paramref name="message"/>.</exception>
-        [DoesNotReturn]
-        public static void ThrowAccessViolationException(string message)
-        {
-            throw new AccessViolationException(message);
-        }
-
         /// <summary>
         /// Throws a new <see cref="ArgumentException"/>.
         /// </summary>
@@ -120,17 +109,6 @@ public static void ThrowFormatException(string message)
             throw new FormatException(message);
         }
 
-        /// <summary>
-        /// Throws a new <see cref="IndexOutOfRangeException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="IndexOutOfRangeException">Thrown with <paramref name="message"/>.</exception>
-        [DoesNotReturn]
-        public static void ThrowIndexOutOfRangeException(string message)
-        {
-            throw new IndexOutOfRangeException(message);
-        }
-
         /// <summary>
         /// Throws a new <see cref="InsufficientMemoryException"/>.
         /// </summary>
@@ -233,17 +211,6 @@ public static void ThrowNotSupportedException(string message)
             throw new NotSupportedException(message);
         }
 
-        /// <summary>
-        /// Throws a new <see cref="NullReferenceException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="NullReferenceException">Thrown with <paramref name="message"/>.</exception>
-        [DoesNotReturn]
-        public static void ThrowNullReferenceException(string message)
-        {
-            throw new NullReferenceException(message);
-        }
-
         /// <summary>
         /// Throws a new <see cref="ObjectDisposedException"/>.
         /// </summary>
@@ -301,17 +268,6 @@ public static void ThrowThrowOperationCanceledException(string message, Cancella
             throw new OperationCanceledException(message, token);
         }
 
-        /// <summary>
-        /// Throws a new <see cref="OutOfMemoryException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="OutOfMemoryException">Thrown with <paramref name="message"/>.</exception>
-        [DoesNotReturn]
-        public static void ThrowOutOfMemoryException(string message)
-        {
-            throw new OutOfMemoryException(message);
-        }
-
         /// <summary>
         /// Throws a new <see cref="PlatformNotSupportedException"/>.
         /// </summary>

From c9a9360625e594bb8b236a1424ffd785614c78b0 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 15 Jun 2020 02:29:21 +0200
Subject: [PATCH 163/595] Simplified XML docs

---
 .../ThrowHelper.ThrowExceptions.cs            | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 765f6f555a7..5f2915dad6d 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -20,7 +20,7 @@ public static partial class ThrowHelper
         /// Throws a new <see cref="ArgumentException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentException(string message)
         {
@@ -32,7 +32,7 @@ public static void ThrowArgumentException(string message)
         /// </summary>
         /// <param name="name">The argument name.</param>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentException">Thrown with <paramref name="message"/> and <paramref name="name"/>.</exception>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentException(string name, string message)
         {
@@ -43,7 +43,7 @@ public static void ThrowArgumentException(string name, string message)
         /// Throws a new <see cref="ArgumentNullException"/>.
         /// </summary>
         /// <param name="name">The argument name.</param>
-        /// <exception cref="ArgumentNullException">Thrown with <paramref name="name"/>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentNullException(string name)
         {
@@ -55,7 +55,7 @@ public static void ThrowArgumentNullException(string name)
         /// </summary>
         /// <param name="name">The argument name.</param>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentNullException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentNullException(string name, string message)
         {
@@ -66,7 +66,7 @@ public static void ThrowArgumentNullException(string name, string message)
         /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
         /// </summary>
         /// <param name="name">The argument name.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentOutOfRangeException(string name)
         {
@@ -78,7 +78,7 @@ public static void ThrowArgumentOutOfRangeException(string name)
         /// </summary>
         /// <param name="name">The argument name.</param>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/> and <paramref name="message"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentOutOfRangeException(string name, string message)
         {
@@ -91,7 +91,7 @@ public static void ThrowArgumentOutOfRangeException(string name, string message)
         /// <param name="name">The argument name.</param>
         /// <param name="value">The current argument value.</param>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with <paramref name="name"/>, <paramref name="value"/> and <paramref name="message"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
         {
@@ -102,7 +102,7 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
         /// Throws a new <see cref="FormatException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="FormatException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowFormatException(string message)
         {
@@ -113,7 +113,7 @@ public static void ThrowFormatException(string message)
         /// Throws a new <see cref="InsufficientMemoryException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="InsufficientMemoryException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowInsufficientMemoryException(string message)
         {
@@ -124,7 +124,7 @@ public static void ThrowInsufficientMemoryException(string message)
         /// Throws a new <see cref="InvalidOperationException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="InvalidOperationException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowInvalidOperationException(string message)
         {
@@ -135,7 +135,7 @@ public static void ThrowInvalidOperationException(string message)
         /// Throws a new <see cref="MissingFieldException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingFieldException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowMissingFieldException(string message)
         {
@@ -147,7 +147,7 @@ public static void ThrowMissingFieldException(string message)
         /// </summary>
         /// <param name="className">The target class being inspected.</param>
         /// <param name="fieldName">The target field being retrieved.</param>
-        /// <exception cref="MissingFieldException">Thrown with <paramref name="className"/> and <paramref name="fieldName"/>.</exception>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowMissingFieldException(string className, string fieldName)
         {
@@ -158,7 +158,7 @@ public static void ThrowMissingFieldException(string className, string fieldName
         /// Throws a new <see cref="MissingMemberException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingMemberException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowMissingMemberException(string message)
         {
@@ -170,7 +170,7 @@ public static void ThrowMissingMemberException(string message)
         /// </summary>
         /// <param name="className">The target class being inspected.</param>
         /// <param name="memberName">The target member being retrieved.</param>
-        /// <exception cref="MissingMemberException">Thrown with <paramref name="className"/> and <paramref name="memberName"/>.</exception>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowMissingMemberException(string className, string memberName)
         {
@@ -181,7 +181,7 @@ public static void ThrowMissingMemberException(string className, string memberNa
         /// Throws a new <see cref="MissingMethodException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingMethodException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowMissingMethodException(string message)
         {
@@ -193,7 +193,7 @@ public static void ThrowMissingMethodException(string message)
         /// </summary>
         /// <param name="className">The target class being inspected.</param>
         /// <param name="methodName">The target method being retrieved.</param>
-        /// <exception cref="MissingMethodException">Thrown with <paramref name="className"/> and <paramref name="methodName"/>.</exception>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowMissingMethodException(string className, string methodName)
         {
@@ -204,7 +204,7 @@ public static void ThrowMissingMethodException(string className, string methodNa
         /// Throws a new <see cref="NotSupportedException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="NotSupportedException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowNotSupportedException(string message)
         {
@@ -215,7 +215,7 @@ public static void ThrowNotSupportedException(string message)
         /// Throws a new <see cref="ObjectDisposedException"/>.
         /// </summary>
         /// <param name="objectName">The name of the disposed object.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="objectName"/>.</exception>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowObjectDisposedException(string objectName)
         {
@@ -227,7 +227,7 @@ public static void ThrowObjectDisposedException(string objectName)
         /// </summary>
         /// <param name="objectName">The name of the disposed object.</param>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="objectName"/> and <paramref name="message"/>.</exception>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowObjectDisposedException(string objectName, string message)
         {
@@ -238,7 +238,7 @@ public static void ThrowObjectDisposedException(string objectName, string messag
         /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="OperationCanceledException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowOperationCanceledException(string message)
         {
@@ -249,7 +249,7 @@ public static void ThrowOperationCanceledException(string message)
         /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
-        /// <exception cref="OperationCanceledException">Thrown with <paramref name="token"/>.</exception>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowOperationCanceledException(CancellationToken token)
         {
@@ -257,11 +257,11 @@ public static void ThrowOperationCanceledException(CancellationToken token)
         }
 
         /// <summary>
-        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with <paramref name="message"/> and <paramref name="token"/>.</exception>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
         public static void ThrowThrowOperationCanceledException(string message, CancellationToken token)
         {
@@ -272,7 +272,7 @@ public static void ThrowThrowOperationCanceledException(string message, Cancella
         /// Throws a new <see cref="PlatformNotSupportedException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="PlatformNotSupportedException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowPlatformNotSupportedException(string message)
         {
@@ -283,7 +283,7 @@ public static void ThrowPlatformNotSupportedException(string message)
         /// Throws a new <see cref="TimeoutException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="TimeoutException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowTimeoutException(string message)
         {
@@ -294,7 +294,7 @@ public static void ThrowTimeoutException(string message)
         /// Throws a new <see cref="UnauthorizedAccessException"/>.
         /// </summary>
         /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="UnauthorizedAccessException">Thrown with <paramref name="message"/>.</exception>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
         public static void ThrowUnauthorizedAccessException(string message)
         {

From 0172ae5d674dc5b25982a7b05f98ef1565e36482 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 15 Jun 2020 02:44:17 +0200
Subject: [PATCH 164/595] Added overloads with inner exception parameters

---
 .../ThrowHelper.ThrowExceptions.cs            | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 5f2915dad6d..4de7230b12e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -27,6 +27,18 @@ public static void ThrowArgumentException(string message)
             throw new ArgumentException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string message, Exception innerException)
+        {
+            throw new ArgumentException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentException"/>.
         /// </summary>
@@ -39,6 +51,19 @@ public static void ThrowArgumentException(string name, string message)
             throw new ArgumentException(message, name);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string name, string message, Exception innerException)
+        {
+            throw new ArgumentException(message, name, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentNullException"/>.
         /// </summary>
@@ -50,6 +75,18 @@ public static void ThrowArgumentNullException(string name)
             throw new ArgumentNullException(name);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentNullException(string name, Exception innerException)
+        {
+            throw new ArgumentNullException(name, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentNullException"/>.
         /// </summary>
@@ -73,6 +110,18 @@ public static void ThrowArgumentOutOfRangeException(string name)
             throw new ArgumentOutOfRangeException(name);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name, Exception innerException)
+        {
+            throw new ArgumentOutOfRangeException(name, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
         /// </summary>
@@ -109,6 +158,18 @@ public static void ThrowFormatException(string message)
             throw new FormatException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowFormatException(string message, Exception innerException)
+        {
+            throw new FormatException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="InsufficientMemoryException"/>.
         /// </summary>
@@ -120,6 +181,18 @@ public static void ThrowInsufficientMemoryException(string message)
             throw new InsufficientMemoryException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInsufficientMemoryException(string message, Exception innerException)
+        {
+            throw new InsufficientMemoryException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="InvalidOperationException"/>.
         /// </summary>
@@ -131,6 +204,18 @@ public static void ThrowInvalidOperationException(string message)
             throw new InvalidOperationException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidOperationException(string message, Exception innerException)
+        {
+            throw new InvalidOperationException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="MissingFieldException"/>.
         /// </summary>
@@ -142,6 +227,18 @@ public static void ThrowMissingFieldException(string message)
             throw new MissingFieldException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string message, Exception innerException)
+        {
+            throw new MissingFieldException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="MissingFieldException"/>.
         /// </summary>
@@ -165,6 +262,18 @@ public static void ThrowMissingMemberException(string message)
             throw new MissingMemberException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string message, Exception innerException)
+        {
+            throw new MissingMemberException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="MissingMemberException"/>.
         /// </summary>
@@ -188,6 +297,18 @@ public static void ThrowMissingMethodException(string message)
             throw new MissingMethodException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string message, Exception innerException)
+        {
+            throw new MissingMethodException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="MissingMethodException"/>.
         /// </summary>
@@ -211,6 +332,18 @@ public static void ThrowNotSupportedException(string message)
             throw new NotSupportedException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowNotSupportedException(string message, Exception innerException)
+        {
+            throw new NotSupportedException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ObjectDisposedException"/>.
         /// </summary>
@@ -222,6 +355,18 @@ public static void ThrowObjectDisposedException(string objectName)
             throw new ObjectDisposedException(objectName);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowObjectDisposedException(string objectName, Exception innerException)
+        {
+            throw new ObjectDisposedException(objectName, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ObjectDisposedException"/>.
         /// </summary>
@@ -245,6 +390,18 @@ public static void ThrowOperationCanceledException(string message)
             throw new OperationCanceledException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowOperationCanceledException(string message, Exception innerException)
+        {
+            throw new OperationCanceledException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
@@ -268,6 +425,19 @@ public static void ThrowThrowOperationCanceledException(string message, Cancella
             throw new OperationCanceledException(message, token);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
+        {
+            throw new OperationCanceledException(message, innerException, token);
+        }
+
         /// <summary>
         /// Throws a new <see cref="PlatformNotSupportedException"/>.
         /// </summary>
@@ -279,6 +449,18 @@ public static void ThrowPlatformNotSupportedException(string message)
             throw new PlatformNotSupportedException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowPlatformNotSupportedException(string message, Exception innerException)
+        {
+            throw new PlatformNotSupportedException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="TimeoutException"/>.
         /// </summary>
@@ -290,6 +472,18 @@ public static void ThrowTimeoutException(string message)
             throw new TimeoutException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="TimeoutException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowTimeoutException(string message, Exception innerException)
+        {
+            throw new TimeoutException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="UnauthorizedAccessException"/>.
         /// </summary>
@@ -301,6 +495,18 @@ public static void ThrowUnauthorizedAccessException(string message)
             throw new UnauthorizedAccessException(message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowUnauthorizedAccessException(string message, Exception innerException)
+        {
+            throw new UnauthorizedAccessException(message, innerException);
+        }
+
         /// <summary>
         /// Returns a formatted representation of the input value.
         /// </summary>

From 9031384f5de671b734ea7f2037435db33687f5cc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 15 Jun 2020 03:09:30 +0200
Subject: [PATCH 165/595] Added more exceptions

---
 .../ThrowHelper.ThrowExceptions.cs            | 157 +++++++++++++++++-
 1 file changed, 155 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 4de7230b12e..813c4f910f0 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -3,8 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 
 #nullable enable
@@ -147,6 +150,41 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
             throw new ArgumentOutOfRangeException(name, value, message);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message)
+        {
+            throw new ExternalException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message, Exception innerException)
+        {
+            throw new ExternalException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="error">The HRESULT of the errror to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message, int error)
+        {
+            throw new ExternalException(message, error);
+        }
+
         /// <summary>
         /// Throws a new <see cref="FormatException"/>.
         /// </summary>
@@ -193,6 +231,29 @@ public static void ThrowInsufficientMemoryException(string message, Exception in
             throw new InsufficientMemoryException(message, innerException);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidDataException(string message)
+        {
+            throw new InvalidDataException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidDataException(string message, Exception innerException)
+        {
+            throw new InvalidDataException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="InvalidOperationException"/>.
         /// </summary>
@@ -216,6 +277,29 @@ public static void ThrowInvalidOperationException(string message, Exception inne
             throw new InvalidOperationException(message, innerException);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowLockRecursionException(string message)
+        {
+            throw new LockRecursionException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowLockRecursionException(string message, Exception innerException)
+        {
+            throw new LockRecursionException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="MissingFieldException"/>.
         /// </summary>
@@ -420,7 +504,7 @@ public static void ThrowOperationCanceledException(CancellationToken token)
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        public static void ThrowThrowOperationCanceledException(string message, CancellationToken token)
+        public static void ThrowOperationCanceledException(string message, CancellationToken token)
         {
             throw new OperationCanceledException(message, token);
         }
@@ -433,7 +517,7 @@ public static void ThrowThrowOperationCanceledException(string message, Cancella
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        public static void ThrowThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
+        public static void ThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
         {
             throw new OperationCanceledException(message, innerException, token);
         }
@@ -461,6 +545,29 @@ public static void ThrowPlatformNotSupportedException(string message, Exception
             throw new PlatformNotSupportedException(message, innerException);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="SynchronizationLockException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowSynchronizationLockException(string message)
+        {
+            throw new SynchronizationLockException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="SynchronizationLockException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowSynchronizationLockException(string message, Exception innerException)
+        {
+            throw new SynchronizationLockException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="TimeoutException"/>.
         /// </summary>
@@ -507,6 +614,52 @@ public static void ThrowUnauthorizedAccessException(string message, Exception in
             throw new UnauthorizedAccessException(message, innerException);
         }
 
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowWin32Exception(int error)
+        {
+            throw new Win32Exception(error);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowWin32Exception(int error, string message)
+        {
+            throw new Win32Exception(error, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowWin32Exception(string message)
+        {
+            throw new Win32Exception(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowWin32Exception(string message, Exception innerException)
+        {
+            throw new Win32Exception(message, innerException);
+        }
+
         /// <summary>
         /// Returns a formatted representation of the input value.
         /// </summary>

From b464ce2dca78c122bb21cd4d8e99d7c972cd2f82 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 16:51:15 +0200
Subject: [PATCH 166/595] Removed unnecessary attributes, improved codegen

---
 Microsoft.Toolkit.HighPerformance/Box{T}.cs           |  1 -
 .../Buffers/ArrayPoolBufferWriter{T}.cs               |  5 -----
 .../Buffers/MemoryBufferWriter{T}.cs                  |  4 ----
 .../Buffers/MemoryOwner{T}.cs                         |  3 ---
 .../Enumerables/Array2DColumnEnumerable{T}.cs         |  1 -
 .../Enumerables/Array2DRowEnumerable{T}.cs            |  1 -
 .../Helpers/ParallelHelper.ThrowExceptions.cs         |  6 ------
 .../NullableReadOnlyRef{T}.cs                         |  1 -
 Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs   |  1 -
 .../Streams/MemoryStream.ThrowExceptions.cs           | 11 -----------
 10 files changed, 34 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Box{T}.cs b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
index d6c72753453..73de5507d3d 100644
--- a/Microsoft.Toolkit.HighPerformance/Box{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
@@ -180,7 +180,6 @@ public override int GetHashCode()
         /// <summary>
         /// Throws an <see cref="InvalidCastException"/> when a cast from an invalid <see cref="object"/> is attempted.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidCastExceptionForGetFrom()
         {
             throw new InvalidCastException($"Can't cast the input object to the type Box<{typeof(T)}>");
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
index 1f2b1b3e600..38ddeaef104 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
@@ -289,7 +289,6 @@ public override string ToString()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the initial capacity is invalid.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForInitialCapacity()
         {
             throw new ArgumentOutOfRangeException("initialCapacity", "The initial capacity must be a positive value");
@@ -298,7 +297,6 @@ private static void ThrowArgumentOutOfRangeExceptionForInitialCapacity()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
         {
             throw new ArgumentOutOfRangeException("count", "The count can't be a negative value");
@@ -307,7 +305,6 @@ private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the size hint is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
         {
             throw new ArgumentOutOfRangeException("sizeHint", "The size hint can't be a negative value");
@@ -316,7 +313,6 @@ private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForAdvancedTooFar()
         {
             throw new ArgumentException("The buffer writer has advanced too far");
@@ -325,7 +321,6 @@ private static void ThrowArgumentExceptionForAdvancedTooFar()
         /// <summary>
         /// Throws an <see cref="ObjectDisposedException"/> when <see cref="array"/> is <see langword="null"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowObjectDisposedException()
         {
             throw new ObjectDisposedException("The current buffer has already been disposed");
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
index ec0c0fcc5d9..b67b578e4ed 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
@@ -159,7 +159,6 @@ public override string ToString()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
         {
             throw new ArgumentOutOfRangeException("count", "The count can't be a negative value");
@@ -168,7 +167,6 @@ private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the size hint is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
         {
             throw new ArgumentOutOfRangeException("sizeHint", "The size hint can't be a negative value");
@@ -177,7 +175,6 @@ private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForAdvancedTooFar()
         {
             throw new ArgumentException("The buffer writer has advanced too far");
@@ -186,7 +183,6 @@ private static void ThrowArgumentExceptionForAdvancedTooFar()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when the requested size exceeds the capacity.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForCapacityExceeded()
         {
             throw new ArgumentException("The buffer writer doesn't have enough capacity left");
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
index 38bd7382267..825062b45e8 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
@@ -251,7 +251,6 @@ public override string ToString()
         /// <summary>
         /// Throws an <see cref="ObjectDisposedException"/> when <see cref="array"/> is <see langword="null"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowObjectDisposedException()
         {
             throw new ObjectDisposedException(nameof(MemoryOwner<T>), "The current buffer has already been disposed");
@@ -260,7 +259,6 @@ private static void ThrowObjectDisposedException()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="start"/> is invalid.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOffsetException()
         {
             throw new ArgumentOutOfRangeException(nameof(start), "The input start parameter was not valid");
@@ -269,7 +267,6 @@ private static void ThrowInvalidOffsetException()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="length"/> is invalid.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidLengthException()
         {
             throw new ArgumentOutOfRangeException(nameof(length), "The input length parameter was not valid");
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DColumnEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DColumnEnumerable{T}.cs
index 6cd0ceaf9f3..629d5f903f8 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DColumnEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DColumnEnumerable{T}.cs
@@ -205,7 +205,6 @@ public ref T Current
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="column"/> is invalid.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForInvalidColumn()
         {
             throw new ArgumentOutOfRangeException(nameof(column), "The target column parameter was not valid");
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DRowEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DRowEnumerable{T}.cs
index a0d1fe98f5c..5c146d5a5e8 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DRowEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/Array2DRowEnumerable{T}.cs
@@ -160,7 +160,6 @@ public ref T Current
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="row"/> is invalid.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForInvalidRow()
         {
             throw new ArgumentOutOfRangeException(nameof(row), "The target row parameter was not valid");
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs
index f5b0d6c1b90..b0701f932d3 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Helpers
 {
@@ -15,7 +14,6 @@ public static partial class ParallelHelper
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid parameter is specified for the minimum actions per thread.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread()
         {
             // Having the argument name here manually typed is
@@ -30,7 +28,6 @@ private static void ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerT
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid start parameter is specified for 1D loops.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForStartGreaterThanEnd()
         {
             throw new ArgumentOutOfRangeException("start", "The start parameter must be less than or equal to end");
@@ -39,7 +36,6 @@ private static void ThrowArgumentOutOfRangeExceptionForStartGreaterThanEnd()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a range has an index starting from an end.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForRangeIndexFromEnd(string name)
         {
             throw new ArgumentException("The bounds of the range can't start from an end", name);
@@ -48,7 +44,6 @@ private static void ThrowArgumentExceptionForRangeIndexFromEnd(string name)
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid top parameter is specified for 2D loops.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForTopGreaterThanBottom()
         {
             throw new ArgumentOutOfRangeException("top", "The top parameter must be less than or equal to bottom");
@@ -57,7 +52,6 @@ private static void ThrowArgumentOutOfRangeExceptionForTopGreaterThanBottom()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid left parameter is specified for 2D loops.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForLeftGreaterThanRight()
         {
             throw new ArgumentOutOfRangeException("left", "The left parameter must be less than or equal to right");
diff --git a/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs b/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs
index 76a685d74eb..1742bfcad21 100644
--- a/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs
@@ -129,7 +129,6 @@ public static explicit operator T(NullableReadOnlyRef<T> reference)
         /// <summary>
         /// Throws a <see cref="InvalidOperationException"/> when trying to access <see cref="Value"/> for a default instance.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationException()
         {
             throw new InvalidOperationException("The current instance doesn't have a value that can be accessed");
diff --git a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs b/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
index ee4fc9c8750..c4a3080665b 100644
--- a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
@@ -113,7 +113,6 @@ public static explicit operator T(NullableRef<T> reference)
         /// <summary>
         /// Throws a <see cref="InvalidOperationException"/> when trying to access <see cref="Value"/> for a default instance.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationException()
         {
             throw new InvalidOperationException("The current instance doesn't have a value that can be accessed");
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
index 1d44a481b50..209c935e4a5 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.IO;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
@@ -16,7 +15,6 @@ internal partial class MemoryStream
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when setting the <see cref="Stream.Position"/> property.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForPosition()
         {
             throw new ArgumentOutOfRangeException(nameof(Position), "The value for the property was not in the valid range.");
@@ -25,7 +23,6 @@ private static void ThrowArgumentOutOfRangeExceptionForPosition()
         /// <summary>
         /// Throws an <see cref="ArgumentNullException"/> when an input buffer is <see langword="null"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentNullExceptionForBuffer()
         {
             throw new ArgumentNullException("buffer", "The buffer is null.");
@@ -34,7 +31,6 @@ private static void ThrowArgumentNullExceptionForBuffer()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForOffset()
         {
             throw new ArgumentOutOfRangeException("offset", "Offset can't be negative.");
@@ -43,7 +39,6 @@ private static void ThrowArgumentOutOfRangeExceptionForOffset()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForCount()
         {
             throw new ArgumentOutOfRangeException("count", "Count can't be negative.");
@@ -52,7 +47,6 @@ private static void ThrowArgumentOutOfRangeExceptionForCount()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when the sum of offset and count exceeds the length of the target buffer.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForLength()
         {
             throw new ArgumentException("The sum of offset and count can't be larger than the buffer length.", "buffer");
@@ -61,7 +55,6 @@ private static void ThrowArgumentExceptionForLength()
         /// <summary>
         /// Throws a <see cref="NotSupportedException"/> when trying to write on a readonly stream.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowNotSupportedExceptionForCanWrite()
         {
             throw new NotSupportedException("The current stream doesn't support writing.");
@@ -70,7 +63,6 @@ private static void ThrowNotSupportedExceptionForCanWrite()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when trying to write too many bytes to the target stream.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForEndOfStreamOnWrite()
         {
             throw new ArgumentException("The current stream can't contain the requested input data.");
@@ -79,7 +71,6 @@ private static void ThrowArgumentExceptionForEndOfStreamOnWrite()
         /// <summary>
         /// Throws a <see cref="NotSupportedException"/> when trying to set the length of the stream.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowNotSupportedExceptionForSetLength()
         {
             throw new NotSupportedException("Setting the length is not supported for this stream.");
@@ -89,7 +80,6 @@ private static void ThrowNotSupportedExceptionForSetLength()
         /// Throws an <see cref="ArgumentException"/> when using an invalid seek mode.
         /// </summary>
         /// <returns>Nothing, as this method throws unconditionally.</returns>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static long ThrowArgumentExceptionForSeekOrigin()
         {
             throw new ArgumentException("The input seek mode is not valid.", "origin");
@@ -98,7 +88,6 @@ private static long ThrowArgumentExceptionForSeekOrigin()
         /// <summary>
         /// Throws an <see cref="ObjectDisposedException"/> when using a disposed <see cref="Stream"/> instance.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowObjectDisposedException()
         {
             throw new ObjectDisposedException(nameof(memory), "The current stream has already been disposed");

From 301b5fa3ca52f15fb08b9ce77826fcf967281c22 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:16:18 +0200
Subject: [PATCH 167/595] Added custom ArrayPool<T> field to Memoryowner<T>

---
 .../Buffers/MemoryOwner{T}.cs                 | 54 +++++++++++++++----
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
index 825062b45e8..b243a5fdb5d 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
@@ -32,6 +32,11 @@ public sealed class MemoryOwner<T> : IMemoryOwner<T>
         private readonly int length;
 #pragma warning restore IDE0032
 
+        /// <summary>
+        /// The <see cref="ArrayPool{T}"/> instance used to rent <see cref="array"/>.
+        /// </summary>
+        private readonly ArrayPool<T> pool;
+
         /// <summary>
         /// The underlying <typeparamref name="T"/> array.
         /// </summary>
@@ -41,12 +46,14 @@ public sealed class MemoryOwner<T> : IMemoryOwner<T>
         /// Initializes a new instance of the <see cref="MemoryOwner{T}"/> class with the specified parameters.
         /// </summary>
         /// <param name="length">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
         /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
-        private MemoryOwner(int length, AllocationMode mode)
+        private MemoryOwner(int length, ArrayPool<T> pool, AllocationMode mode)
         {
             this.start = 0;
             this.length = length;
-            this.array = ArrayPool<T>.Shared.Rent(length);
+            this.pool = pool;
+            this.array = pool.Rent(length);
 
             if (mode == AllocationMode.Clear)
             {
@@ -57,20 +64,22 @@ private MemoryOwner(int length, AllocationMode mode)
         /// <summary>
         /// Initializes a new instance of the <see cref="MemoryOwner{T}"/> class with the specified parameters.
         /// </summary>
-        /// <param name="array">The input <typeparamref name="T"/> array to use.</param>
         /// <param name="start">The starting offset within <paramref name="array"/>.</param>
         /// <param name="length">The length of the array to use.</param>
-        private MemoryOwner(T[] array, int start, int length)
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance currently in use.</param>
+        /// <param name="array">The input <typeparamref name="T"/> array to use.</param>
+        private MemoryOwner(int start, int length, ArrayPool<T> pool, T[] array)
         {
             this.start = start;
             this.length = length;
+            this.pool = pool;
             this.array = array;
         }
 
         /// <summary>
         /// Finalizes an instance of the <see cref="MemoryOwner{T}"/> class.
         /// </summary>
-        ~MemoryOwner() => this.Dispose();
+        ~MemoryOwner() => Dispose();
 
         /// <summary>
         /// Gets an empty <see cref="MemoryOwner{T}"/> instance.
@@ -79,7 +88,7 @@ private MemoryOwner(T[] array, int start, int length)
         public static MemoryOwner<T> Empty
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new MemoryOwner<T>(0, AllocationMode.Default);
+            get => new MemoryOwner<T>(0, ArrayPool<T>.Shared, AllocationMode.Default);
         }
 
         /// <summary>
@@ -91,19 +100,44 @@ public static MemoryOwner<T> Empty
         /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static MemoryOwner<T> Allocate(int size) => new MemoryOwner<T>(size, AllocationMode.Default);
+        public static MemoryOwner<T> Allocate(int size) => new MemoryOwner<T>(size, ArrayPool<T>.Shared, AllocationMode.Default);
+
+        /// <summary>
+        /// Creates a new <see cref="MemoryOwner{T}"/> instance with the specified parameters.
+        /// </summary>
+        /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance currently in use.</param>
+        /// <returns>A <see cref="MemoryOwner{T}"/> instance of the requested length.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
+        /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static MemoryOwner<T> Allocate(int size, ArrayPool<T> pool) => new MemoryOwner<T>(size, pool, AllocationMode.Default);
+
+        /// <summary>
+        /// Creates a new <see cref="MemoryOwner{T}"/> instance with the specified parameters.
+        /// </summary>
+        /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
+        /// <returns>A <see cref="MemoryOwner{T}"/> instance of the requested length.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
+        /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static MemoryOwner<T> Allocate(int size, AllocationMode mode) => new MemoryOwner<T>(size, ArrayPool<T>.Shared, mode);
 
         /// <summary>
         /// Creates a new <see cref="MemoryOwner{T}"/> instance with the specified parameters.
         /// </summary>
         /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance currently in use.</param>
         /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
         /// <returns>A <see cref="MemoryOwner{T}"/> instance of the requested length.</returns>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
         /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static MemoryOwner<T> Allocate(int size, AllocationMode mode) => new MemoryOwner<T>(size, mode);
+        public static MemoryOwner<T> Allocate(int size, ArrayPool<T> pool, AllocationMode mode) => new MemoryOwner<T>(size, pool, mode);
 
         /// <summary>
         /// Gets the number of items in the current instance
@@ -210,7 +244,7 @@ public MemoryOwner<T> Slice(int start, int length)
                 ThrowInvalidLengthException();
             }
 
-            return new MemoryOwner<T>(array!, start, length);
+            return new MemoryOwner<T>(start, length, this.pool, array!);
         }
 
         /// <inheritdoc/>
@@ -227,7 +261,7 @@ public void Dispose()
 
             this.array = null;
 
-            ArrayPool<T>.Shared.Return(array);
+            this.pool.Return(array);
         }
 
         /// <inheritdoc/>

From 6bd669fdd26de44656f22edb9ef8842f4591a09e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:24:06 +0200
Subject: [PATCH 168/595] Added custom pool to ArrayPoolBufferWriter<T>

---
 .../Buffers/ArrayPoolBufferWriter{T}.cs       | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
index 38ddeaef104..1f884d69ab2 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
@@ -33,6 +33,11 @@ public sealed class ArrayPoolBufferWriter<T> : IBuffer<T>, IMemoryOwner<T>
         /// </summary>
         private const int DefaultInitialBufferSize = 256;
 
+        /// <summary>
+        /// The <see cref="ArrayPool{T}"/> instance used to rent <see cref="array"/>.
+        /// </summary>
+        private readonly ArrayPool<T> pool;
+
         /// <summary>
         /// The underlying <typeparamref name="T"/> array.
         /// </summary>
@@ -49,12 +54,17 @@ public sealed class ArrayPoolBufferWriter<T> : IBuffer<T>, IMemoryOwner<T>
         /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
         /// </summary>
         public ArrayPoolBufferWriter()
+            : this(ArrayPool<T>.Shared, DefaultInitialBufferSize)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
+        /// </summary>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
+        public ArrayPoolBufferWriter(ArrayPool<T> pool)
+            : this(pool, DefaultInitialBufferSize)
         {
-            // Since we're using pooled arrays, we can rent the buffer with the
-            // default size immediately, we don't need to use lazy initialization
-            // to save unnecessary memory allocations in this case.
-            this.array = ArrayPool<T>.Shared.Rent(DefaultInitialBufferSize);
-            this.index = 0;
         }
 
         /// <summary>
@@ -65,20 +75,37 @@ public ArrayPoolBufferWriter()
         /// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
         /// </exception>
         public ArrayPoolBufferWriter(int initialCapacity)
+            : this(ArrayPool<T>.Shared, initialCapacity)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
+        /// </summary>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
+        /// <param name="initialCapacity">The minimum capacity with which to initialize the underlying buffer.</param>
+        /// <exception cref="ArgumentException">
+        /// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
+        /// </exception>
+        public ArrayPoolBufferWriter(ArrayPool<T> pool, int initialCapacity)
         {
             if (initialCapacity <= 0)
             {
                 ThrowArgumentOutOfRangeExceptionForInitialCapacity();
             }
 
-            this.array = ArrayPool<T>.Shared.Rent(initialCapacity);
+            // Since we're using pooled arrays, we can rent the buffer with the
+            // default size immediately, we don't need to use lazy initialization
+            // to save unnecessary memory allocations in this case.
+            this.pool = pool;
+            this.array = pool.Rent(initialCapacity);
             this.index = 0;
         }
 
         /// <summary>
         /// Finalizes an instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
         /// </summary>
-        ~ArrayPoolBufferWriter() => this.Dispose();
+        ~ArrayPoolBufferWriter() => Dispose();
 
         /// <inheritdoc/>
         Memory<T> IMemoryOwner<T>.Memory
@@ -182,6 +209,7 @@ public void Clear()
             }
 
             array.AsSpan(0, this.index).Clear();
+
             this.index = 0;
         }
 
@@ -250,7 +278,7 @@ private void CheckAndResizeBuffer(int sizeHint)
             {
                 int minimumSize = this.index + sizeHint;
 
-                ArrayPool<T>.Shared.Resize(ref this.array, minimumSize);
+                this.pool.Resize(ref this.array, minimumSize);
             }
         }
 
@@ -268,7 +296,7 @@ public void Dispose()
 
             this.array = null;
 
-            ArrayPool<T>.Shared.Return(array);
+            this.pool.Return(array);
         }
 
         /// <inheritdoc/>

From d9b07d773d6254f2eac8cf599beadc05ea7bd461 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:25:40 +0200
Subject: [PATCH 169/595] Minor codegen improvement to Box<T>

---
 Microsoft.Toolkit.HighPerformance/Box{T}.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Box{T}.cs b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
index 73de5507d3d..df6ad3eca83 100644
--- a/Microsoft.Toolkit.HighPerformance/Box{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
@@ -125,7 +125,7 @@ public static bool TryGetFrom(object obj, [NotNullWhen(true)] out Box<T>? box)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static implicit operator T(Box<T> box)
         {
-            return Unsafe.Unbox<T>(box);
+            return (T)(object)box;
         }
 
         /// <summary>

From a2217fa21d910b7d36b5b3d94cc634fea6a6334e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:37:30 +0200
Subject: [PATCH 170/595] Added custom pool to SpanwOwner<T>

---
 .../Buffers/SpanOwner{T}.cs                   | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs
index a8d3fbfb183..481f60f8195 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs
@@ -42,6 +42,11 @@ public readonly ref struct SpanOwner<T>
         private readonly int length;
 #pragma warning restore IDE0032
 
+        /// <summary>
+        /// The <see cref="ArrayPool{T}"/> instance used to rent <see cref="array"/>.
+        /// </summary>
+        private readonly ArrayPool<T> pool;
+
         /// <summary>
         /// The underlying <typeparamref name="T"/> array.
         /// </summary>
@@ -51,11 +56,13 @@ public readonly ref struct SpanOwner<T>
         /// Initializes a new instance of the <see cref="SpanOwner{T}"/> struct with the specified parameters.
         /// </summary>
         /// <param name="length">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
         /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
-        private SpanOwner(int length, AllocationMode mode)
+        private SpanOwner(int length, ArrayPool<T> pool, AllocationMode mode)
         {
             this.length = length;
-            this.array = ArrayPool<T>.Shared.Rent(length);
+            this.pool = pool;
+            this.array = pool.Rent(length);
 
             if (mode == AllocationMode.Clear)
             {
@@ -70,7 +77,7 @@ private SpanOwner(int length, AllocationMode mode)
         public static SpanOwner<T> Empty
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new SpanOwner<T>(0, AllocationMode.Default);
+            get => new SpanOwner<T>(0, ArrayPool<T>.Shared, AllocationMode.Default);
         }
 
         /// <summary>
@@ -82,19 +89,44 @@ public static SpanOwner<T> Empty
         /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanOwner<T> Allocate(int size) => new SpanOwner<T>(size, AllocationMode.Default);
+        public static SpanOwner<T> Allocate(int size) => new SpanOwner<T>(size, ArrayPool<T>.Shared, AllocationMode.Default);
+
+        /// <summary>
+        /// Creates a new <see cref="SpanOwner{T}"/> instance with the specified parameters.
+        /// </summary>
+        /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
+        /// <returns>A <see cref="SpanOwner{T}"/> instance of the requested length.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
+        /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static SpanOwner<T> Allocate(int size, ArrayPool<T> pool) => new SpanOwner<T>(size, pool, AllocationMode.Default);
+
+        /// <summary>
+        /// Creates a new <see cref="SpanOwner{T}"/> instance with the specified parameters.
+        /// </summary>
+        /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
+        /// <returns>A <see cref="SpanOwner{T}"/> instance of the requested length.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
+        /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static SpanOwner<T> Allocate(int size, AllocationMode mode) => new SpanOwner<T>(size, ArrayPool<T>.Shared, mode);
 
         /// <summary>
         /// Creates a new <see cref="SpanOwner{T}"/> instance with the specified parameters.
         /// </summary>
         /// <param name="size">The length of the new memory buffer to use.</param>
+        /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
         /// <param name="mode">Indicates the allocation mode to use for the new buffer to rent.</param>
         /// <returns>A <see cref="SpanOwner{T}"/> instance of the requested length.</returns>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="size"/> is not valid.</exception>
         /// <remarks>This method is just a proxy for the <see langword="private"/> constructor, for clarity.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanOwner<T> Allocate(int size, AllocationMode mode) => new SpanOwner<T>(size, mode);
+        public static SpanOwner<T> Allocate(int size, ArrayPool<T> pool, AllocationMode mode) => new SpanOwner<T>(size, pool, mode);
 
         /// <summary>
         /// Gets the number of items in the current instance
@@ -111,7 +143,7 @@ public int Length
         public Span<T> Span
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new Span<T>(array, 0, this.length);
+            get => new Span<T>(this.array, 0, this.length);
         }
 
         /// <summary>
@@ -122,7 +154,7 @@ public Span<T> Span
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ref T DangerousGetReference()
         {
-            return ref array.DangerousGetReference();
+            return ref this.array.DangerousGetReference();
         }
 
         /// <summary>
@@ -131,7 +163,7 @@ public ref T DangerousGetReference()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Dispose()
         {
-            ArrayPool<T>.Shared.Return(array);
+            this.pool.Return(this.array);
         }
 
         /// <inheritdoc/>

From f4da5920131d3f1ab2de6f6dc66b09881d10f662 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:42:41 +0200
Subject: [PATCH 171/595] Minor tweaks to ArrayPoolBufferWriter<T>

---
 .../Buffers/ArrayPoolBufferWriter{T}.cs       | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
index 1f884d69ab2..e17c0c48a18 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
@@ -71,9 +71,7 @@ public ArrayPoolBufferWriter(ArrayPool<T> pool)
         /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
         /// </summary>
         /// <param name="initialCapacity">The minimum capacity with which to initialize the underlying buffer.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
-        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="initialCapacity"/> is not valid.</exception>
         public ArrayPoolBufferWriter(int initialCapacity)
             : this(ArrayPool<T>.Shared, initialCapacity)
         {
@@ -84,19 +82,15 @@ public ArrayPoolBufferWriter(int initialCapacity)
         /// </summary>
         /// <param name="pool">The <see cref="ArrayPool{T}"/> instance to use.</param>
         /// <param name="initialCapacity">The minimum capacity with which to initialize the underlying buffer.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
-        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="initialCapacity"/> is not valid.</exception>
         public ArrayPoolBufferWriter(ArrayPool<T> pool, int initialCapacity)
         {
-            if (initialCapacity <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInitialCapacity();
-            }
-
             // Since we're using pooled arrays, we can rent the buffer with the
             // default size immediately, we don't need to use lazy initialization
             // to save unnecessary memory allocations in this case.
+            // Additionally, we don't need to manually throw the exception if
+            // the requested size is not valid, as that'll be thrown automatically
+            // by the array pool in use when we try to rent an array with that size.
             this.pool = pool;
             this.array = pool.Rent(initialCapacity);
             this.index = 0;
@@ -314,14 +308,6 @@ public override string ToString()
             return $"Microsoft.Toolkit.HighPerformance.Buffers.ArrayPoolBufferWriter<{typeof(T)}>[{this.index}]";
         }
 
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the initial capacity is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForInitialCapacity()
-        {
-            throw new ArgumentOutOfRangeException("initialCapacity", "The initial capacity must be a positive value");
-        }
-
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
         /// </summary>

From 1f6aed077cfee59e399613c92d13392b9c66f9e3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 17:55:59 +0200
Subject: [PATCH 172/595] Added tests for invalid allocation sizes

---
 .../Buffers/Test_ArrayPoolBufferWriter{T}.cs          | 10 ++++++++++
 .../Buffers/Test_MemoryOwner{T}.cs                    | 10 ++++++++++
 .../Buffers/Test_SpanOwner{T}.cs                      | 11 +++++++++++
 3 files changed, 31 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
index a4943487474..669a7b34ee4 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
@@ -54,6 +54,16 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
             Assert.ThrowsException<ObjectDisposedException>(() => writer.Advance(1));
         }
 
+        [TestCategory("ArrayPoolBufferWriterOfT")]
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void Test_ArrayPoolBufferWriterOfT_InvalidRequestedSize()
+        {
+            var writer = new ArrayPoolBufferWriter<byte>(-1);
+
+            Assert.Fail("You shouldn't be here");
+        }
+
         [TestCategory("ArrayPoolBufferWriterOfT")]
         [TestMethod]
         public void Test_ArrayPoolBufferWriterOfT_Clear()
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
index 6be4bbfa754..5540f8898fa 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
@@ -30,6 +30,16 @@ public void Test_MemoryOwnerOfT_AllocateAndGetMemoryAndSpan()
             Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
         }
 
+        [TestCategory("MemoryOwnerOfT")]
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void Test_MemoryOwnerOfT_InvalidRequestedSize()
+        {
+            using var buffer = MemoryOwner<int>.Allocate(-1);
+
+            Assert.Fail("You shouldn't be here");
+        }
+
         [TestCategory("MemoryOwnerOfT")]
         [TestMethod]
         [ExpectedException(typeof(ObjectDisposedException))]
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
index e39de1f7a79..db8862dc591 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.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.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Toolkit.HighPerformance.Buffers;
@@ -27,6 +28,16 @@ public void Test_SpanOwnerOfT_AllocateAndGetMemoryAndSpan()
             Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
         }
 
+        [TestCategory("SpanOwnerOfT")]
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void Test_SpanOwnerOfT_InvalidRequestedSize()
+        {
+            using var buffer = SpanOwner<int>.Allocate(-1);
+
+            Assert.Fail("You shouldn't be here");
+        }
+
         [TestCategory("HashCodeOfT")]
         [TestMethod]
         public void Test_SpanOwnerOfT_PooledBuffersAndClear()

From ae589c77e4156ec6c52b9d380bd3fa6be0f7da26 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 16 Jun 2020 18:13:44 +0200
Subject: [PATCH 173/595] Added unit tests for custom array pool overloads

---
 .../Buffers/Test_ArrayPoolBufferWriter{T}.cs  | 46 +++++++++++++++++++
 .../Buffers/Test_MemoryOwner{T}.cs            | 25 ++++++++++
 .../Buffers/Test_SpanOwner{T}.cs              | 22 +++++++++
 .../Buffers/TrackingArrayPool{T}.cs           | 39 ++++++++++++++++
 ...UnitTests.HighPerformance.Shared.projitems |  1 +
 5 files changed, 133 insertions(+)
 create mode 100644 UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
index 669a7b34ee4..44e80b121fa 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
@@ -9,6 +9,7 @@
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers;
 
 namespace UnitTests.HighPerformance.Buffers
 {
@@ -54,6 +55,51 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
             Assert.ThrowsException<ObjectDisposedException>(() => writer.Advance(1));
         }
 
+        [TestCategory("ArrayPoolBufferWriterOfT")]
+        [TestMethod]
+        public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
+        {
+            var pool = new TrackingArrayPool<byte>();
+
+            using (var writer = new ArrayPoolBufferWriter<byte>())
+            {
+                Assert.AreEqual(pool.RentedArrays.Count, 1);
+
+                Assert.AreEqual(writer.Capacity, 256);
+                Assert.AreEqual(writer.FreeCapacity, 256);
+                Assert.AreEqual(writer.WrittenCount, 0);
+                Assert.IsTrue(writer.WrittenMemory.IsEmpty);
+                Assert.IsTrue(writer.WrittenSpan.IsEmpty);
+
+                Span<byte> span = writer.GetSpan(43);
+
+                Assert.IsTrue(span.Length >= 43);
+
+                writer.Advance(43);
+
+                Assert.AreEqual(writer.Capacity, 256);
+                Assert.AreEqual(writer.FreeCapacity, 256 - 43);
+                Assert.AreEqual(writer.WrittenCount, 43);
+                Assert.AreEqual(writer.WrittenMemory.Length, 43);
+                Assert.AreEqual(writer.WrittenSpan.Length, 43);
+
+                Assert.ThrowsException<ArgumentOutOfRangeException>(() => writer.Advance(-1));
+                Assert.ThrowsException<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
+                Assert.ThrowsException<ArgumentException>(() => writer.Advance(1024));
+
+                writer.Dispose();
+
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.WrittenMemory);
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.WrittenSpan.Length);
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.Capacity);
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.FreeCapacity);
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.Clear());
+                Assert.ThrowsException<ObjectDisposedException>(() => writer.Advance(1));
+            }
+
+            Assert.AreEqual(pool.RentedArrays.Count, 0);
+        }
+
         [TestCategory("ArrayPoolBufferWriterOfT")]
         [TestMethod]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
index 5540f8898fa..f4e82383356 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
@@ -3,10 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers;
 
 namespace UnitTests.HighPerformance.Buffers
 {
@@ -30,6 +32,29 @@ public void Test_MemoryOwnerOfT_AllocateAndGetMemoryAndSpan()
             Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
         }
 
+        [TestCategory("MemoryOwnerOfT")]
+        [TestMethod]
+        public void Test_MemoryOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
+        {
+            var pool = new TrackingArrayPool<int>();
+
+            using (var buffer = MemoryOwner<int>.Allocate(127, pool))
+            {
+                Assert.AreEqual(pool.RentedArrays.Count, 1);
+
+                Assert.IsTrue(buffer.Length == 127);
+                Assert.IsTrue(buffer.Memory.Length == 127);
+                Assert.IsTrue(buffer.Span.Length == 127);
+
+                buffer.Span.Fill(42);
+
+                Assert.IsTrue(buffer.Memory.Span.ToArray().All(i => i == 42));
+                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
+            }
+
+            Assert.AreEqual(pool.RentedArrays.Count, 0);
+        }
+
         [TestCategory("MemoryOwnerOfT")]
         [TestMethod]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
index db8862dc591..4f64eee4904 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers;
 
 namespace UnitTests.HighPerformance.Buffers
 {
@@ -28,6 +29,27 @@ public void Test_SpanOwnerOfT_AllocateAndGetMemoryAndSpan()
             Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
         }
 
+        [TestCategory("SpanOwnerOfT")]
+        [TestMethod]
+        public void Test_SpanOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
+        {
+            var pool = new TrackingArrayPool<int>();
+
+            using (var buffer = SpanOwner<int>.Allocate(127))
+            {
+                Assert.AreEqual(pool.RentedArrays.Count, 1);
+
+                Assert.IsTrue(buffer.Length == 127);
+                Assert.IsTrue(buffer.Span.Length == 127);
+
+                buffer.Span.Fill(42);
+
+                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
+            }
+
+            Assert.AreEqual(pool.RentedArrays.Count, 0);
+        }
+
         [TestCategory("SpanOwnerOfT")]
         [TestMethod]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs
new file mode 100644
index 00000000000..1ffedcefa0a
--- /dev/null
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs
@@ -0,0 +1,39 @@
+// 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.Buffers;
+using System.Collections.Generic;
+
+namespace UnitTests.HighPerformance.Shared.Buffers
+{
+    public sealed class TrackingArrayPool<T> : ArrayPool<T>
+    {
+        private readonly ArrayPool<T> pool = ArrayPool<T>.Create();
+
+        private readonly HashSet<T[]> arrays = new HashSet<T[]>();
+
+        /// <summary>
+        /// Gets the collection of currently rented out arrays
+        /// </summary>
+        public IReadOnlyCollection<T[]> RentedArrays => this.arrays;
+
+        /// <inheritdoc/>
+        public override T[] Rent(int minimumLength)
+        {
+            T[] array = this.pool.Rent(minimumLength);
+
+            this.arrays.Add(array);
+
+            return array;
+        }
+
+        /// <inheritdoc/>
+        public override void Return(T[] array, bool clearArray = false)
+        {
+            this.arrays.Remove(array);
+
+            this.pool.Return(array, clearArray);
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
index 06b7503c5f8..6bfb905550b 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
+++ b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
@@ -13,6 +13,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_ArrayPoolBufferWriter{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_MemoryOwner{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_SpanOwner{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Buffers\TrackingArrayPool{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.2D.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayPoolExtensions.cs" />

From 2cce132df5e306d15756f76de2ccd27929a0ac8a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 17 Jun 2020 16:21:57 +0200
Subject: [PATCH 174/595] Added ArrayTypeMismatchException throw APIs

---
 .../ThrowHelper.ThrowExceptions.cs            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 813c4f910f0..9890e1bb9ea 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -19,6 +19,29 @@ namespace Microsoft.Toolkit.Diagnostics
     /// </summary>
     public static partial class ThrowHelper
     {
+        /// <summary>
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArrayTypeMismatchException(string message)
+        {
+            throw new ArrayTypeMismatchException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArrayTypeMismatchException(string message, Exception innerException)
+        {
+            throw new ArrayTypeMismatchException(message, innerException);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ArgumentException"/>.
         /// </summary>

From ec675df87dfe66c22e8259bcba5e68f67c12e883 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jun 2020 23:41:26 +0200
Subject: [PATCH 175/595] Updated NuGet packages, tweaked Mvvm .csproj

---
 .../Microsoft.Toolkit.Mvvm.csproj             | 20 ++++++++++++-------
 .../UnitTests.NetCore.csproj                  |  2 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index a21cb4f156f..43ad4d1a6fe 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
@@ -13,15 +13,21 @@
       - Messenger: a messaging system to exchange messages through different loosely-coupled objects.
       - Ioc: a helper class to configure dependency injection service containers.
     </Description>
-    <PackageTags>UWP Toolkit Windows Mvvm Ioc extensions helpers</PackageTags>
-
-    <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
-    <DebugType>Full</DebugType>
+    <PackageTags>UWP Toolkit Windows Mvvm observable Ioc dependency injection services extensions helpers</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
+  <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
+  </ItemGroup>
+
+  <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index a596b6c7e4e..33866653021 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index f6dfa7ed64a..d0ffe9d927d 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -104,7 +104,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>3.1.4</Version>
+      <Version>3.1.5</Version>
     </PackageReference>
     <PackageReference Include="FluentAssertions">
       <Version>5.10.3</Version>

From 50a6095a3dca8fda44408c26efc5dc68d40102f4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 20 Jun 2020 23:46:52 +0200
Subject: [PATCH 176/595] Removed unnecessary attributes

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs      | 2 --
 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs              | 3 ---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs                  | 1 -
 .../DictionarySlim{TKey,TValue}.cs                             | 2 --
 4 files changed, 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index a8ccdb18960..af0641c11bd 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -327,7 +327,6 @@ async void MonitorTask()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForInvalidPropertyExpression()
         {
             throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
@@ -336,7 +335,6 @@ private static void ThrowArgumentExceptionForInvalidPropertyExpression()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForInvalidFieldExpression()
         {
             throw new ArgumentException("The given expression must be in the form () => field");
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 91940774568..e02e121ec48 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -130,7 +129,6 @@ public void ConfigureServices(IServiceCollection collection, ServiceProviderOpti
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when the <see cref="ServiceProvider"/> property is used before initialization.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForMissingInitialization()
         {
             throw new InvalidOperationException("The service provider has not been configured yet");
@@ -139,7 +137,6 @@ private static void ThrowInvalidOperationExceptionForMissingInitialization()
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when a configuration is attempted more than once.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForRepeatedConfiguration()
         {
             throw new InvalidOperationException("The default service provider has already been configured");
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index fe3c68e3f05..d1135f55d6b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -605,7 +605,6 @@ public override int GetHashCode()
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
         {
             throw new InvalidOperationException("The target recipient has already subscribed to the target message");
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index a65bf440786..71caa4ce71c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -323,7 +323,6 @@ public KeyValuePair<TKey, TValue> Current
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when trying to load an element with a missing key.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForKeyNotFound(TKey key)
         {
             throw new ArgumentException($"The target key {key} was not present in the dictionary");
@@ -332,7 +331,6 @@ private static void ThrowArgumentExceptionForKeyNotFound(TKey key)
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when trying to resize over the maximum capacity.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForMaxCapacityExceeded()
         {
             throw new InvalidOperationException("Max capacity exceeded");

From 9a9aa6b29d49d8c3ef3f5b6500c0da6745721243 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 21 Jun 2020 00:09:52 +0200
Subject: [PATCH 177/595] Added new Set<T> overloads with callback

---
 .../ComponentModel/ObservableObject.cs        | 73 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index af0641c11bd..e22a03120cd 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -109,7 +109,7 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// This method is just like <see cref="Set{T}(ref T, T, string)"/>, just with the addition
+        /// This method is just like <see cref="Set{T}(ref T,T,string)"/>, just with the addition
         /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
         /// the <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
@@ -133,6 +133,77 @@ protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName
             return false;
         }
 
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
+        /// value, then raises the <see cref="PropertyChanged"/> event.
+        /// This overload is much less efficient than <see cref="Set{T}(ref T,T,string)"/> and it
+        /// should only be used when the former is not viable (eg. when the target property being
+        /// updated does not directly expose a backing field that can be passed by reference).
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        {
+            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            {
+                return false;
+            }
+
+            this.OnPropertyChanging(propertyName);
+
+            callback(newValue);
+
+            this.OnPropertyChanged(propertyName);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="PropertyChanged"/> event. Similarly to
+        /// the <see cref="Set{T}(T,T,Action{T},string)"/> method, this overload should only be
+        /// used when <see cref="Set{T}(ref T,T,string)"/> can't be used directly.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="Set{T}(T,T,Action{T},string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
+        /// the <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            if (!broadcast)
+            {
+                return Set(oldValue, newValue, callback, propertyName);
+            }
+
+            if (Set(oldValue, newValue, callback, propertyName))
+            {
+                Broadcast(oldValue, newValue, propertyName);
+
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the

From f71923e701ec82369102eeb9132f99774cf81f12 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 22 Jun 2020 17:51:06 +0200
Subject: [PATCH 178/595] Deprecated NotifyTaskCompletion<TResult> type

---
 Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index 2b55ad349ce..2d720493fd4 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Toolkit.Helpers
     /// 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>
+    [Obsolete("This helper will be removed in a future release, use the ObservableObject base class from Microsoft.Toolkit.Mvvm and the SetAndNotifyOnCompletion method")]
     public sealed class NotifyTaskCompletion<TResult> : INotifyPropertyChanged
     {
         /// <summary>

From 6ed7b5ed9b5162870cc424599f1270bb0df1ef7a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 22 Jun 2020 18:05:27 +0200
Subject: [PATCH 179/595] Code refactoring, added TaskResultConverter

---
 .../Converters/TaskResultConverter.cs         | 78 +++++++++++++++++++
 .../Extensions/TaskExtensions.cs              | 14 +---
 2 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
new file mode 100644
index 00000000000..a9179ea6db8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
@@ -0,0 +1,78 @@
+// 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.Diagnostics.Contracts;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Extensions;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.UI.Converters
+{
+    /// <summary>
+    /// A converter that can be used to safely retrieve results from <see cref="Task{T}"/> instances.
+    /// This is needed because accessing <see cref="Task{TResult}.Result"/> when the task has not
+    /// completed yet will block the current thread and might cause a deadlock (eg. if the task was
+    /// scheduled on the same synchronization context where the result is being retrieved from).
+    /// </summary>
+    public sealed class TaskResultConverter : IValueConverter
+    {
+        /// <summary>
+        /// Non-generic overload of <see cref="Convert{T}"/>, for compatibility reasons.
+        /// </summary>
+        /// <param name="task">The input <see cref="Task"/>.</param>
+        /// <returns>The result of <paramref name="task"/>, as an <see cref="object"/>.</returns>
+        [Obsolete("This method is here for compatibility reasons, use the generic overload")]
+        public static object Convert(Task task)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets the result of a <see cref="Task{TResult}"/> if available, or <see langword="default"/> otherwise.
+        /// </summary>
+        /// <typeparam name="T">The type of <see cref="Task{TResult}"/> to get the result for.</typeparam>
+        /// <param name="task">The input <see cref="Task{TResult}"/> instance to get the result for.</param>
+        /// <returns>The result of <paramref name="task"/> if completed successfully, or <see langword="default"/> otherwise.</returns>
+        /// <remarks>This method does not block if <paramref name="task"/> has not completed yet.</remarks>
+        [Pure]
+        public static T Convert<T>(Task<T> task)
+        {
+            return task.ResultOrDefault();
+        }
+
+        /// <inheritdoc/>
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            // Check if the instance is a completed Task
+            if (!(value is Task task) ||
+                !task.IsCompletedSuccessfully)
+            {
+                return null;
+            }
+
+            Type taskType = task.GetType();
+            Type[] typeArguments = taskType.GetGenericArguments();
+
+            // Check if the task is actually some Task<T>
+            if (typeArguments.Length != 1)
+            {
+                return null;
+            }
+
+            // Get the Task<T>.Result property
+            PropertyInfo propertyInfo = taskType.GetProperty(nameof(Task<object>.Result));
+
+            // Finally retrieve the result
+            return propertyInfo!.GetValue(task);
+        }
+
+        /// <inheritdoc/>
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index c0fb2fa63b6..8fc52368bd5 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -2,7 +2,6 @@
 // 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.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -10,21 +9,10 @@
 namespace Microsoft.Toolkit.Extensions
 {
     /// <summary>
-    /// Helpers for working with arrays.
+    /// Helpers for working with tasks.
     /// </summary>
     public static class TaskExtensions
     {
-        /// <summary>
-        /// Non-generic overload of <see cref="ResultOrDefault{T}"/>, for compatibility reasons.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/>.</param>
-        /// <returns>The result of <paramref name="task"/>, as an <see cref="object"/>.</returns>
-        [Obsolete("This method is here for compatibility reasons, use the generic overload")]
-        public static object ResultOrDefault(this Task task)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// Gets the result of a <see cref="Task{TResult}"/> if available, or <see langword="default"/> otherwise.
         /// </summary>

From 8a7cd06518542bdf8c6d1c4174408c2d8b843d2e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 22 Jun 2020 18:06:23 +0200
Subject: [PATCH 180/595] Added missing XML note about return type

---
 Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
index a9179ea6db8..4ad5d974dfe 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
@@ -16,6 +16,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// This is needed because accessing <see cref="Task{TResult}.Result"/> when the task has not
     /// completed yet will block the current thread and might cause a deadlock (eg. if the task was
     /// scheduled on the same synchronization context where the result is being retrieved from).
+    /// The methods in this converter will safely return <see langword="default"/> if the input
+    /// task is still running, or if it has faulted or has been canceled.
     /// </summary>
     public sealed class TaskResultConverter : IValueConverter
     {

From 0c4669b171630d83ff72728baeaf6289a294ea1b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 22 Jun 2020 19:12:57 +0200
Subject: [PATCH 181/595] Moved al messenger-related functionality to
 ViewModelBase

---
 .../ComponentModel/ObservableObject.cs        | 94 -------------------
 .../ComponentModel/ViewModelBase.cs           | 90 +++++++++++++++++-
 2 files changed, 88 insertions(+), 96 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index e22a03120cd..ba10e81e10f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -14,8 +14,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
@@ -48,25 +46,6 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
             this.PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
 
-        /// <summary>
-        /// Broadcasts a <see cref="PropertyChangedMessage{T}"/> with the specified
-        /// parameters, without using any particular token (so using the default channel).
-        /// </summary>
-        /// <typeparam name="T">The type of the property that changed.</typeparam>
-        /// <param name="oldValue">The value of the property before it changed.</param>
-        /// <param name="newValue">The value of the property after it changed.</param>
-        /// <param name="propertyName">The name of the property that changed.</param>
-        /// <remarks>
-        /// You should override this method if you wish to customize the channel being
-        /// used to send the message (eg. if you need to use a specific token for the channel).
-        /// </remarks>
-        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
-        {
-            var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
-
-            Messenger.Default.Send(message);
-        }
-
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
@@ -97,42 +76,6 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
             return true;
         }
 
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed,
-        /// raises the <see cref="PropertyChanging"/> event, updates the property with
-        /// the new value, then raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <typeparam name="T">The type of the property that changed.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// This method is just like <see cref="Set{T}(ref T,T,string)"/>, just with the addition
-        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
-        /// the <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events
-        /// are not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
-        {
-            if (!broadcast)
-            {
-                return Set(ref field, newValue, propertyName);
-            }
-
-            T oldValue = field;
-
-            if (Set(ref field, newValue, propertyName))
-            {
-                Broadcast(oldValue, newValue, propertyName);
-
-                return true;
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
@@ -167,43 +110,6 @@ protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberN
             return true;
         }
 
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed,
-        /// raises the <see cref="PropertyChanging"/> event, updates the property with
-        /// the new value, then raises the <see cref="PropertyChanged"/> event. Similarly to
-        /// the <see cref="Set{T}(T,T,Action{T},string)"/> method, this overload should only be
-        /// used when <see cref="Set{T}(ref T,T,string)"/> can't be used directly.
-        /// </summary>
-        /// <typeparam name="T">The type of the property that changed.</typeparam>
-        /// <param name="oldValue">The current property value.</param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="callback">A callback to invoke to update the property value.</param>
-        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// This method is just like <see cref="Set{T}(T,T,Action{T},string)"/>, just with the addition
-        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
-        /// the <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events
-        /// are not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
-        {
-            if (!broadcast)
-            {
-                return Set(oldValue, newValue, callback, propertyName);
-            }
-
-            if (Set(oldValue, newValue, callback, propertyName))
-            {
-                Broadcast(oldValue, newValue, propertyName);
-
-                return true;
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index a99ef2db956..4a6f8680390 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -7,6 +7,8 @@
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
+using System;
+using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 
@@ -85,12 +87,96 @@ protected virtual void OnDeactivated()
             Messenger.Unregister(this);
         }
 
-        /// <inheritdoc/>
-        protected override void Broadcast<T>(T oldValue, T newValue, string propertyName)
+        /// <summary>
+        /// Broadcasts a <see cref="PropertyChangedMessage{T}"/> with the specified
+        /// parameters, without using any particular token (so using the default channel).
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The value of the property before it changed.</param>
+        /// <param name="newValue">The value of the property after it changed.</param>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        /// <remarks>
+        /// You should override this method if you wish to customize the channel being
+        /// used to send the message (eg. if you need to use a specific token for the channel).
+        /// </remarks>
+        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         {
             var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
             Messenger.Send(message);
         }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.Set{T}(ref T,T,string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
+        /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            if (!broadcast)
+            {
+                return Set(ref field, newValue, propertyName);
+            }
+
+            T oldValue = field;
+
+            if (Set(ref field, newValue, propertyName))
+            {
+                Broadcast(oldValue, newValue, propertyName);
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event. Similarly to
+        /// the <see cref="ObservableObject.Set{T}(T,T,Action{T},string)"/> method, this overload should only be
+        /// used when <see cref="ObservableObject.Set{T}(ref T,T,string)"/> can't be used directly.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.Set{T}(T,T,Action{T},string)"/>, just with the addition
+        /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
+        /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            if (!broadcast)
+            {
+                return Set(oldValue, newValue, callback, propertyName);
+            }
+
+            if (Set(oldValue, newValue, callback, propertyName))
+            {
+                Broadcast(oldValue, newValue, propertyName);
+
+                return true;
+            }
+
+            return false;
+        }
     }
 }
\ No newline at end of file

From 7e0d20aac30e822704ef994016066d2f98b1adf4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 23 Jun 2020 13:18:10 +0200
Subject: [PATCH 182/595] Fixed bugs in two unit tests

---
 .../Buffers/Test_ArrayPoolBufferWriter{T}.cs                    | 2 +-
 .../Buffers/Test_SpanOwner{T}.cs                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
index 44e80b121fa..e6770e01c59 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
@@ -61,7 +61,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
         {
             var pool = new TrackingArrayPool<byte>();
 
-            using (var writer = new ArrayPoolBufferWriter<byte>())
+            using (var writer = new ArrayPoolBufferWriter<byte>(pool))
             {
                 Assert.AreEqual(pool.RentedArrays.Count, 1);
 
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
index 4f64eee4904..a79d5bb041d 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
@@ -35,7 +35,7 @@ public void Test_SpanOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
         {
             var pool = new TrackingArrayPool<int>();
 
-            using (var buffer = SpanOwner<int>.Allocate(127))
+            using (var buffer = SpanOwner<int>.Allocate(127, pool))
             {
                 Assert.AreEqual(pool.RentedArrays.Count, 1);
 

From f86a79b4b24ce664f0cd81cb5ba6cdf5bd151a5b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 23 Jun 2020 13:39:10 +0200
Subject: [PATCH 183/595] Minor code tweak

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index d1135f55d6b..d1133c7941e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -349,7 +349,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     foreach (var entry in pair.Value)
                     {
                         // Only select the ones with a matching token
-                        if (EqualityComparer<TToken>.Default.Equals(entry.Key, token))
+                        if (entry.Key.Equals(token))
                         {
                             entries[i++] = entry.Value;
                         }

From 31f906cb6785bb6e0fd22ea6821797398ad77bc6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 01:30:07 +0200
Subject: [PATCH 184/595] Added HasZeroByte APIs

---
 .../Helpers/BitHelper.cs                      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
index efe4d9ba4e8..2e72020fc29 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
@@ -103,6 +103,37 @@ public static bool HasLookupFlag(uint table, int x, int min = 0)
             return valid;
         }
 
+        /// <summary>
+        /// Checks whether the given value has any bytes that are set to 0.
+        /// That is, given a <see cref="uint"/> value, which has a total of 4 bytes,
+        /// it checks whether any of those have all the bits set to 0.
+        /// </summary>
+        /// <param name="value">The input value to check.</param>
+        /// <returns>Whether <paramref name="value"/> has any bytes set to 0.</returns>
+        /// <remarks>
+        /// This method contains no branches.
+        /// For more info, see <see href="https://graphics.stanford.edu/~seander/bithacks.html"/>.
+        /// </remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool HasZeroByte(uint value)
+        {
+            return ((value - 0x0101_0101u) & ~value & 0x8080_8080u) != 0;
+        }
+
+        /// <summary>
+        /// Checks whether the given value has any bytes that are set to 0.
+        /// This method mirrors <see cref="HasZeroByte(uint)"/>, but with <see cref="ulong"/> values.
+        /// </summary>
+        /// <param name="value">The input value to check.</param>
+        /// <returns>Whether <paramref name="value"/> has any bytes set to 0.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool HasZeroByte(ulong value)
+        {
+            return ((value - 0x0101_0101_0101_0101ul) & ~value & 0x8080_8080_8080_8080ul) != 0;
+        }
+
         /// <summary>
         /// Sets a bit to a specified value.
         /// </summary>

From 1110a83c811bf79cc76c282df5479f2f2f145941 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 01:40:55 +0200
Subject: [PATCH 185/595] Added tests for HasZeroByte

---
 .../Helpers/Test_BitHelper.cs                 | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
index 0dfdc3c8ba8..4f2c373029c 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
@@ -77,6 +77,43 @@ public void Test_BitHelper_HasLookupFlag32_WithMin(int x, bool flag)
             Assert.AreEqual(flag, BitHelper.HasLookupFlag(mask, x, 40));
         }
 
+        [TestCategory("BitHelper")]
+        [TestMethod]
+        [DataRow(0x0000_0000u, true)]
+        [DataRow(0x0000_0001u, true)]
+        [DataRow(0x0000_0011u, true)]
+        [DataRow(0x0011_1111u, true)]
+        [DataRow(0x1100_1111u, true)]
+        [DataRow(0x1011_0011u, true)]
+        [DataRow(0x1755_0055u, true)]
+        [DataRow(0x0055_B255u, true)]
+        [DataRow(0x1755_B200u, true)]
+        [DataRow(0x1111_1111u, false)]
+        [DataRow(0x1755_B255u, false)]
+        [DataRow(0x1705_B255u, false)]
+        [DataRow(0x1755_B055u, false)]
+        public void Test_BitHelper_HasZeroByte_UInt32(uint x, bool result)
+        {
+            Assert.AreEqual(result, BitHelper.HasZeroByte(x));
+        }
+
+        [TestCategory("BitHelper")]
+        [TestMethod]
+        [DataRow(0x0000_0000_0000_0000ul, true)]
+        [DataRow(0x0000_0000_0000_0001ul, true)]
+        [DataRow(0x0000_0000_0000_0011ul, true)]
+        [DataRow(0x0011_1111_1111_1111ul, true)]
+        [DataRow(0x1111_0011_1111_1111ul, true)]
+        [DataRow(0x7234_AB00_DEAD_BEEFul, true)]
+        [DataRow(0x7234_A542_DEAD_BEEFul, false)]
+        [DataRow(0x1111_1111_1111_1111ul, false)]
+        [DataRow(0x7234_A542_DEAD_B0EFul, false)]
+        [DataRow(0x7030_A040_0E0D_B0E0ul, false)]
+        public void Test_BitHelper_HasZeroByte_UInt64(ulong x, bool result)
+        {
+            Assert.AreEqual(result, BitHelper.HasZeroByte(x));
+        }
+
         [TestCategory("BitHelper")]
         [TestMethod]
         public void Test_BitHelper_SetFlag_UInt32()

From 4ebe64ad4dc4f22773b2610385a98df385998600 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 02:02:15 +0200
Subject: [PATCH 186/595] Added HasByteEqualTo APIs

---
 .../Helpers/BitHelper.cs                      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
index 2e72020fc29..eabce3cbd90 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
@@ -134,6 +134,37 @@ public static bool HasZeroByte(ulong value)
             return ((value - 0x0101_0101_0101_0101ul) & ~value & 0x8080_8080_8080_8080ul) != 0;
         }
 
+        /// <summary>
+        /// Checks whether a byte in the input <see cref="uint"/> value matches a target value.
+        /// </summary>
+        /// <param name="value">The input value to check.</param>
+        /// <param name="target">The target byte to look for.</param>
+        /// <returns>Whether <paramref name="value"/> has any bytes set to <paramref name="target"/>.</returns>
+        /// <remarks>
+        /// This method contains no branches.
+        /// For more info, see <see href="https://graphics.stanford.edu/~seander/bithacks.html"/>.
+        /// </remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool HasByteEqualTo(uint value, byte target)
+        {
+            return HasZeroByte(value ^ (0x0101_0101u * target));
+        }
+
+        /// <summary>
+        /// Checks whether a byte in the input <see cref="uint"/> value matches a target value.
+        /// This method mirrors <see cref="HasByteEqualTo(uint,byte)"/>, but with <see cref="ulong"/> values.
+        /// </summary>
+        /// <param name="value">The input value to check.</param>
+        /// <param name="target">The target byte to look for.</param>
+        /// <returns>Whether <paramref name="value"/> has any bytes set to <paramref name="target"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool HasByteEqualTo(ulong value, byte target)
+        {
+            return HasZeroByte(value ^ (0x0101_0101_0101_0101u * target));
+        }
+
         /// <summary>
         /// Sets a bit to a specified value.
         /// </summary>

From 72f48be9d677fad990ce446097505a134f4197af Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 02:08:39 +0200
Subject: [PATCH 187/595] Added tests for HasByteEqualTo

---
 .../Helpers/Test_BitHelper.cs                 | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
index 4f2c373029c..f7a76b15ccc 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
@@ -114,6 +114,50 @@ public void Test_BitHelper_HasZeroByte_UInt64(ulong x, bool result)
             Assert.AreEqual(result, BitHelper.HasZeroByte(x));
         }
 
+        [TestCategory("BitHelper")]
+        [TestMethod]
+        [DataRow(0x0000_0000u, 0x7B, false)]
+        [DataRow(0x0000_0001u, 0x7B, false)]
+        [DataRow(0x0000_1010u, 0x7B, false)]
+        [DataRow(0x0111_7A00u, 0x7B, false)]
+        [DataRow(0x0000_07B0u, 0x7B, false)]
+        [DataRow(0x1111_1111u, 0x7B, false)]
+        [DataRow(0x0000_FEFEu, 0xFF, false)]
+        [DataRow(0xF00F_0FF0u, 0xFF, false)]
+        [DataRow(0x0000_0000u, 0x00, true)]
+        [DataRow(0x0000_007Bu, 0x7B, true)]
+        [DataRow(0x0000_7B7Bu, 0x7B, true)]
+        [DataRow(0x7B00_0110u, 0x7B, true)]
+        [DataRow(0x00FF_0000u, 0xFF, true)]
+        [DataRow(0xFFFF_FFFFu, 0xFF, true)]
+        [DataRow(0x1515_1515u, 0x15, true)]
+        public void Test_BitHelper_HasByteEqualTo_UInt32(uint x, int target, bool result)
+        {
+            Assert.AreEqual(result, BitHelper.HasByteEqualTo(x, unchecked((byte)target)));
+        }
+
+        [TestCategory("BitHelper")]
+        [TestMethod]
+        [DataRow(0x0000_0000_0000_0000u, 0x7B, false)]
+        [DataRow(0x0000_0000_0000_0001u, 0x7B, false)]
+        [DataRow(0x0000_0000_0000_1010u, 0x7B, false)]
+        [DataRow(0x0111_0000_0000_7A00u, 0x7B, false)]
+        [DataRow(0x0000_0000_0000_07B0u, 0x7B, false)]
+        [DataRow(0x1111_1111_0000_0000u, 0x7B, false)]
+        [DataRow(0x0000_FEFE_0000_0000u, 0xFF, false)]
+        [DataRow(0xF00F_0000_0000_0FF0u, 0xFF, false)]
+        [DataRow(0x0000_0000_0000_0000u, 0x00, true)]
+        [DataRow(0x0000_0000_0000_007Bu, 0x7B, true)]
+        [DataRow(0x0000_7B7B_0000_0000u, 0x7B, true)]
+        [DataRow(0x7B00_0110_0000_0000u, 0x7B, true)]
+        [DataRow(0x00FF_0000_0000_0000u, 0xFF, true)]
+        [DataRow(0xFFFF_FFFF_FFFF_FFFFu, 0xFF, true)]
+        [DataRow(0x1515_1515_1515_1515u, 0x15, true)]
+        public void Test_BitHelper_HasByteEqualTo_UInt64(ulong x, int target, bool result)
+        {
+            Assert.AreEqual(result, BitHelper.HasByteEqualTo(x, unchecked((byte)target)));
+        }
+
         [TestCategory("BitHelper")]
         [TestMethod]
         public void Test_BitHelper_SetFlag_UInt32()

From 3a10a954437f15e95b261e07b1d7eb129163327e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 13:08:44 +0200
Subject: [PATCH 188/595] Added override support for events in ObservableObject

---
 .../ComponentModel/ObservableObject.cs        | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index ba10e81e10f..8acbf7d687b 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -29,21 +29,43 @@ public abstract class ObservableObject : INotifyPropertyChanged, INotifyProperty
         public event PropertyChangingEventHandler? PropertyChanging;
 
         /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event if needed.
+        /// Performs the required configuration when a property has changed, and then
+        /// raises the <see cref="PropertyChanged"/> event to notify listeners of the update.
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <remarks>The base implementation only raises the <see cref="PropertyChanged"/> event.</remarks>
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null!)
         {
-            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            RaisePropertyChanged(propertyName);
         }
 
         /// <summary>
-        /// Raises the <see cref="PropertyChanging"/> event if needed.
+        /// Performs the required configuration when a property is changing, and then
+        /// raises the <see cref="PropertyChanged"/> event to notify listeners of the update.
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <remarks>The base implementation only raises the <see cref="PropertyChanging"/> event.</remarks>
         protected virtual void OnPropertyChanging([CallerMemberName] string propertyName = null!)
         {
-            this.PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+            RaisePropertyChanging(propertyName);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="PropertyChanging"/> event if needed.
+        /// </summary>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        private void RaisePropertyChanged(string propertyName)
+        {
+            PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// Raises the <see cref="PropertyChanged"/> event if needed.
+        /// </summary>
+        /// <param name="propertyName">The name of the property that changed.</param>
+        private void RaisePropertyChanging(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -67,11 +89,11 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
                 return false;
             }
 
-            this.OnPropertyChanging(propertyName);
+            OnPropertyChanging(propertyName);
 
             field = newValue;
 
-            this.OnPropertyChanged(propertyName);
+            OnPropertyChanged(propertyName);
 
             return true;
         }
@@ -101,11 +123,11 @@ protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberN
                 return false;
             }
 
-            this.OnPropertyChanging(propertyName);
+            OnPropertyChanging(propertyName);
 
             callback(newValue);
 
-            this.OnPropertyChanged(propertyName);
+            OnPropertyChanged(propertyName);
 
             return true;
         }
@@ -192,11 +214,11 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
                 return false;
             }
 
-            this.OnPropertyChanging(propertyName);
+            OnPropertyChanging(propertyName);
 
             targetPropertyInfo.SetValue(parent, newValue);
 
-            this.OnPropertyChanged(propertyName);
+            OnPropertyChanged(propertyName);
 
             return true;
         }
@@ -247,7 +269,7 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
             // scheduling the method to monitor its completion.
             bool isAlreadyCompletedOrNull = newValue?.IsCompleted ?? true;
 
-            this.OnPropertyChanging(propertyName);
+            OnPropertyChanging(propertyName);
 
             field = newValue;
 

From ab467ec8e7f6f8785a6c1eb3c4ce7b54627e1c5e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 13:57:00 +0200
Subject: [PATCH 189/595] Fixed a typo

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index d1133c7941e..bde91e51ce5 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -367,7 +367,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             }
             finally
             {
-                // Remove references to avoid leaks coming from the shader memory pool.
+                // Remove references to avoid leaks coming from the shared memory pool.
                 // We manually create a span and clear it as a small optimization, as
                 // arrays rented from the pool can be larger than the requested size.
                 entries.AsSpan(0, i).Clear();

From 60b1a652465f3f28e46f57ceffb0c90afe600904 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:09:16 +0200
Subject: [PATCH 190/595] Improved nullability annotations

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 22 +++++++++----------
 .../DictionarySlim{TKey,TValue}.cs            | 21 ++++++++++++------
 .../IDictionarySlim{TKey,TValue}.cs           |  1 +
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index bde91e51ce5..7e91ebd06f6 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -122,12 +122,12 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 // Get the <TMessage, TToken> registration list for this recipient
                 Mapping<TMessage, TToken> values = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, Action<TMessage>> map = ref values.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, Action<TMessage>>? map = ref values.GetOrAddValueRef(key);
 
                 map ??= new DictionarySlim<TToken, Action<TMessage>>();
 
                 // Add the new registration entry
-                ref Action<TMessage> handler = ref map.GetOrAddValueRef(token);
+                ref Action<TMessage>? handler = ref map.GetOrAddValueRef(token);
 
                 if (!(handler is null))
                 {
@@ -137,7 +137,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 handler = action;
 
                 // Make sure this registration map is tracked for the current recipient
-                ref HashSet<IMapping> set = ref this.recipientsMap.GetOrAddValueRef(key);
+                ref HashSet<IMapping>? set = ref this.recipientsMap.GetOrAddValueRef(key);
 
                 set ??= new HashSet<IMapping>();
 
@@ -153,13 +153,13 @@ public void Unregister(object recipient)
                 // If the recipient has no registered messages at all, ignore
                 var key = new Recipient(recipient);
 
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping> set))
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping>? set))
                 {
                     return;
                 }
 
                 // Removes all the lists of registered handlers for the recipient
-                foreach (IMapping map in set)
+                foreach (IMapping map in set!)
                 {
                     map.Remove(key);
 
@@ -191,7 +191,7 @@ public void Unregister<TToken>(object recipient, TToken token)
                 // Get the shared set of mappings for the recipient, if present
                 var key = new Recipient(recipient);
 
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping> set))
+                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping>? set))
                 {
                     return;
                 }
@@ -200,7 +200,7 @@ public void Unregister<TToken>(object recipient, TToken token)
                 // array, as we can't modify the contents of the set while iterating it.
                 // The rented buffer is oversized and will also include mappings for
                 // handlers of messages that are registered through a different token.
-                var maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set.Count);
+                var maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set!.Count);
                 int i = 0;
 
                 try
@@ -278,13 +278,13 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                 var key = new Recipient(recipient);
 
-                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>> map))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>>? map))
                 {
                     return;
                 }
 
                 // Remove the target handler
-                map.Remove(token);
+                map!.Remove(token);
 
                 // If the map is empty, it means that the current recipient has no remaining
                 // registered handlers for the current <TMessage, TToken> combination, regardless,
@@ -412,7 +412,7 @@ private bool TryGetMapping<TMessage, TToken>(out Mapping<TMessage, TToken>? mapp
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
 
-            if (this.typesMap.TryGetValue(key, out IMapping target))
+            if (this.typesMap.TryGetValue(key, out IMapping? target))
             {
                 // This method and the ones above are the only ones handling values in the types map,
                 // and here we are sure that the object reference we have points to an instance of the
@@ -440,7 +440,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
             where TToken : IEquatable<TToken>
         {
             var key = new Type2(typeof(TMessage), typeof(TToken));
-            ref IMapping target = ref this.typesMap.GetOrAddValueRef(key);
+            ref IMapping? target = ref this.typesMap.GetOrAddValueRef(key);
 
             target ??= new Mapping<TMessage, TToken>();
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 71caa4ce71c..27bd7a2e068 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -34,6 +34,7 @@ namespace Microsoft.Collections.Extensions
     [DebuggerDisplay("Count = {Count}")]
     internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : IEquatable<TKey>
+        where TValue : class
     {
         // See info in CoreFX labs for how this works
         private static readonly Entry[] InitialEntries = new Entry[1];
@@ -45,7 +46,7 @@ internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         private struct Entry
         {
             public TKey Key;
-            public TValue Value;
+            public TValue? Value;
             public int Next;
         }
 
@@ -74,7 +75,7 @@ public TValue this[TKey key]
                 {
                     if (key.Equals(entries[i].Key))
                     {
-                        return entries[i].Value;
+                        return entries[i].Value!;
                     }
                 }
 
@@ -117,7 +118,7 @@ public bool ContainsKey(TKey key)
         /// <param name="key">The key to look for.</param>
         /// <param name="value">The value found, otherwise <see langword="default"/>.</param>
         /// <returns>Whether or not the key was present.</returns>
-        public bool TryGetValue(TKey key, out TValue value)
+        public bool TryGetValue(TKey key, out TValue? value)
         {
             Entry[] entries = this.entries;
 
@@ -127,7 +128,7 @@ public bool TryGetValue(TKey key, out TValue value)
             {
                 if (key.Equals(entries[i].Key))
                 {
-                    value = entries[i].Value;
+                    value = entries[i].Value!;
 
                     return true;
                 }
@@ -183,7 +184,7 @@ public bool Remove(TKey key)
         /// </summary>
         /// <param name="key">Key to look for</param>
         /// <returns>Reference to the new or existing value</returns>
-        public ref TValue GetOrAddValueRef(TKey key)
+        public ref TValue? GetOrAddValueRef(TKey key)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
@@ -201,8 +202,14 @@ public ref TValue GetOrAddValueRef(TKey key)
             return ref AddKey(key, bucketIndex);
         }
 
+        /// <summary>
+        /// Creates a slot for a new value to add for a specified key.
+        /// </summary>
+        /// <param name="key">The key to use to add the new value.</param>
+        /// <param name="bucketIndex">The target bucked index to use.</param>
+        /// <returns>A reference to the slot for the new value to add.</returns>
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private ref TValue AddKey(TKey key, int bucketIndex)
+        private ref TValue? AddKey(TKey key, int bucketIndex)
         {
             Entry[] entries = this.entries;
             int entryIndex;
@@ -307,7 +314,7 @@ public bool MoveNext()
 
                 this.current = new KeyValuePair<TKey, TValue>(
                     entries[this.index].Key,
-                    entries[this.index++].Value);
+                    entries[this.index++].Value!);
 
                 return true;
             }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index e7d3152b25b..502df04e3c0 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Collections.Extensions
     /// <typeparam name="TValue">The covariant type of values in the dictionary.</typeparam>
     internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
         where TKey : IEquatable<TKey>
+        where TValue : class
     {
         /// <summary>
         /// Gets the value with the specified key.

From 2d470eaabfeae82c6ab73fa632d780bd52d017b1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:11:31 +0200
Subject: [PATCH 191/595] Added IDictionarySlim<TKey, TValue>.TryRemove API

---
 .../DictionarySlim{TKey,TValue}.cs            | 21 ++++++++++++++++---
 .../IDictionarySlim{TKey,TValue}.cs           |  8 +++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 27bd7a2e068..ecb57838045 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -140,7 +140,7 @@ public bool TryGetValue(TKey key, out TValue? value)
         }
 
         /// <inheritdoc/>
-        public bool Remove(TKey key)
+        public TValue? TryRemove(TKey key, out bool success)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
@@ -150,6 +150,7 @@ public bool Remove(TKey key)
             while (entryIndex != -1)
             {
                 Entry candidate = entries[entryIndex];
+
                 if (candidate.Key.Equals(key))
                 {
                     if (lastIndex != -1)
@@ -167,14 +168,28 @@ public bool Remove(TKey key)
                     this.freeList = entryIndex;
 
                     this.count--;
-                    return true;
+
+                    success = true;
+
+                    return candidate.Value;
                 }
 
                 lastIndex = entryIndex;
                 entryIndex = candidate.Next;
             }
 
-            return false;
+            success = false;
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool Remove(TKey key)
+        {
+            _ = TryRemove(key, out bool success);
+
+            return success;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index 502df04e3c0..46bb6c01d36 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -23,5 +23,13 @@ internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
         /// <returns>The returned value.</returns>
         /// <exception cref="ArgumentException">Thrown if the key wasn't present.</exception>
         TValue this[TKey key] { get; }
+
+        /// <summary>
+        /// Tries to remove a value with a specified key.
+        /// </summary>
+        /// <param name="key">The key of the value to remove.</param>
+        /// <param name="success">Whether or not the key was present.</param>
+        /// <returns>The removed value, if it was present.</returns>
+        TValue? TryRemove(TKey key, out bool success);
     }
 }

From 5f06cdef6b13feb24fb658f197881affa3599299 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:19:56 +0200
Subject: [PATCH 192/595] Added object base version of TryRemove API

---
 .../DictionarySlim{TKey,TValue}.cs                       | 6 ++++++
 .../IDictionarySlim{TKey,TValue}.cs                      | 9 ++-------
 .../IDictionarySlim{TKey}.cs                             | 8 ++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index ecb57838045..0d610b3ad3c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -139,6 +139,12 @@ public bool TryGetValue(TKey key, out TValue? value)
             return false;
         }
 
+        /// <inheritdoc/>
+        object? IDictionarySlim<TKey>.TryRemove(TKey key, out bool success)
+        {
+            return TryRemove(key, out success);
+        }
+
         /// <inheritdoc/>
         public TValue? TryRemove(TKey key, out bool success)
         {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index 46bb6c01d36..e6aa0bf5251 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -24,12 +24,7 @@ internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
         /// <exception cref="ArgumentException">Thrown if the key wasn't present.</exception>
         TValue this[TKey key] { get; }
 
-        /// <summary>
-        /// Tries to remove a value with a specified key.
-        /// </summary>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <param name="success">Whether or not the key was present.</param>
-        /// <returns>The removed value, if it was present.</returns>
-        TValue? TryRemove(TKey key, out bool success);
+        /// <inheritdoc cref="IDictionarySlim{TKey}.TryRemove(TKey,out bool)"/>
+        new TValue? TryRemove(TKey key, out bool success);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index efcf57e5a68..3cf29749959 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -18,6 +18,14 @@ internal interface IDictionarySlim<in TKey>
         /// </summary>
         int Count { get; }
 
+        /// <summary>
+        /// Tries to remove a value with a specified key.
+        /// </summary>
+        /// <param name="key">The key of the value to remove.</param>
+        /// <param name="success">Whether or not the key was present.</param>
+        /// <returns>The removed value, if it was present.</returns>
+        object? TryRemove(TKey key, out bool success);
+
         /// <summary>
         /// Removes an item from the dictionary with the specified key, if present.
         /// </summary>

From 2876669e76026e007726d7184143be931fd6d870 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:24:18 +0200
Subject: [PATCH 193/595] Added IDictionarySlim interface

---
 .../IDictionarySlim.cs                        | 22 +++++++++++++++++++
 .../IDictionarySlim{TKey}.cs                  | 12 +---------
 2 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs
new file mode 100644
index 00000000000..f3c897752f7
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs
@@ -0,0 +1,22 @@
+// 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.Collections.Extensions
+{
+    /// <summary>
+    /// A base interface masking <see cref="DictionarySlim{TKey,TValue}"/> instances and exposing non-generic functionalities.
+    /// </summary>
+    internal interface IDictionarySlim
+    {
+        /// <summary>
+        /// Gets the count of entries in the dictionary.
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Clears the current dictionary.
+        /// </summary>
+        void Clear();
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 3cf29749959..1b4bd173cd8 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -10,14 +10,9 @@ namespace Microsoft.Collections.Extensions
     /// An interface providing key type contravariant access to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
     /// </summary>
     /// <typeparam name="TKey">The contravariant type of keys in the dictionary.</typeparam>
-    internal interface IDictionarySlim<in TKey>
+    internal interface IDictionarySlim<in TKey> : IDictionarySlim
         where TKey : IEquatable<TKey>
     {
-        /// <summary>
-        /// Gets the count of entries in the dictionary.
-        /// </summary>
-        int Count { get; }
-
         /// <summary>
         /// Tries to remove a value with a specified key.
         /// </summary>
@@ -32,10 +27,5 @@ internal interface IDictionarySlim<in TKey>
         /// <param name="key">The key of the item to remove.</param>
         /// <returns>Whether or not an item was removed.</returns>
         bool Remove(TKey key);
-
-        /// <summary>
-        /// Clears the current dictionary.
-        /// </summary>
-        void Clear();
     }
 }

From cf053f6e495144913ab69f8a7c1d0c0b890e0137 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:40:38 +0200
Subject: [PATCH 194/595] Added property to track the total handlers

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 138 +++++++++++-------
 1 file changed, 89 insertions(+), 49 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 7e91ebd06f6..77efa990f75 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -120,9 +120,9 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
             lock (this.recipientsMap)
             {
                 // Get the <TMessage, TToken> registration list for this recipient
-                Mapping<TMessage, TToken> values = GetOrAddMapping<TMessage, TToken>();
+                Mapping<TMessage, TToken> mapping = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, Action<TMessage>>? map = ref values.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, Action<TMessage>>? map = ref mapping.GetOrAddValueRef(key);
 
                 map ??= new DictionarySlim<TToken, Action<TMessage>>();
 
@@ -136,12 +136,15 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
 
                 handler = action;
 
+                // Update the total counter for handlers for the current type parameters
+                mapping.TotalHandlersCount++;
+
                 // Make sure this registration map is tracked for the current recipient
                 ref HashSet<IMapping>? set = ref this.recipientsMap.GetOrAddValueRef(key);
 
                 set ??= new HashSet<IMapping>();
 
-                set.Add(values);
+                set.Add(mapping);
             }
         }
 
@@ -159,21 +162,36 @@ public void Unregister(object recipient)
                 }
 
                 // Removes all the lists of registered handlers for the recipient
-                foreach (IMapping map in set!)
+                foreach (IMapping mapping in set!)
                 {
-                    map.Remove(key);
+                    object? handlersMap = mapping.TryRemove(key, out bool success);
 
-                    if (map.Count == 0)
+                    if (success)
                     {
-                        // Maps here are really of type Mapping<,> and with unknown type arguments.
-                        // If after removing the current recipient a given map becomes empty, it means
-                        // that there are no registered recipients at all for a given pair of message
-                        // and token types. In that case, we also remove the map from the types map.
-                        // The reason for keeping a key in each mapping is that removing items from a
-                        // dictionary (a hashed collection) only costs O(1) in the best case, while
-                        // if we had tried to iterate the whole dictionary every time we would have
-                        // paid an O(n) minimum cost for each single remove operation.
-                        this.typesMap.Remove(map.TypeArguments);
+                        // If this branch is taken, it means the target recipient to unregister
+                        // had at least one registered handler for the current <TToken, TMessage>
+                        // pair of type parameters, which here is masked out by the IMapping interface.
+                        // Before removing the handlers, we need to retrieve the count of how many handlers
+                        // are being removed, in order to update the total counter for the mapping.
+                        // Just casting the dictionary to the base interface and accessing the Count
+                        // property directly gives us O(1) access time to retrieve this count.
+                        // The handlers map is the IDictionary<TToken, TMessage> instance for the mapping.
+                        int handlersCount = Unsafe.As<IDictionarySlim>(handlersMap).Count;
+
+                        mapping.TotalHandlersCount -= handlersCount;
+
+                        if (mapping.Count == 0)
+                        {
+                            // Maps here are really of type Mapping<,> and with unknown type arguments.
+                            // If after removing the current recipient a given map becomes empty, it means
+                            // that there are no registered recipients at all for a given pair of message
+                            // and token types. In that case, we also remove the map from the types map.
+                            // The reason for keeping a key in each mapping is that removing items from a
+                            // dictionary (a hashed collection) only costs O(1) in the best case, while
+                            // if we had tried to iterate the whole dictionary every time we would have
+                            // paid an O(n) minimum cost for each single remove operation.
+                            this.typesMap.Remove(mapping.TypeArguments);
+                        }
                     }
                 }
 
@@ -208,9 +226,9 @@ public void Unregister<TToken>(object recipient, TToken token)
                     foreach (IMapping item in set)
                     {
                         // Select all mappings using the same token type
-                        if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> map)
+                        if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> mapping)
                         {
-                            maps[i++] = map;
+                            maps[i++] = mapping;
                         }
                     }
 
@@ -228,27 +246,37 @@ public void Unregister<TToken>(object recipient, TToken token)
                         // the mappings for the target recipiets: it is guaranteed to be here.
                         IDictionarySlim<TToken> holder = map[key];
 
-                        // Remove the registered handler for the input token,
+                        // Try to remove the registered handler for the input token,
                         // for the current message type (unknown from here).
-                        holder.Remove(token);
-
-                        if (holder.Count == 0)
+                        if (holder.Remove(token))
                         {
-                            // If the map is empty, remove the recipient entirely from its container
-                            map.Remove(key);
-
-                            if (map.Count == 0)
+                            // As above, we need to update the total number of registered handlers for the map.
+                            // In this case we also know that the current TToken type parameter is of interest
+                            // for the current method, as we're only unsubscribing handlers using that token.
+                            // This is because we're already working on the final <TToken, TMessage> mapping,
+                            // which associates a single handler with a given token, for a given recipient.
+                            // This means that we don't have to retrieve the count to subtract in this case,
+                            // we're just removing a single handler at a time. So, we just decrement the total.
+                            Unsafe.As<IMapping>(map).TotalHandlersCount--;
+
+                            if (holder.Count == 0)
                             {
-                                // If no handlers are left at all for the recipient, across all
-                                // message types and token types, remove the set of mappings
-                                // entirely for the current recipient, and lost the strong
-                                // reference to it as well. This is the same situation that
-                                // would've been achieved by just calling Unregister(recipient).
-                                set.Remove(Unsafe.As<IMapping>(map));
-
-                                if (set.Count == 0)
+                                // If the map is empty, remove the recipient entirely from its container
+                                map.Remove(key);
+
+                                if (map.Count == 0)
                                 {
-                                    this.recipientsMap.Remove(key);
+                                    // If no handlers are left at all for the recipient, across all
+                                    // message types and token types, remove the set of mappings
+                                    // entirely for the current recipient, and lost the strong
+                                    // reference to it as well. This is the same situation that
+                                    // would've been achieved by just calling Unregister(recipient).
+                                    set.Remove(Unsafe.As<IMapping>(map));
+
+                                    if (set.Count == 0)
+                                    {
+                                        this.recipientsMap.Remove(key);
+                                    }
                                 }
                             }
                         }
@@ -278,30 +306,34 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                 var key = new Recipient(recipient);
 
-                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>>? map))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>>? dictionary))
                 {
                     return;
                 }
 
                 // Remove the target handler
-                map!.Remove(token);
-
-                // If the map is empty, it means that the current recipient has no remaining
-                // registered handlers for the current <TMessage, TToken> combination, regardless,
-                // of the specific token value (ie. the channel used to receive messages of that type).
-                // We can remove the map entirely from this container, and remove the link to the map itself
-                // to the static mapping between existing registered recipients.
-                if (map.Count == 0)
+                if (dictionary!.Remove(token))
                 {
-                    mapping.Remove(key);
+                    // Decrement the total count, as above
+                    mapping.TotalHandlersCount--;
+
+                    // If the map is empty, it means that the current recipient has no remaining
+                    // registered handlers for the current <TMessage, TToken> combination, regardless,
+                    // of the specific token value (ie. the channel used to receive messages of that type).
+                    // We can remove the map entirely from this container, and remove the link to the map itself
+                    // to the static mapping between existing registered recipients.
+                    if (dictionary.Count == 0)
+                    {
+                        mapping.Remove(key);
 
-                    HashSet<IMapping> set = this.recipientsMap[key];
+                        HashSet<IMapping> set = this.recipientsMap[key];
 
-                    set.Remove(mapping);
+                        set.Remove(mapping);
 
-                    if (set.Count == 0)
-                    {
-                        this.recipientsMap.Remove(key);
+                        if (set.Count == 0)
+                        {
+                            this.recipientsMap.Remove(key);
+                        }
                     }
                 }
             }
@@ -470,6 +502,9 @@ public Mapping()
 
             /// <inheritdoc/>
             public Type2 TypeArguments { get; }
+
+            /// <inheritdoc/>
+            public int TotalHandlersCount { get; set; }
         }
 
         /// <summary>
@@ -482,6 +517,11 @@ private interface IMapping : IDictionarySlim<Recipient>
             /// Gets the <see cref="Type2"/> instance representing the current type arguments.
             /// </summary>
             Type2 TypeArguments { get; }
+
+            /// <summary>
+            /// Gets or sets the total number of handlers in the current instance.
+            /// </summary>
+            int TotalHandlersCount { get; set; }
         }
 
         /// <summary>

From 279a5e974a1fb42ad8c585ff4b9fb6ba8c86090f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 17:55:05 +0200
Subject: [PATCH 195/595] ~17% speedup in Messenger.Send

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 77efa990f75..4f199543d7e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -355,18 +355,12 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                // Count the total number of recipients (including with different tokens)
-                foreach (var pair in mapping!)
-                {
-                    i += pair.Value.Count;
-                }
-
                 // We need to make a local copy of the currently registered handlers,
                 // since users might try to unregister (or register) new handlers from
                 // inside one of the currently existing handlers. We can use memory pooling
                 // to reuse arrays, to minimize the average memory usage. In practice,
                 // we usually just need to pay the small overhead of copying the items.
-                entries = ArrayPool<Action<TMessage>>.Shared.Rent(i);
+                entries = ArrayPool<Action<TMessage>>.Shared.Rent(mapping!.TotalHandlersCount);
 
                 // Copy the handlers to the local collection.
                 // Both types being enumerate expose a struct enumerator,
@@ -375,7 +369,6 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // handlers for different tokens. We can reuse the same variable
                 // to count the number of matching handlers to invoke later on.
                 // This will be the array slice with valid actions in the rented buffer.
-                i = 0;
                 foreach (var pair in mapping)
                 {
                     foreach (var entry in pair.Value)

From 8f2bfe215ad68061b1e238428bd846efc51a6262 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 18:05:00 +0200
Subject: [PATCH 196/595] Removed unnecessary overload

---
 .../DictionarySlim{TKey,TValue}.cs                        | 8 +-------
 .../IDictionarySlim{TKey,TValue}.cs                       | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 0d610b3ad3c..677c72271ee 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -140,13 +140,7 @@ public bool TryGetValue(TKey key, out TValue? value)
         }
 
         /// <inheritdoc/>
-        object? IDictionarySlim<TKey>.TryRemove(TKey key, out bool success)
-        {
-            return TryRemove(key, out success);
-        }
-
-        /// <inheritdoc/>
-        public TValue? TryRemove(TKey key, out bool success)
+        public object? TryRemove(TKey key, out bool success)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
index e6aa0bf5251..502df04e3c0 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
@@ -23,8 +23,5 @@ internal interface IDictionarySlim<in TKey, out TValue> : IDictionarySlim<TKey>
         /// <returns>The returned value.</returns>
         /// <exception cref="ArgumentException">Thrown if the key wasn't present.</exception>
         TValue this[TKey key] { get; }
-
-        /// <inheritdoc cref="IDictionarySlim{TKey}.TryRemove(TKey,out bool)"/>
-        new TValue? TryRemove(TKey key, out bool success);
     }
 }

From 10cafd51ea671bedc0f0de2e0e30c6b5d6a6a157 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 18:38:34 +0200
Subject: [PATCH 197/595] ~88% speedup in Messenger.Send

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 20 +++++++---
 .../DictionarySlim{TKey,TValue}.cs            | 37 ++++++++++++++-----
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 4f199543d7e..5312fa41e0a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -369,14 +369,20 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // handlers for different tokens. We can reuse the same variable
                 // to count the number of matching handlers to invoke later on.
                 // This will be the array slice with valid actions in the rented buffer.
-                foreach (var pair in mapping)
+                var mappingEnumerator = mapping.GetEnumerator();
+
+                // Explicit enumerator usage here as we're using a custom one
+                // that doesn't expose the single standard Current property.
+                while (mappingEnumerator.MoveNext())
                 {
-                    foreach (var entry in pair.Value)
+                    var pairsEnumerator = mappingEnumerator.Value.GetEnumerator();
+
+                    while (pairsEnumerator.MoveNext())
                     {
                         // Only select the ones with a matching token
-                        if (entry.Key.Equals(token))
+                        if (pairsEnumerator.Key.Equals(token))
                         {
-                            entries[i++] = entry.Value;
+                            entries[i++] = pairsEnumerator.Value;
                         }
                     }
                 }
@@ -408,10 +414,12 @@ public void Reset()
         {
             lock (this.recipientsMap)
             {
-                foreach (var pair in this.recipientsMap)
+                var recipientsEnumerator = this.recipientsMap.GetEnumerator();
+
+                while (recipientsEnumerator.MoveNext())
                 {
                     // Clear all the typed maps, as they're assigned to static fields
-                    foreach (var map in pair.Value)
+                    foreach (var map in recipientsEnumerator.Value)
                     {
                         map.Clear();
                     }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 677c72271ee..2cdadb99766 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -11,6 +11,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Collections.Extensions
@@ -288,6 +289,8 @@ private Entry[] Resize()
         }
 
         /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Enumerator GetEnumerator() => new Enumerator(this);
 
         /// <summary>
@@ -298,14 +301,13 @@ public ref struct Enumerator
             private readonly Entry[] entries;
             private int index;
             private int count;
-            private KeyValuePair<TKey, TValue> current;
 
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             internal Enumerator(DictionarySlim<TKey, TValue> dictionary)
             {
                 this.entries = dictionary.entries;
                 this.index = 0;
                 this.count = dictionary.count;
-                this.current = default;
             }
 
             /// <inheritdoc cref="IEnumerator.MoveNext"/>
@@ -313,8 +315,6 @@ public bool MoveNext()
             {
                 if (this.count == 0)
                 {
-                    this.current = default;
-
                     return false;
                 }
 
@@ -327,18 +327,35 @@ public bool MoveNext()
                     this.index++;
                 }
 
-                this.current = new KeyValuePair<TKey, TValue>(
-                    entries[this.index].Key,
-                    entries[this.index++].Value!);
+                // We need to preemptively increment the current index so that we still correctly keep track
+                // of the current position in the dictionary even if the users doesn't access any of the
+                // available properties in the enumerator. As this is a possibility, we can't rely on one of
+                // them to increment the index before MoveNext is invoked again. We ditch the standard enumerator
+                // API surface here to expose the Key/Value properties directly and minimize the memory copies.
+                // For the same reason, we also removed the KeyValuePair<TKey, TValue> field here, and instead
+                // rely on the properties lazily accessing the target instances directly from the current entry
+                // pointed at by the index property (adjusted backwards to account for the increment here).
+                this.index++;
 
                 return true;
             }
 
-            /// <inheritdoc cref="IEnumerator{T}.Current"/>
-            public KeyValuePair<TKey, TValue> Current
+            /// <summary>
+            /// Gets the current key.
+            /// </summary>
+            public TKey Key
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get => this.entries[this.index - 1].Key;
+            }
+
+            /// <summary>
+            /// Gets the current value.
+            /// </summary>
+            public TValue Value
             {
                 [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get => this.current;
+                get => this.entries[this.index - 1].Value!;
             }
         }
 

From 4ece5a56fd0e8c9c693f4b092c4363cb09d5de5b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 24 Jun 2020 19:30:11 +0200
Subject: [PATCH 198/595] Fixed a refactoring typo

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 8acbf7d687b..94767f4dd4d 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -56,7 +56,7 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
         /// <param name="propertyName">The name of the property that changed.</param>
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ private void RaisePropertyChanged(string propertyName)
         /// <param name="propertyName">The name of the property that changed.</param>
         private void RaisePropertyChanging(string propertyName)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
 
         /// <summary>

From 6b3bbc032ee78dcb87d07b543577d5bed1e2dbfc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 01:49:44 +0200
Subject: [PATCH 199/595] Fixed merge issue

Some test files were leftover in the .csproj from the MVVM branch, but had been moved to the shared test project in master
---
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index d0ffe9d927d..8f9d87d9287 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -132,10 +132,6 @@
     <Compile Include="Converters\Test_EmptyStringToObjectConverter.cs" />
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
-    <Compile Include="Extensions\Test_TaskExtensions.cs" />
-    <Compile Include="Extensions\Test_TypeExtensions.cs" />
-    <Compile Include="Extensions\Test_ValueTypeExtensions.cs" />
-    <Compile Include="Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="Extensions\Test_BitmapIconExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconSourceExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconExtensionMarkupExtension.cs" />

From e7449281a519d8e6457ad5593ae051a0f4cd5bdd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 13:26:16 +0200
Subject: [PATCH 200/595] Added tests for TaskExtensions class

---
 .../Extensions/Test_ArrayExtensions - Copy.cs | 65 +++++++++++++++++++
 .../UnitTests.Shared.projitems                |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs

diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs b/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs
new file mode 100644
index 00000000000..526d22a8fd3
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs	
@@ -0,0 +1,65 @@
+// 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.Threading.Tasks;
+using Microsoft.Toolkit.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_TaskExtensions
+    {
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_ResultOrDefault_Int32()
+        {
+            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
+
+            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetResult(42);
+
+            Assert.AreEqual(42, tcs.Task.ResultOrDefault());
+        }
+
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_ResultOrDefault_String()
+        {
+            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
+
+            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetResult("Hello world");
+
+            Assert.AreEqual("Hello world", tcs.Task.ResultOrDefault());
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index 37096ae6724..ee558755f85 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -18,6 +18,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Array.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Comparable.Numeric.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions - Copy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />

From fcaa59eb73a3d9fc01f38be6d32fe2612fcfab71 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 13:39:59 +0200
Subject: [PATCH 201/595] Fixed a copy-paste error in filename

---
 .../{Test_ArrayExtensions - Copy.cs => Test_TaskExtensions.cs}  | 0
 UnitTests/UnitTests.Shared/UnitTests.Shared.projitems           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename UnitTests/UnitTests.Shared/Extensions/{Test_ArrayExtensions - Copy.cs => Test_TaskExtensions.cs} (100%)

diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
similarity index 100%
rename from UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions - Copy.cs
rename to UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index ee558755f85..ecfb47e2522 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -18,7 +18,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Array.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Comparable.Numeric.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions - Copy.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TaskExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />

From 95ac72f5043b622ca94fe2e9b022e01f65ed5798 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 13:50:16 +0200
Subject: [PATCH 202/595] Added tests for TaskResultConverter class

---
 .../Converters/TaskResultConverter.cs         |   7 +-
 .../Converters/Test_TaskResultConverter.cs    | 165 ++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   1 +
 3 files changed, 169 insertions(+), 4 deletions(-)
 create mode 100644 UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
index 4ad5d974dfe..b834c0a9e0a 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.Contracts;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Extensions;
 using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.UI.Converters
@@ -42,7 +41,7 @@ public static object Convert(Task task)
         [Pure]
         public static T Convert<T>(Task<T> task)
         {
-            return task.ResultOrDefault();
+            return task.IsCompletedSuccessfully ? task.Result : default;
         }
 
         /// <inheritdoc/>
@@ -56,10 +55,10 @@ public object Convert(object value, Type targetType, object parameter, string la
             }
 
             Type taskType = task.GetType();
-            Type[] typeArguments = taskType.GetGenericArguments();
 
             // Check if the task is actually some Task<T>
-            if (typeArguments.Length != 1)
+            if (!taskType.IsGenericType ||
+                taskType.GetGenericTypeDefinition() != typeof(Task<>))
             {
                 return null;
             }
diff --git a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
new file mode 100644
index 00000000000..e96bf16f27f
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
@@ -0,0 +1,165 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.UI.Converters;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+
+namespace UnitTests.Converters
+{
+    [TestClass]
+    public class Test_TaskResultConverter
+    {
+        [TestCategory("Converters")]
+        [UITestMethod]
+        [ExpectedException(typeof(NotImplementedException))]
+        public void Test_TaskResultConverter_Static_Obsolete()
+        {
+            _ = TaskResultConverter.Convert(Task.CompletedTask);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_TaskResultConverter_Static_Int32()
+        {
+            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
+
+            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetResult(42);
+
+            Assert.AreEqual(42, TaskResultConverter.Convert(tcs.Task));
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_TaskResultConverter_Static_String()
+        {
+            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
+
+            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetResult("Hello world");
+
+            Assert.AreEqual("Hello world", TaskResultConverter.Convert(tcs.Task));
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_TaskResultConverter_Instance_Int32()
+        {
+            var converter = new TaskResultConverter();
+
+            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetResult(42);
+
+            Assert.AreEqual(42, converter.Convert(tcs.Task, null, null, null));
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_TaskResultConverter_Instance_String()
+        {
+            var converter = new TaskResultConverter();
+
+            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(null, converter.Convert(tcs.Task, null, null, null));
+
+            tcs = new TaskCompletionSource<string>();
+
+            tcs.SetResult("Hello world");
+
+            Assert.AreEqual("Hello world", converter.Convert(tcs.Task, null, null, null));
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_TaskResultConverter_Instance_Null()
+        {
+            var converter = new TaskResultConverter();
+
+            Assert.AreEqual(null, converter.Convert(null, null, null, null));
+            Assert.AreEqual(null, converter.Convert("Hello world", null, null, null));
+
+            var cts = new CancellationTokenSource();
+
+            cts.Cancel();
+
+            Assert.AreEqual(null, converter.Convert(Task.FromCanceled(cts.Token), null, null, null));
+            Assert.AreEqual(null, converter.Convert(Task.FromException(new Exception()), null, null, null));
+            Assert.AreEqual(null, converter.Convert(Task.CompletedTask, null, null, null));
+            
+            TaskCompletionSource<int> tcs1 = new TaskCompletionSource<int>();
+            
+            Assert.AreEqual(null, converter.Convert(tcs1.Task, null, null, null));
+
+            TaskCompletionSource<string> tcs2 = new TaskCompletionSource<string>();
+
+            Assert.AreEqual(null, converter.Convert(tcs2.Task, null, null, null));
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        [ExpectedException(typeof(NotImplementedException))]
+        public void Test_TaskResultConverter_Instance_ConvertBack()
+        {
+            var converter = new TaskResultConverter();
+
+            Assert.AreEqual(null, converter.ConvertBack(null, null, null, null));
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 8f9d87d9287..8b0332e1b5c 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -127,6 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\Test_AdaptiveHeightValueConverter.cs" />
+    <Compile Include="Converters\Test_TaskResultConverter.cs" />
     <Compile Include="Converters\Test_BoolToObjectConverter.cs" />
     <Compile Include="Converters\Test_EmptyCollectionToObjectConverter.cs" />
     <Compile Include="Converters\Test_EmptyStringToObjectConverter.cs" />

From c5669bbeec27bfe36bf3edde43e3768a7cc237b5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 16:07:50 +0200
Subject: [PATCH 203/595] Fixed build error due to [Obsolete] in a unit test

---
 UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
index e96bf16f27f..87b756494cf 100644
--- a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
+++ b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
@@ -14,6 +14,7 @@ namespace UnitTests.Converters
     [TestClass]
     public class Test_TaskResultConverter
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         [TestCategory("Converters")]
         [UITestMethod]
         [ExpectedException(typeof(NotImplementedException))]
@@ -21,6 +22,7 @@ public void Test_TaskResultConverter_Static_Obsolete()
         {
             _ = TaskResultConverter.Convert(Task.CompletedTask);
         }
+#pragma warning restore CS0618
 
         [TestCategory("Converters")]
         [UITestMethod]

From 8fb8a303d0b2b02e24eaa8a323e73043bdd72c1b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 25 Jun 2020 17:59:38 +0200
Subject: [PATCH 204/595] Renamed some APIs in RequestMessage<T>

---
 .../Messaging/Messages/RequestMessage{T}.cs   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index 2da46c37d0b..cb134c3925e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
@@ -15,64 +15,64 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     public class RequestMessage<T>
     {
         /// <summary>
-        /// An <see cref="object"/> used to synchronize access to <see cref="Result"/> and <see cref="ReportResult"/>.
+        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply"/>.
         /// </summary>
         private readonly object dummy = new object();
 
-        private T result;
+        private T response;
 
         /// <summary>
         /// Gets the message response.
         /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when <see cref="IsResponseReceived"/> is <see langword="false"/>.</exception>
-        public T Result
+        /// <exception cref="InvalidOperationException">Thrown when <see cref="HasReceivedResponse"/> is <see langword="false"/>.</exception>
+        public T Response
         {
             get
             {
                 lock (this.dummy)
                 {
-                    if (!this.IsResponseReceived)
+                    if (!this.HasReceivedResponse)
                     {
                         ThrowInvalidOperationExceptionForNoResponseReceived();
                     }
 
-                    return this.result;
+                    return this.response;
                 }
             }
         }
 
         /// <summary>
-        /// Gets a value indicating whether a result has already been assigned to this instance.
+        /// Gets a value indicating whether a response has already been assigned to this instance.
         /// </summary>
-        public bool IsResponseReceived { get; private set; }
+        public bool HasReceivedResponse { get; private set; }
 
         /// <summary>
-        /// Reports a result for the current request message.
+        /// Replies to the current request message.
         /// </summary>
-        /// <param name="result">The result to report for the message.</param>
-        /// <exception cref="InvalidOperationException">Thrown if <see cref="Result"/> has already been set.</exception>
-        public void ReportResult(T result)
+        /// <param name="result">The response to use to reply to the request message.</param>
+        /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
+        public void Reply(T result)
         {
             lock (this.dummy)
             {
-                if (this.IsResponseReceived)
+                if (this.HasReceivedResponse)
                 {
-                    ThrowInvalidOperationExceptionForDuplicateReporResult();
+                    ThrowInvalidOperationExceptionForDuplicateReply();
                 }
 
-                this.IsResponseReceived = true;
-                this.result = result;
+                this.HasReceivedResponse = true;
+                this.response = result;
             }
         }
 
         /// <summary>
-        /// Implicitly gets the response from a given <see cref="RequestMessage{T}"/> instance
+        /// Implicitly gets the response from a given <see cref="RequestMessage{T}"/> instance.
         /// </summary>
-        /// <param name="message">The input <see cref="RequestMessage{T}"/> instance</param>
-        /// <exception cref="InvalidOperationException">Thrown when <see cref="IsResponseReceived"/> is <see langword="false"/>.</exception>
+        /// <param name="message">The input <see cref="RequestMessage{T}"/> instance.</param>
+        /// <exception cref="InvalidOperationException">Thrown when <see cref="HasReceivedResponse"/> is <see langword="false"/>.</exception>
         public static implicit operator T(RequestMessage<T> message)
         {
-            return message.Result;
+            return message.Response;
         }
 
         /// <summary>
@@ -84,11 +84,11 @@ private static void ThrowInvalidOperationExceptionForNoResponseReceived()
         }
 
         /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when <see cref="ReportResult"/> is called twice.
+        /// Throws an <see cref="InvalidOperationException"/> when <see cref="Reply"/> is called twice.
         /// </summary>
-        private static void ThrowInvalidOperationExceptionForDuplicateReporResult()
+        private static void ThrowInvalidOperationExceptionForDuplicateReply()
         {
-            throw new InvalidOperationException("A result has already been reported for the current message");
+            throw new InvalidOperationException("A response has already been issued for the current message");
         }
     }
 }

From 2ca1aaf5948fed5ef91e029101a6a449e495fe2d Mon Sep 17 00:00:00 2001
From: Regis Brid <regisb@microsoft.com>
Date: Thu, 25 Jun 2020 17:18:46 -0700
Subject: [PATCH 205/595] Changing DataGridItemAutomationPeer::GetNameCore &
 fixing DATAGRIDROWHEADER_stateNormalEditingRowFocused

---
 .../Automation/DataGridAutomationPeer.cs         | 10 +++++++++-
 .../Automation/DataGridCellAutomationPeer.cs     |  7 ++++++-
 .../DataGridColumnHeaderAutomationPeer.cs        |  7 ++++++-
 ...taGridColumnHeadersPresenterAutomationPeer.cs |  7 ++++++-
 .../DataGridDetailsPresenterAutomationPeer.cs    |  7 ++++++-
 .../DataGridGroupItemAutomationPeer.cs           |  7 ++++++-
 .../Automation/DataGridItemAutomationPeer.cs     | 16 ++++++++++++++--
 .../Automation/DataGridRowAutomationPeer.cs      |  7 ++++++-
 .../DataGridRowGroupHeaderAutomationPeer.cs      |  7 ++++++-
 .../DataGridRowHeaderAutomationPeer.cs           |  7 ++++++-
 .../DataGridRowsPresenterAutomationPeer.cs       |  7 ++++++-
 .../DataGrid/DataGridRowHeader.cs                |  2 +-
 12 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
index c2537307b49..f8d17e6a840 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
@@ -184,7 +184,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -212,6 +216,10 @@ protected override string GetNameCore()
                 }
             }
 
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetNameCore returns " + name);
+#endif
+
             return name;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
index e3b2718789c..d734f9d3b8e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
@@ -107,7 +108,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridCellAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
index 6f290c9d569..526b34b630d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using System.ComponentModel;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
@@ -50,7 +51,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
index daeb6cfb00f..6889abad24d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeadersPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
index ace2557106a..0fc7791d2c3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridDetailsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
index 93de235a0de..e7323da0047 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -200,7 +201,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+            string classNameCore = this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridGroupItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
index 871f1c666db..4956d2d7d5d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
@@ -151,7 +152,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+            string classNameCore = (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -219,11 +224,18 @@ protected override string GetNameCore()
                 string owningRowPeerName = this.OwningRowPeer.GetName();
                 if (!string.IsNullOrEmpty(owningRowPeerName))
                 {
+#if DEBUG_AUTOMATION
+                    System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + owningRowPeerName);
+#endif
                     return owningRowPeerName;
                 }
             }
 
-            return string.Empty;
+            string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);
+#endif
+            return name;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
index f084150de2c..0ddbcbfb2e5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
index 675e20f8c95..413bf8679aa 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowGroupHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
index f5c499edafe..3cd36059cf1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -45,7 +46,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
index 12541997261..aa1e53d303b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.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.
 
+// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
@@ -74,7 +75,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs
index eba355774bb..735659ee12d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs
@@ -57,7 +57,7 @@ public partial class DataGridRowHeader : ContentControl
         private const string DATAGRIDROWHEADER_stateNormal = "Normal";
         private const string DATAGRIDROWHEADER_stateNormalCurrentRow = "NormalCurrentRow";
         private const string DATAGRIDROWHEADER_stateNormalEditingRow = "UnfocusedEditingRow";
-        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "Normal EditingRow";
+        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "NormalEditingRow";
         private const string DATAGRIDROWHEADER_stateSelected = "UnfocusedSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRow = "UnfocusedCurrentRowSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRowFocused = "NormalCurrentRowSelected";

From 05a0b4efcf2a17a7581dc60a4e6bb8145eb2da4d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 26 Jun 2020 12:39:07 +0200
Subject: [PATCH 206/595] Added AsyncRequestMessage<T> class

---
 .../Messages/AsyncRequestMessage{T}.cs        | 105 ++++++++++++++++++
 .../Messaging/Messages/RequestMessage{T}.cs   |   6 +-
 2 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
new file mode 100644
index 00000000000..b759a2a4e49
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
@@ -0,0 +1,105 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A <see langword="class"/> for async request messages, which can either be used directly or through derived classes.
+    /// </summary>
+    /// <typeparam name="T">The type of request to make.</typeparam>
+    public class AsyncRequestMessage<T>
+    {
+        /// <summary>
+        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply"/>.
+        /// </summary>
+        private readonly object dummy = new object();
+
+        private Task<T>? response;
+
+        /// <summary>
+        /// Gets the message response.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when <see cref="HasReceivedResponse"/> is <see langword="false"/>.</exception>
+        public Task<T> Response
+        {
+            get
+            {
+                lock (this.dummy)
+                {
+                    if (!this.HasReceivedResponse)
+                    {
+                        ThrowInvalidOperationExceptionForNoResponseReceived();
+                    }
+
+                    return this.response!;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a response has already been assigned to this instance.
+        /// </summary>
+        public bool HasReceivedResponse { get; private set; }
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
+        public void Reply(T response)
+        {
+            Reply(Task.FromResult(response));
+        }
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
+        public void Reply(Task<T> response)
+        {
+            lock (this.dummy)
+            {
+                if (this.HasReceivedResponse)
+                {
+                    ThrowInvalidOperationExceptionForDuplicateReply();
+                }
+
+                this.HasReceivedResponse = true;
+                this.response = response;
+            }
+        }
+
+        /// <inheritdoc cref="Task{T}.GetAwaiter"/>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TaskAwaiter<T> GetAwaiter()
+        {
+            return this.Response.GetAwaiter();
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when a response is not available.
+        /// </summary>
+        private static void ThrowInvalidOperationExceptionForNoResponseReceived()
+        {
+            throw new InvalidOperationException("No response was received for the given request message");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when <see cref="Reply(T)"/> or <see cref="Reply(Task{T})"/> are called twice.
+        /// </summary>
+        private static void ThrowInvalidOperationExceptionForDuplicateReply()
+        {
+            throw new InvalidOperationException("A response has already been issued for the current message");
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index cb134c3925e..2de848fdf10 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
@@ -49,9 +49,9 @@ public T Response
         /// <summary>
         /// Replies to the current request message.
         /// </summary>
-        /// <param name="result">The response to use to reply to the request message.</param>
+        /// <param name="response">The response to use to reply to the request message.</param>
         /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
-        public void Reply(T result)
+        public void Reply(T response)
         {
             lock (this.dummy)
             {
@@ -61,7 +61,7 @@ public void Reply(T result)
                 }
 
                 this.HasReceivedResponse = true;
-                this.response = result;
+                this.response = response;
             }
         }
 

From 572663f7c25365898413af90dbb07c3dea0dd6b8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 26 Jun 2020 13:18:39 +0200
Subject: [PATCH 207/595] Added CollectionRequestMessage<T> class

---
 .../Messages/CollectionRequestMessage{T}.cs   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
new file mode 100644
index 00000000000..b4ffa5f12f6
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
@@ -0,0 +1,51 @@
+// 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.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A <see langword="class"/> for request messages that can receive multiple replies, which can either be used directly or through derived classes.
+    /// </summary>
+    /// <typeparam name="T">The type of request to make.</typeparam>
+    public class CollectionRequestMessage<T> : IEnumerable<T>
+    {
+        private readonly ConcurrentBag<T> responses = new ConcurrentBag<T>();
+
+        /// <summary>
+        /// Gets the message responses.
+        /// </summary>
+        public IReadOnlyCollection<T> Responses => this.responses;
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        public void Reply(T response)
+        {
+            this.responses.Add(response);
+        }
+
+        /// <inheritdoc/>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerator<T> GetEnumerator()
+        {
+            return this.responses.GetEnumerator();
+        }
+
+        /// <inheritdoc/>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}

From 6923f5816402505f12e91e182d534b52f3c4a1cf Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 26 Jun 2020 13:18:49 +0200
Subject: [PATCH 208/595] Added AsyncCollectionRequestMessage<T> class

---
 .../AsyncCollectionRequestMessage{T}.cs       | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
new file mode 100644
index 00000000000..afcc7842dd2
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
@@ -0,0 +1,104 @@
+// 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.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.Contracts;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
+{
+    /// <summary>
+    /// A <see langword="class"/> for request messages that can receive multiple replies, which can either be used directly or through derived classes.
+    /// </summary>
+    /// <typeparam name="T">The type of request to make.</typeparam>
+    public class AsyncCollectionRequestMessage<T> : IAsyncEnumerable<T>
+    {
+        private readonly ConcurrentBag<Task<T>> responses = new ConcurrentBag<Task<T>>();
+
+        /// <summary>
+        /// Gets the message responses.
+        /// </summary>
+        public IReadOnlyCollection<Task<T>> Responses => this.responses;
+
+        /// <summary>
+        /// The <see cref="CancellationTokenSource"/> instance used to link the token passed to
+        /// <see cref="GetAsyncEnumerator"/> and the one passed to all subscribers to the message.
+        /// </summary>
+        private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
+
+        /// <summary>
+        /// Gets the <see cref="System.Threading.CancellationToken"/> instance that will be linked to the
+        /// one used to asynchronously enumerate the received responses. This can be used to cancel asynchronous
+        /// replies that are still being processed, if no new items are needed from this request message.
+        /// Consider the following example, where we define a message to retrieve the currently opened documents:
+        /// <code>
+        /// public class OpenDocumentsRequestMessage : AsyncCollectionRequestMessage&lt;XmlDocument&gt; { }
+        /// </code>
+        /// We can then request and enumerate the results like so:
+        /// <code>
+        /// await foreach (var document in Messenger.Default.Send&lt;OpenDocumentsRequestMessage&gt;())
+        /// {
+        ///     // Process each document here...
+        /// }
+        /// </code>
+        /// If we also want to control the cancellation of the token passed to each subscriber to the message,
+        /// we can do so by passing a token we control to the returned message before starting the enumeration
+        /// (<see cref="TaskAsyncEnumerableExtensions.WithCancellation{T}(IAsyncEnumerable{T},CancellationToken)"/>).
+        /// The previous snippet with this additional change looks as follows:
+        /// <code>
+        /// await foreach (var document in Messenger.Default.Send&lt;OpenDocumentsRequestMessage&gt;().WithCancellation(cts.Token))
+        /// {
+        ///     // Process each document here...
+        /// }
+        /// </code>
+        /// When no more new items are needed (or for any other reason depending on the situation), the token
+        /// passed to the enumerator can be canceled (by calling <see cref="CancellationTokenSource.Cancel()"/>),
+        /// and that will also notify the remaining tasks in the request message. The token exposed by the message
+        /// itself will automatically be linked and canceled with the one passed to the enumerator.
+        /// </summary>
+        public CancellationToken CancellationToken => this.cancellationTokenSource.Token;
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        public void Reply(T response)
+        {
+            Reply(Task.FromResult(response));
+        }
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        public void Reply(Task<T> response)
+        {
+            this.responses.Add(response);
+        }
+
+        /// <inheritdoc/>
+        [Pure]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public async IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.CanBeCanceled)
+            {
+                cancellationToken.Register(this.cancellationTokenSource.Cancel);
+            }
+
+            foreach (var task in this.responses)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    yield break;
+                }
+
+                yield return await task.ConfigureAwait(false);
+            }
+        }
+    }
+}

From 26e40539ee334c7a619bbf4b03673faf8308ab0c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 26 Jun 2020 13:31:11 +0200
Subject: [PATCH 209/595] Improved Messenger XML docs

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 5312fa41e0a..22cfc397fd8 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -30,6 +30,24 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <code>
     /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
     /// </code>
+    /// Additionally, the method group syntax can also be used to specify the action
+    /// to invoke when receiving a message, if a method with the right signature is available
+    /// in the current scope. This is helpful to keep the registration and handling logic separate.
+    /// Following up from the previous example, consider a class having this method:
+    /// <code>
+    /// private void Receive(LoginCompletedMessage message)
+    /// {
+    ///     // Handle the message there
+    /// }
+    /// </code>
+    /// The registration can then be performed in a single line like so:
+    /// <code>
+    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, Receive);
+    /// </code>
+    /// The C# compiler will automatically convert that expression to an <see cref="Action{T}"/> instance
+    /// compatible with the <see cref="MessengerExtensions.Register{T}(IMessenger,object,Action{T})"/> method.
+    /// This will also work if multiple overloads of that method are available, each handling a different
+    /// message type: the C# compiler will automatically pick the right one for the current message type.
     /// For info on the other available features, check the <see cref="IMessenger"/> interface.
     /// </summary>
     public sealed class Messenger : IMessenger

From 430ce044feb64527bd09de9469868936b064274c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 26 Jun 2020 15:05:07 +0200
Subject: [PATCH 210/595] Added unit tests for new request message types

---
 .../UnitTests.NetCore.csproj                  |   1 +
 .../Mvvm/Test_Messenger.Request.cs            | 265 ++++++++++++++++++
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   |   2 +-
 .../UnitTests.Shared.projitems                |   1 +
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   1 +
 5 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs

diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index 80d6faae4d4..d582791375b 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
new file mode 100644
index 00000000000..7038852a048
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -0,0 +1,265 @@
+// 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.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Mvvm.Messaging.Messages;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    public partial class Test_Messenger
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_RequestMessage_Ok()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(NumberRequestMessage m)
+            {
+                Assert.IsFalse(m.HasReceivedResponse);
+
+                m.Reply(42);
+
+                Assert.IsTrue(m.HasReceivedResponse);
+            }
+
+            messenger.Register<NumberRequestMessage>(recipient, Receive);
+
+            int result = messenger.Send<NumberRequestMessage>();
+
+            Assert.AreEqual(result, 42);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void Test_Messenger_RequestMessage_Fail_NoReply()
+        {
+            var messenger = new Messenger();
+
+            int result = messenger.Send<NumberRequestMessage>();
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void Test_Messenger_RequestMessage_Fail_MultipleReplies()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(NumberRequestMessage m)
+            {
+                m.Reply(42);
+                m.Reply(42);
+            }
+
+            messenger.Register<NumberRequestMessage>(recipient, Receive);
+
+            int result = messenger.Send<NumberRequestMessage>();
+        }
+
+        public class NumberRequestMessage : RequestMessage<int>
+        {
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(AsyncNumberRequestMessage m)
+            {
+                Assert.IsFalse(m.HasReceivedResponse);
+
+                m.Reply(42);
+
+                Assert.IsTrue(m.HasReceivedResponse);
+            }
+
+            messenger.Register<AsyncNumberRequestMessage>(recipient, Receive);
+
+            int result = await messenger.Send<AsyncNumberRequestMessage>();
+
+            Assert.AreEqual(result, 42);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_Messenger_AsyncRequestMessage_Ok_Async()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            async Task<int> GetNumberAsync()
+            {
+                await Task.Delay(100);
+
+                return 42;
+            }
+
+            void Receive(AsyncNumberRequestMessage m)
+            {
+                Assert.IsFalse(m.HasReceivedResponse);
+
+                m.Reply(GetNumberAsync());
+
+                Assert.IsTrue(m.HasReceivedResponse);
+            }
+
+            messenger.Register<AsyncNumberRequestMessage>(recipient, Receive);
+
+            int result = await messenger.Send<AsyncNumberRequestMessage>();
+
+            Assert.AreEqual(result, 42);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply()
+        {
+            var messenger = new Messenger();
+
+            int result = await messenger.Send<AsyncNumberRequestMessage>();
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(AsyncNumberRequestMessage m)
+            {
+                m.Reply(42);
+                m.Reply(42);
+            }
+
+            messenger.Register<AsyncNumberRequestMessage>(recipient, Receive);
+
+            int result = await messenger.Send<AsyncNumberRequestMessage>();
+        }
+
+        public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
+        {
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(NumbersCollectionRequestMessage m)
+            {
+            }
+
+            messenger.Register<NumbersCollectionRequestMessage>(recipient, Receive);
+
+            var results = messenger.Send<NumbersCollectionRequestMessage>().Responses;
+
+            Assert.AreEqual(results.Count, 0);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies()
+        {
+            var messenger = new Messenger();
+            object
+                recipient1 = new object(),
+                recipient2 = new object(),
+                recipient3 = new object();
+
+            void Receive1(NumbersCollectionRequestMessage m) => m.Reply(1);
+            void Receive2(NumbersCollectionRequestMessage m) => m.Reply(2);
+            void Receive3(NumbersCollectionRequestMessage m) => m.Reply(3);
+
+            messenger.Register<NumbersCollectionRequestMessage>(recipient1, Receive1);
+            messenger.Register<NumbersCollectionRequestMessage>(recipient2, Receive2);
+            messenger.Register<NumbersCollectionRequestMessage>(recipient3, Receive3);
+
+            List<int> responses = new List<int>();
+
+            foreach (var response in messenger.Send<NumbersCollectionRequestMessage>())
+            {
+                responses.Add(response);
+            }
+
+            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3 });
+        }
+
+        public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
+        {
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies()
+        {
+            var messenger = new Messenger();
+            var recipient = new object();
+
+            void Receive(AsyncNumbersCollectionRequestMessage m)
+            {
+            }
+
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient, Receive);
+
+            var results = messenger.Send<AsyncNumbersCollectionRequestMessage>().Responses;
+
+            Assert.AreEqual(results.Count, 0);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies()
+        {
+            var messenger = new Messenger();
+            object
+                recipient1 = new object(),
+                recipient2 = new object(),
+                recipient3 = new object();
+
+            async Task<int> GetNumberAsync()
+            {
+                await Task.Delay(100);
+
+                return 3;
+            }
+
+            void Receive1(AsyncNumbersCollectionRequestMessage m) => m.Reply(1);
+            void Receive2(AsyncNumbersCollectionRequestMessage m) => m.Reply(Task.FromResult(2));
+            void Receive3(AsyncNumbersCollectionRequestMessage m) => m.Reply(GetNumberAsync());
+
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient1, Receive1);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient2, Receive2);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
+
+            List<int> responses = new List<int>();
+
+            await foreach (var response in messenger.Send<AsyncNumbersCollectionRequestMessage>())
+            {
+                responses.Add(response);
+            }
+
+            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3 });
+        }
+
+        public class AsyncNumbersCollectionRequestMessage : AsyncCollectionRequestMessage<int>
+        {
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 378e8379efc..f001ca16db0 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -9,7 +9,7 @@
 namespace UnitTests.Mvvm
 {
     [TestClass]
-    public class Test_Messenger
+    public partial class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index ecfb47e2522..a79a56f3ca3 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -23,6 +23,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Ioc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.Request.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 8b0332e1b5c..5f30fb26d77 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -18,6 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <Target Name="Pack">
   </Target>

From 8a94bcb01721bcd87524f56e2e6eb866001ed4db Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 13:19:05 +0200
Subject: [PATCH 211/595] Minor bug fixes and code refactoring

---
 .../Messaging/MessengerExtensions.Default.cs         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
index 768b660c18f..3aabce5212c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
@@ -72,11 +72,7 @@ public static void Unregister<TMessage>(this IMessenger messenger, object recipi
         public static TMessage Send<TMessage>(this IMessenger messenger)
             where TMessage : class, new()
         {
-            var message = new TMessage();
-
-            messenger.Send(message, default(Unit));
-
-            return message;
+            return messenger.Send(new TMessage(), default(Unit));
         }
 
         /// <summary>
@@ -108,11 +104,7 @@ public static TMessage Send<TMessage, TToken>(this IMessenger messenger, TToken
             where TMessage : class, new()
             where TToken : IEquatable<TToken>
         {
-            var message = new TMessage();
-
-            messenger.Send(new TMessage(), token);
-
-            return message;
+            return messenger.Send(new TMessage(), token);
         }
     }
 }

From e46a589320b12de87b4848e2ae7b97dab280f4f3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 13:21:47 +0200
Subject: [PATCH 212/595] Added missing readonly modifier to Unit type

---
 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
index d467a4e2dcc..67dfbc1c7ea 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
@@ -15,7 +15,7 @@ public static partial class MessengerExtensions
         /// <summary>
         /// An empty type representing a generic token with no specific value.
         /// </summary>
-        private struct Unit : IEquatable<Unit>
+        private readonly struct Unit : IEquatable<Unit>
         {
             /// <inheritdoc/>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]

From 53ea2f74e306229587ddc086e3bea0a7e4015a7e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 13:22:40 +0200
Subject: [PATCH 213/595] Fixed ambiguous match in XML comment

---
 .../Messaging/Messages/AsyncRequestMessage{T}.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
index b759a2a4e49..bf43b65fef5 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     public class AsyncRequestMessage<T>
     {
         /// <summary>
-        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply"/>.
+        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply(T)"/> and <see cref="Reply(Task{T})"/>.
         /// </summary>
         private readonly object dummy = new object();
 

From 1179ab19ed8637561711212afa98414324607738 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 13:36:14 +0200
Subject: [PATCH 214/595] Minor code style tweaks

---
 .../DictionarySlim{TKey,TValue}.cs                          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 2cdadb99766..ff1c603a451 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -164,10 +164,9 @@ public bool TryGetValue(TKey key, out TValue? value)
                     }
 
                     entries[entryIndex] = default;
-
                     entries[entryIndex].Next = -3 - this.freeList;
-                    this.freeList = entryIndex;
 
+                    this.freeList = entryIndex;
                     this.count--;
 
                     success = true;
@@ -233,6 +232,7 @@ public bool Remove(TKey key)
             if (this.freeList != -1)
             {
                 entryIndex = this.freeList;
+
                 this.freeList = -3 - entries[this.freeList].Next;
             }
             else
@@ -278,7 +278,9 @@ private Entry[] Resize()
             while (count-- > 0)
             {
                 int bucketIndex = entries[count].Key.GetHashCode() & (newBuckets.Length - 1);
+
                 entries[count].Next = newBuckets[bucketIndex] - 1;
+
                 newBuckets[bucketIndex] = count + 1;
             }
 

From a70f278ab69583aa36e54b90dd74f5b384e1a857 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 13:41:24 +0200
Subject: [PATCH 215/595] Minor code refactoring

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs      |  4 +---
 .../DictionarySlim{TKey,TValue}.cs                 | 14 ++++++--------
 .../IDictionarySlim{TKey}.cs                       |  6 +++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 22cfc397fd8..4416b37edfe 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -182,9 +182,7 @@ public void Unregister(object recipient)
                 // Removes all the lists of registered handlers for the recipient
                 foreach (IMapping mapping in set!)
                 {
-                    object? handlersMap = mapping.TryRemove(key, out bool success);
-
-                    if (success)
+                    if (mapping.TryRemove(key, out object? handlersMap))
                     {
                         // If this branch is taken, it means the target recipient to unregister
                         // had at least one registered handler for the current <TToken, TMessage>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index ff1c603a451..e566bd489a1 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -141,7 +141,7 @@ public bool TryGetValue(TKey key, out TValue? value)
         }
 
         /// <inheritdoc/>
-        public object? TryRemove(TKey key, out bool success)
+        public bool TryRemove(TKey key, out object? result)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
@@ -169,27 +169,25 @@ public bool TryGetValue(TKey key, out TValue? value)
                     this.freeList = entryIndex;
                     this.count--;
 
-                    success = true;
+                    result = candidate.Value;
 
-                    return candidate.Value;
+                    return true;
                 }
 
                 lastIndex = entryIndex;
                 entryIndex = candidate.Next;
             }
 
-            success = false;
+            result = null;
 
-            return null;
+            return false;
         }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool Remove(TKey key)
         {
-            _ = TryRemove(key, out bool success);
-
-            return success;
+            return TryRemove(key, out _);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 1b4bd173cd8..7de2505148a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -17,9 +17,9 @@ internal interface IDictionarySlim<in TKey> : IDictionarySlim
         /// Tries to remove a value with a specified key.
         /// </summary>
         /// <param name="key">The key of the value to remove.</param>
-        /// <param name="success">Whether or not the key was present.</param>
-        /// <returns>The removed value, if it was present.</returns>
-        object? TryRemove(TKey key, out bool success);
+        /// <param name="result">The removed value, if it was present.</param>
+        /// <returns>.Whether or not the key was present.</returns>
+        bool TryRemove(TKey key, out object? result);
 
         /// <summary>
         /// Removes an item from the dictionary with the specified key, if present.

From 1726279fe55f86ab4bfa1353986ee016f881804d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 28 Jun 2020 14:05:40 +0200
Subject: [PATCH 216/595] Updated Task<T>.ResultOrDefault<T> on .NET Standard
 2.1

---
 Microsoft.Toolkit/Extensions/TaskExtensions.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index 8fc52368bd5..c9c3d4a650f 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -24,7 +24,11 @@ public static class TaskExtensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static T ResultOrDefault<T>(this Task<T> task)
         {
+#if NETSTANDARD2_1
+            return task.IsCompletedSuccessfully ? task.Result : default;
+#else
             return task.Status == TaskStatus.RanToCompletion ? task.Result : default;
+#endif
         }
     }
 }

From d8511523ae43394ff944007a6be064c051f0070c Mon Sep 17 00:00:00 2001
From: Riza Marhaban <riza.marhaban@hotmail.com>
Date: Mon, 29 Jun 2020 19:07:12 +0800
Subject: [PATCH 217/595] [UPDATE] fixing case change due to Text property is
 cleared by binding

---
 .../Extensions/TextBoxMask/TextBoxMask.cs                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index 046a6d68b7a..37a1b005215 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
+
 using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -295,6 +296,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
                         deleteBackspaceIndex++;
                     }
                 }
+
             }
 
             // case adding data at the end of the textbox
@@ -327,6 +329,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
                 if (string.IsNullOrEmpty(textbox.Text))
                 {
                     textbox.Text = displayText;
+                    return;
                 }
                 else
                 {
@@ -340,7 +343,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
 
             if (!isDeleteOrBackspace)
             {
-                // Case change happended due to user input
+                // Case change happened due to user input
                 var selectedChar = textbox.SelectionStart > 0 ?
                                     textbox.Text[textbox.SelectionStart - 1] :
                                     placeHolder;

From cdf0d097809410b1ea56415dec41648326652c8c Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Mon, 29 Jun 2020 14:17:47 +0200
Subject: [PATCH 218/595] remove locks

---
 .../InAppNotificationXaml.bind                |   6 +-
 .../InAppNotification.Constants.cs            |   5 +
 .../InAppNotification.Events.cs               |  60 ++---
 .../InAppNotification/InAppNotification.cs    | 223 +++++++++---------
 .../Styles/MSEdgeNotificationStyle.xaml       | 204 +++++++++-------
 .../Styles/VSCodeNotificationStyle.xaml       | 210 ++++++++++-------
 6 files changed, 396 insertions(+), 312 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
index 0b5afac336d..d3be2911f64 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
@@ -153,7 +153,8 @@
                           <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        <ContentPresenter x:Name="PART_Presenter"
+                                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                           HorizontalContentAlignment="Stretch"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           VerticalContentAlignment="Center"
@@ -333,7 +334,8 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                <ContentPresenter x:Name="PART_Presenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                                   HorizontalContentAlignment="Stretch"
                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                   VerticalContentAlignment="Center"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs
index 0959cbeb5ef..b5f9f31743e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs
@@ -28,5 +28,10 @@ public partial class InAppNotification
         /// Key of the UI Element that dismiss the control
         /// </summary>
         private const string DismissButtonPart = "PART_DismissButton";
+
+        /// <summary>
+        /// Key of the UI Element that will display the notification content.
+        /// </summary>
+        private const string ContentPresenterPart = "PART_Presenter";
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
index 107f55a0342..32282d70de9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
@@ -35,6 +35,19 @@ public partial class InAppNotification
         /// </summary>
         public event InAppNotificationClosedEventHandler Closed;
 
+        private static void AutomateTextNotification(AutomationPeer peer, string message)
+        {
+            if (peer != null)
+            {
+                peer.SetFocus();
+                peer.RaiseNotificationEvent(
+                    AutomationNotificationKind.Other,
+                    AutomationNotificationProcessing.ImportantMostRecent,
+                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
+                    Guid.NewGuid().ToString());
+            }
+        }
+
         private void DismissButton_Click(object sender, RoutedEventArgs e)
         {
             Dismiss(InAppNotificationDismissKind.User);
@@ -45,44 +58,37 @@ private void DismissTimer_Tick(object sender, object e)
             Dismiss(InAppNotificationDismissKind.Timeout);
         }
 
-        private void OpenAnimationTimer_Tick(object sender, object e)
+        private void OnCurrentStateChanged(object sender, VisualStateChangedEventArgs e)
         {
-            lock (_openAnimationTimer)
+            switch (e.NewState.Name)
             {
-                _openAnimationTimer.Stop();
-                Opened?.Invoke(this, EventArgs.Empty);
-                SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
-                if (ContentTemplateRoot != null)
-                {
-                    var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
-                    if (Content?.GetType() == typeof(string))
-                    {
-                        AutomateTextNotification(peer, Content.ToString());
-                    }
-                }
+                case StateContentVisible:
+                    OnNotificationVisible();
+                    break;
+                case StateContentCollapsed:
+                    OnNotificationCollapsed();
+                    break;
             }
         }
 
-        private void AutomateTextNotification(AutomationPeer peer, string message)
+        private void OnNotificationVisible()
         {
-            if (peer != null)
+            Opened?.Invoke(this, EventArgs.Empty);
+            SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
+            if (ContentTemplateRoot != null)
             {
-                peer.SetFocus();
-                peer.RaiseNotificationEvent(
-                    AutomationNotificationKind.Other,
-                    AutomationNotificationProcessing.ImportantMostRecent,
-                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
-                    Guid.NewGuid().ToString());
+                var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
+                if (Content?.GetType() == typeof(string))
+                {
+                    AutomateTextNotification(peer, Content.ToString());
+                }
             }
         }
 
-        private void ClosingAnimationTimer_Tick(object sender, object e)
+        private void OnNotificationCollapsed()
         {
-            lock (_closingAnimationTimer)
-            {
-                _closingAnimationTimer.Stop();
-                Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
-            }
+            Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
+            Visibility = Visibility.Collapsed;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 222c43e8723..83459339724 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -16,14 +16,14 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplateVisualState(Name = StateContentVisible, GroupName = GroupContent)]
     [TemplateVisualState(Name = StateContentCollapsed, GroupName = GroupContent)]
     [TemplatePart(Name = DismissButtonPart, Type = typeof(Button))]
+    [TemplatePart(Name = ContentPresenterPart, Type = typeof(ContentPresenter))]
     public partial class InAppNotification : ContentControl
     {
         private InAppNotificationDismissKind _lastDismissKind;
-        private DispatcherTimer _openAnimationTimer = new DispatcherTimer();
-        private DispatcherTimer _closingAnimationTimer = new DispatcherTimer();
         private DispatcherTimer _dismissTimer = new DispatcherTimer();
         private Button _dismissButton;
         private VisualStateGroup _visualStateGroup;
+        private ContentPresenter _contentProvider;
         private List<NotificationOptions> _stackedNotificationOptions = new List<NotificationOptions>();
 
         /// <summary>
@@ -34,20 +34,26 @@ public InAppNotification()
             DefaultStyleKey = typeof(InAppNotification);
 
             _dismissTimer.Tick += DismissTimer_Tick;
-            _openAnimationTimer.Tick += OpenAnimationTimer_Tick;
-            _closingAnimationTimer.Tick += ClosingAnimationTimer_Tick;
         }
 
         /// <inheritdoc />
         protected override void OnApplyTemplate()
         {
+            base.OnApplyTemplate();
+
             if (_dismissButton != null)
             {
                 _dismissButton.Click -= DismissButton_Click;
             }
 
+            if (_visualStateGroup != null)
+            {
+                _visualStateGroup.CurrentStateChanged -= OnCurrentStateChanged;
+            }
+
             _dismissButton = (Button)GetTemplateChild(DismissButtonPart);
             _visualStateGroup = (VisualStateGroup)GetTemplateChild(GroupContent);
+            _contentProvider = (ContentPresenter)GetTemplateChild(ContentPresenterPart);
 
             if (_dismissButton != null)
             {
@@ -55,16 +61,17 @@ protected override void OnApplyTemplate()
                 _dismissButton.Click += DismissButton_Click;
             }
 
-            if (Visibility == Visibility.Visible)
+            if (_visualStateGroup != null)
             {
-                VisualStateManager.GoToState(this, StateContentVisible, true);
+                _visualStateGroup.CurrentStateChanged += OnCurrentStateChanged;
             }
-            else
+
+            var firstNotification = _stackedNotificationOptions.FirstOrDefault();
+            if (firstNotification != null)
             {
-                VisualStateManager.GoToState(this, StateContentCollapsed, true);
+                UpdateContent(firstNotification);
+                VisualStateManager.GoToState(this, StateContentVisible, true);
             }
-
-            base.OnApplyTemplate();
         }
 
         /// <summary>
@@ -73,34 +80,24 @@ protected override void OnApplyTemplate()
         /// <param name="duration">Displayed duration of the notification in ms (less or equal 0 means infinite duration)</param>
         public void Show(int duration = 0)
         {
-            lock (_openAnimationTimer)
-                lock (_closingAnimationTimer)
-                    lock (_dismissTimer)
-                    {
-                        _openAnimationTimer.Stop();
-                        _closingAnimationTimer.Stop();
-                        _dismissTimer.Stop();
-
-                        var eventArgs = new InAppNotificationOpeningEventArgs();
-                        Opening?.Invoke(this, eventArgs);
-
-                        if (eventArgs.Cancel)
-                        {
-                            return;
-                        }
-
-                        Visibility = Visibility.Visible;
-                        VisualStateManager.GoToState(this, StateContentVisible, true);
-
-                        _openAnimationTimer.Interval = AnimationDuration;
-                        _openAnimationTimer.Start();
-
-                        if (duration > 0)
-                        {
-                            _dismissTimer.Interval = TimeSpan.FromMilliseconds(duration);
-                            _dismissTimer.Start();
-                        }
-                    }
+            _dismissTimer.Stop();
+
+            var eventArgs = new InAppNotificationOpeningEventArgs();
+            Opening?.Invoke(this, eventArgs);
+
+            if (eventArgs.Cancel)
+            {
+                return;
+            }
+
+            // We keep our current content
+            var notificationOptions = new NotificationOptions
+            {
+                Duration = duration,
+                Content = Content
+            };
+
+            Show(notificationOptions);
         }
 
         /// <summary>
@@ -162,64 +159,48 @@ public void Dismiss()
         /// <param name="dismissKind">Kind of action that triggered dismiss event</param>
         private void Dismiss(InAppNotificationDismissKind dismissKind)
         {
-            lock (_openAnimationTimer)
-                lock (_closingAnimationTimer)
-                    lock (_dismissTimer)
-                    {
-                        if (Visibility == Visibility.Visible)
-                        {
-                            _dismissTimer.Stop();
-
-                            // Continue to display notification if on remaining stacked notification
-                            if (_stackedNotificationOptions.Any())
-                            {
-                                _stackedNotificationOptions.RemoveAt(0);
-
-                                if (_stackedNotificationOptions.Any())
-                                {
-                                    var notificationOptions = _stackedNotificationOptions[0];
-
-                                    UpdateContent(notificationOptions);
-
-                                    if (notificationOptions.Duration > 0)
-                                    {
-                                        _dismissTimer.Interval = TimeSpan.FromMilliseconds(notificationOptions.Duration);
-                                        _dismissTimer.Start();
-                                    }
-
-                                    return;
-                                }
-                            }
-
-                            _openAnimationTimer.Stop();
-                            _closingAnimationTimer.Stop();
-
-                            var closingEventArgs = new InAppNotificationClosingEventArgs(dismissKind);
-                            Closing?.Invoke(this, closingEventArgs);
-
-                            if (closingEventArgs.Cancel)
-                            {
-                                return;
-                            }
-
-                            VisualStateManager.GoToState(this, StateContentCollapsed, true);
-
-                            _lastDismissKind = dismissKind;
-
-                            _closingAnimationTimer.Interval = AnimationDuration;
-                            _closingAnimationTimer.Start();
-                        }
-                    }
-        }
+            if (_stackedNotificationOptions.Count == 0)
+            {
+                // There is nothing to dismiss.
+                return;
+            }
 
-        /// <summary>
-        /// Informs if the notification should be displayed immediately (based on the StackMode)
-        /// </summary>
-        /// <returns>True if notification should be displayed immediately</returns>
-        private bool ShouldDisplayImmediately()
-        {
-            return StackMode != StackMode.QueueBehind ||
-                (StackMode == StackMode.QueueBehind && _stackedNotificationOptions.Count == 0);
+            _dismissTimer.Stop();
+
+            // Continue to display notification if on remaining stacked notification
+            _stackedNotificationOptions.RemoveAt(0);
+            if (_stackedNotificationOptions.Any())
+            {
+                var notificationOptions = _stackedNotificationOptions[0];
+
+                UpdateContent(notificationOptions);
+
+                if (notificationOptions.Duration > 0)
+                {
+                    _dismissTimer.Interval = TimeSpan.FromMilliseconds(notificationOptions.Duration);
+                    _dismissTimer.Start();
+                }
+
+                return;
+            }
+
+            var closingEventArgs = new InAppNotificationClosingEventArgs(dismissKind);
+            Closing?.Invoke(this, closingEventArgs);
+
+            if (closingEventArgs.Cancel)
+            {
+                return;
+            }
+
+            var result = VisualStateManager.GoToState(this, StateContentCollapsed, true);
+            if (!result)
+            {
+                // The state transition cannot be executed.
+                // It means that the control's template hasn't been applied or that it doesn't contain the state.
+                Visibility = Visibility.Collapsed;
+            }
+
+            _lastDismissKind = dismissKind;
         }
 
         /// <summary>
@@ -228,19 +209,25 @@ private bool ShouldDisplayImmediately()
         /// <param name="notificationOptions">Information about the notification to display</param>
         private void UpdateContent(NotificationOptions notificationOptions)
         {
+            if (_contentProvider is null)
+            {
+                // The control template has not been applied yet.
+                return;
+            }
+
             switch (notificationOptions.Content)
             {
                 case string text:
-                    ContentTemplate = null;
-                    Content = text;
+                    _contentProvider.ContentTemplate = null;
+                    _contentProvider.Content = text;
                     break;
                 case UIElement element:
-                    ContentTemplate = null;
-                    Content = element;
+                    _contentProvider.ContentTemplate = null;
+                    _contentProvider.Content = element;
                     break;
                 case DataTemplate dataTemplate:
-                    ContentTemplate = dataTemplate;
-                    Content = null;
+                    _contentProvider.ContentTemplate = dataTemplate;
+                    _contentProvider.Content = null;
                     break;
             }
         }
@@ -251,22 +238,36 @@ private void UpdateContent(NotificationOptions notificationOptions)
         /// <param name="notificationOptions">Information about the notification to display</param>
         private void Show(NotificationOptions notificationOptions)
         {
-            bool shouldDisplayImmediately = ShouldDisplayImmediately();
-
-            if (StackMode == StackMode.QueueBehind)
-            {
-                _stackedNotificationOptions.Add(notificationOptions);
-            }
-
-            if (StackMode == StackMode.StackInFront)
+            var shouldDisplayImmediately = true;
+            switch (StackMode)
             {
-                _stackedNotificationOptions.Insert(0, notificationOptions);
+                case StackMode.Replace:
+                    _stackedNotificationOptions.Clear();
+                    _stackedNotificationOptions.Add(notificationOptions);
+                    break;
+                case StackMode.StackInFront:
+                    _stackedNotificationOptions.Insert(0, notificationOptions);
+                    break;
+                case StackMode.QueueBehind:
+                    _stackedNotificationOptions.Add(notificationOptions);
+                    shouldDisplayImmediately = _stackedNotificationOptions.Count == 1;
+                    break;
+                default:
+                    break;
             }
 
             if (shouldDisplayImmediately)
             {
                 UpdateContent(notificationOptions);
-                Show(notificationOptions.Duration);
+
+                Visibility = Visibility.Visible;
+                VisualStateManager.GoToState(this, StateContentVisible, true);
+
+                if (notificationOptions.Duration > 0)
+                {
+                    _dismissTimer.Interval = TimeSpan.FromMilliseconds(notificationOptions.Duration);
+                    _dismissTimer.Start();
+                }
             }
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index 63e376f0b62..106dd41c833 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -1,26 +1,34 @@
-<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">
+<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">
 
     <ResourceDictionary.ThemeDictionaries>
-        <!-- Default is a fallback if a more precise theme isn't called
-            out below -->
+        <!--
+            Default is a fallback if a more precise theme isn't called
+            out below
+        -->
         <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="Transparent" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemColorButtonTextColor}"/>
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush"
+                             Color="Transparent" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush"
+                             Color="Transparent" />
         </ResourceDictionary>
 
-        <!-- HighContrast is used in all high contrast themes -->
+        <!--  HighContrast is used in all high contrast themes  -->
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemColorHighlightTextColor}"/>
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush"
+                             Color="{ThemeResource SystemColorHighlightTextColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
+    <Style x:Key="DismissTextBlockButtonStyle"
+           TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
         <Setter Property="Width" Value="40" />
@@ -30,46 +38,64 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
-                    <Grid x:Name="RootGrid" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
-                        <Border x:Name="TextBorder" BorderThickness="2" BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}">
+                    <Grid x:Name="RootGrid"
+                          Margin="{TemplateBinding Padding}"
+                          Background="{TemplateBinding Background}">
+                        <Border x:Name="TextBorder"
+                                BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}"
+                                BorderThickness="2">
                             <ContentPresenter x:Name="Text"
-                                              Content="{TemplateBinding Content}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}" />
                         </Border>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverForegroundBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverForegroundBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverForegroundBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverForegroundBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -81,25 +107,67 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MSEdgeNotificationTemplate" 
+    <ControlTemplate x:Key="MSEdgeNotificationTemplate"
                      TargetType="local:InAppNotification">
         <Grid>
+            <Grid x:Name="RootGrid"
+                  MaxWidth="{TemplateBinding MaxWidth}"
+                  Margin="{TemplateBinding Margin}"
+                  Padding="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
+                  Visibility="{TemplateBinding Visibility}">
+
+                <Grid.RenderTransform>
+                    <CompositeTransform />
+                </Grid.RenderTransform>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter x:Name="PART_Presenter"
+                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  HorizontalContentAlignment="Stretch"
+                                  VerticalContentAlignment="Center"
+                                  ContentTransitions="{TemplateBinding ContentTransitions}"
+                                  TextWrapping="WrapWholeWords" />
+
+                <Button x:Name="PART_DismissButton"
+                        Grid.Column="1"
+                        Margin="24,0,0,0"
+                        AutomationProperties.Name="Dismiss"
+                        Content="&#xE894;"
+                        FontFamily="Segoe MDL2 Assets"
+                        FontSize="16"
+                        Style="{StaticResource DismissTextBlockButtonStyle}">
+                    <Button.RenderTransform>
+                        <TranslateTransform x:Name="DismissButtonTransform" X="18" />
+                    </Button.RenderTransform>
+                </Button>
+            </Grid>
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroup x:Name="State">
                     <VisualState x:Name="Collapsed">
                         <Storyboard>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="0" />
                                 <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}"
                                                       Value="{Binding HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                             </DoubleAnimationUsingKeyFrames>
 
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                      Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="0" />
+                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                             </DoubleAnimationUsingKeyFrames>
 
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
@@ -120,64 +188,30 @@
 
                     <VisualState x:Name="Visible">
                         <Storyboard>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="{Binding HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="{Binding HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      Value="0" />
                             </DoubleAnimationUsingKeyFrames>
 
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                 </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-
-            <Grid x:Name="RootGrid" 
-                  RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
-                  Margin="{TemplateBinding Margin}"
-                  Padding="{TemplateBinding Padding}"
-                  MaxWidth="{TemplateBinding MaxWidth}"
-                  Visibility="{TemplateBinding Visibility}"
-                  Background="{TemplateBinding Background}" 
-                  BorderBrush="{TemplateBinding BorderBrush}" 
-                  BorderThickness="{TemplateBinding BorderThickness}">
-                
-                <Grid.RenderTransform>
-                    <CompositeTransform />
-                </Grid.RenderTransform>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  VerticalContentAlignment="Center"
-                                  TextWrapping="WrapWholeWords" />
-
-                <Button x:Name="PART_DismissButton"
-                        Grid.Column="1" 
-                        Margin="24,0,0,0"
-                        FontSize="16"
-                        Style="{StaticResource DismissTextBlockButtonStyle}"
-                        Content="&#xE894;"
-                        FontFamily="Segoe MDL2 Assets" 
-                        AutomationProperties.Name="Dismiss">
-                    <Button.RenderTransform>
-                        <TranslateTransform x:Name="DismissButtonTransform" X="18" />
-                    </Button.RenderTransform>
-                </Button>
-            </Grid>
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="MSEdgeNotificationStyle" TargetType="local:InAppNotification">
+    <Style x:Key="MSEdgeNotificationStyle"
+           TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml
index 2b8b31ed8c9..18ad31b0f76 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml
@@ -1,39 +1,55 @@
-<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">
+<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">
 
     <ResourceDictionary.ThemeDictionaries>
-        <!-- Default is a fallback if a more precise theme isn't called
-            out below -->
+        <!--
+            Default is a fallback if a more precise theme isn't called
+            out below
+        -->
         <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBackgroundBrush" Color="#0E639C" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBorderBrush" Color="#0E639C" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonTextBrush" Color="White" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationGridBackgroundBrush" Color="#007ACC" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationBackgroundBrush" Color="#333333" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationForegroundBrush" Color="White" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationPointerOverChromeBrush" Color="#1177BB" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBackgroundBrush"
+                             Color="#0E639C" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBorderBrush"
+                             Color="#0E639C" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonTextBrush"
+                             Color="White" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationGridBackgroundBrush"
+                             Color="#007ACC" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationBackgroundBrush"
+                             Color="#333333" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationForegroundBrush"
+                             Color="White" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationPointerOverChromeBrush"
+                             Color="#1177BB" />
         </ResourceDictionary>
 
-        <!-- HighContrast is used in all high contrast themes -->
+        <!--  HighContrast is used in all high contrast themes  -->
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBorderBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationButtonTextBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationGridBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationForegroundBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-            <SolidColorBrush x:Key="SystemControlVSNotificationPointerOverChromeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBackgroundBrush"
+                             Color="{ThemeResource SystemColorWindowColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonBorderBrush"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationButtonTextBrush"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationGridBackgroundBrush"
+                             Color="{ThemeResource SystemColorWindowColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationBackgroundBrush"
+                             Color="{ThemeResource SystemColorWindowColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationForegroundBrush"
+                             Color="{ThemeResource SystemColorWindowTextColor}" />
+            <SolidColorBrush x:Key="SystemControlVSNotificationPointerOverChromeBrush"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Style x:Key="VisualStudioCodeNotificationButtonStyle" TargetType="ButtonBase">
+    <Style x:Key="VisualStudioCodeNotificationButtonStyle"
+           TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource SystemControlVSNotificationButtonBackgroundBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlVSNotificationButtonTextBrush}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="Padding" Value="10 0" />
+        <Setter Property="Padding" Value="10,0" />
         <Setter Property="Height" Value="35" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlVSNotificationButtonBorderBrush}" />
@@ -41,37 +57,46 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
-                    <Grid x:Name="RootGrid" 
-                          Padding="{TemplateBinding Padding}" 
-                          Margin="{TemplateBinding Margin}" 
+                    <Grid x:Name="RootGrid"
+                          Margin="{TemplateBinding Margin}"
+                          Padding="{TemplateBinding Padding}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter x:Name="ContentHolder" Content="{TemplateBinding Content}"
+                        <ContentPresenter x:Name="ContentHolder"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
-                                          Foreground="{TemplateBinding Foreground}"/>
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          Foreground="{TemplateBinding Foreground}" />
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlVSNotificationPointerOverChromeBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlVSNotificationPointerOverChromeBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentHolder" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemColorHighlightTextColor}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentHolder"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemColorHighlightTextColor}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlVSNotificationPointerOverChromeBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlVSNotificationPointerOverChromeBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentHolder" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemColorHighlightTextColor}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentHolder"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemColorHighlightTextColor}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -84,7 +109,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="VSCodeNotificationStyle" TargetType="local:InAppNotification">
+    <Style x:Key="VSCodeNotificationStyle"
+           TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlVSNotificationBackgroundBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlVSNotificationForegroundBrush}" />
         <Setter Property="BorderThickness" Value="0" />
@@ -94,28 +120,69 @@
         <Setter Property="FontSize" Value="14" />
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="RenderTransformOrigin" Value="0.5,0" />
-        <Setter Property="Margin" Value="20 0" />
+        <Setter Property="Margin" Value="20,0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="VerticalOffset" Value="-100" />
         <Setter Property="Template" Value="{StaticResource VSCodeNotificationTemplate}" />
     </Style>
 
-    <ControlTemplate x:Key="VSCodeNotificationTemplate" TargetType="local:InAppNotification">
+    <ControlTemplate x:Key="VSCodeNotificationTemplate"
+                     TargetType="local:InAppNotification">
         <Grid>
+            <Grid x:Name="RootGrid"
+                  MaxWidth="{TemplateBinding MaxWidth}"
+                  Margin="{TemplateBinding Margin}"
+                  Padding="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
+                  Visibility="{TemplateBinding Visibility}">
+                <Grid.RenderTransform>
+                    <CompositeTransform />
+                </Grid.RenderTransform>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <Grid Height="20"
+                      Margin="10 5"
+                      Background="{ThemeResource SystemControlVSNotificationGridBackgroundBrush}">
+                    <TextBlock Padding="5 0"
+                               VerticalAlignment="Center"
+                               FontWeight="Bold"
+                               Foreground="White"
+                               Text="info" />
+                </Grid>
+
+                <ContentPresenter x:Name="PART_Presenter"
+                                  Grid.Column="1"
+                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  HorizontalContentAlignment="Stretch"
+                                  VerticalContentAlignment="Center"
+                                  TextWrapping="NoWrap" />
+            </Grid>
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroup x:Name="State">
                     <VisualState x:Name="Collapsed">
                         <Storyboard>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1"
+                                                      Value="0" />
                             </DoubleAnimationUsingKeyFrames>
 
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="-100" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1"
+                                                      Value="-100" />
                             </DoubleAnimationUsingKeyFrames>
 
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
@@ -136,56 +203,25 @@
 
                     <VisualState x:Name="Visible">
                         <Storyboard>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1"
+                                                      Value="0" />
                             </DoubleAnimationUsingKeyFrames>
 
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" 
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                <EasingDoubleKeyFrame KeyTime="0" Value="-100" />
-                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0" />
+                                <EasingDoubleKeyFrame KeyTime="0"
+                                                      Value="-100" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.1"
+                                                      Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                 </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-
-            <Grid x:Name="RootGrid"
-                  RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
-                  Margin="{TemplateBinding Margin}"
-                  Padding="{TemplateBinding Padding}"
-                  MaxWidth="{TemplateBinding MaxWidth}"
-                  Visibility="{TemplateBinding Visibility}"
-                  Background="{TemplateBinding Background}" 
-                  BorderBrush="{TemplateBinding BorderBrush}" 
-                  BorderThickness="{TemplateBinding BorderThickness}">
-                <Grid.RenderTransform>
-                    <CompositeTransform />
-                </Grid.RenderTransform>
-                
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-
-                <Grid Margin="10 5" Height="20" Background="{ThemeResource SystemControlVSNotificationGridBackgroundBrush}">
-                    <TextBlock Text="info"
-                               Padding="5 0"
-                               FontWeight="Bold"
-                               VerticalAlignment="Center"
-                               Foreground="White" />
-                </Grid>
-
-                <ContentPresenter Grid.Column="1" 
-                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  VerticalContentAlignment="Center"
-                                  TextWrapping="NoWrap" 
-                                  />
-            </Grid>
         </Grid>
     </ControlTemplate>
 

From 3916d5a62bd9cb362db97050baaf4004a4f3a1ef Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Mon, 29 Jun 2020 16:43:42 +0200
Subject: [PATCH 219/595] add show(object)

---
 .../InAppNotificationPage.xaml.cs             | 14 +++++++++--
 .../InAppNotificationXaml.bind                | 12 +++++++++-
 .../InAppNotification/InAppNotification.cs    | 24 +++++++++++++++++--
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
index 6a5f814e15a..cb35082fd6f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Windows.Input;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -57,6 +58,15 @@ private void Load()
                 _exampleInAppNotification?.Show(GetRandomText(), NotificationDuration);
             });
 
+            SampleController.Current.RegisterNewCommand("Show notification with object", (sender, args) =>
+            {
+                _exampleVSCodeInAppNotification?.Dismiss();
+                SetDefaultControlTemplate();
+
+                var random = new Random();
+                _exampleInAppNotification?.Show(new KeyValuePair<int, string>(random.Next(1, 10), GetRandomText()), NotificationDuration);
+            });
+
             SampleController.Current.RegisterNewCommand("Show notification with buttons (without DataTemplate)", (sender, args) =>
             {
                 _exampleVSCodeInAppNotification?.Dismiss();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
index d3be2911f64..812d93e65cd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
@@ -378,7 +378,17 @@
                                     AnimationDuration="@[AnimationDuration:TimeSpan:100:0-5000]"
                                     VerticalOffset="@[VerticalOffset:DoubleSlider:100.0:-200.0-200.0]"
                                     HorizontalOffset="@[HorizontalOffset:DoubleSlider:0.0:-200.0-200.0]"
-                                    StackMode="@[StackMode:Enum:StackMode.Replace]" />
+                                    StackMode="@[StackMode:Enum:StackMode.Replace]">
+            <controls:InAppNotification.ContentTemplate>
+               <DataTemplate>
+                    <StackPanel>
+                        <TextBlock Text="{Binding Value}" Margin="0,0,0,8" />
+                        <TextBlock Text="{Binding Key}" Style="{ThemeResource CaptionTextBlockStyle}" Opacity="0.8" />
+                    </StackPanel>
+                </DataTemplate>
+            </controls:InAppNotification.ContentTemplate>
+        </controls:InAppNotification>
+          
 
         <controls:InAppNotification x:Name="ExampleCustomInAppNotification"
                                     Style="{StaticResource MSEdgeNotificationTemplate_NoDismissButton}"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 83459339724..03df7373b67 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -75,7 +75,7 @@ protected override void OnApplyTemplate()
         }
 
         /// <summary>
-        /// Show notification using the current template
+        /// Show notification using the current content.
         /// </summary>
         /// <param name="duration">Displayed duration of the notification in ms (less or equal 0 means infinite duration)</param>
         public void Show(int duration = 0)
@@ -131,7 +131,7 @@ public void Show(UIElement element, int duration = 0)
         }
 
         /// <summary>
-        /// Show notification using DataTemplate as the content of the notification
+        /// Show notification using <paramref name="dataTemplate"/> as the content of the notification
         /// </summary>
         /// <param name="dataTemplate">DataTemplate used as the content of the notification</param>
         /// <param name="duration">Displayed duration of the notification in ms (less or equal 0 means infinite duration)</param>
@@ -145,6 +145,22 @@ public void Show(DataTemplate dataTemplate, int duration = 0)
             Show(notificationOptions);
         }
 
+        /// <summary>
+        /// Show notification using <paramref name="content"/> as the content of the notification.
+        /// The <paramref name="content"/> will be displayed with the current <see cref="ContentControl.ContentTemplate"/>.
+        /// </summary>
+        /// <param name="content">The content of the notification</param>
+        /// <param name="duration">Displayed duration of the notification in ms (less or equal 0 means infinite duration)</param>
+        public void Show(object content, int duration = 0)
+        {
+            var notificationOptions = new NotificationOptions
+            {
+                Duration = duration,
+                Content = content
+            };
+            Show(notificationOptions);
+        }
+
         /// <summary>
         /// Dismiss the notification
         /// </summary>
@@ -229,6 +245,10 @@ private void UpdateContent(NotificationOptions notificationOptions)
                     _contentProvider.ContentTemplate = dataTemplate;
                     _contentProvider.Content = null;
                     break;
+                case object content:
+                    _contentProvider.ContentTemplate = ContentTemplate;
+                    _contentProvider.Content = content;
+                    break;
             }
         }
 

From 8eb02a4dbf2d1e27de709bd521878f9779a6d4c0 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Tue, 30 Jun 2020 11:31:24 +0200
Subject: [PATCH 220/595] Add resources to allow light templating

---
 .../Styles/MSEdgeNotificationStyle.xaml                  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index 63e376f0b62..638e773ffcd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -20,11 +20,14 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonSize">40</x:Double>
+    <Thickness x:Key="SystemControlMSEdgeNotificationDismissButtonMargin">24,0,0,0</Thickness>
+
     <Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Height" Value="40" />
+        <Setter Property="Width" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
+        <Setter Property="Height" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="HighContrastAdjustment" Value="None" />
         <Setter Property="Template">
@@ -163,7 +166,7 @@
 
                 <Button x:Name="PART_DismissButton"
                         Grid.Column="1" 
-                        Margin="24,0,0,0"
+                        Margin="{StaticResource SystemControlMSEdgeNotificationDismissButtonMargin}"
                         FontSize="16"
                         Style="{StaticResource DismissTextBlockButtonStyle}"
                         Content="&#xE894;"

From aadc5914e720122726f311685ae4ed5637a21cec Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Tue, 30 Jun 2020 13:38:31 +0200
Subject: [PATCH 221/595] add translate and alignment resources

---
 .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index 638e773ffcd..74a0ddf6ddc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -22,7 +22,9 @@
 
     <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonSize">40</x:Double>
     <Thickness x:Key="SystemControlMSEdgeNotificationDismissButtonMargin">24,0,0,0</Thickness>
-
+    <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonTranslate">18</x:Double>
+    <VerticalAlignment x:Key="SystemControlMSEdgeNotificationDismissButtonVerticalAlignment">Center</VerticalAlignment>
+    
     <Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
@@ -170,10 +172,11 @@
                         FontSize="16"
                         Style="{StaticResource DismissTextBlockButtonStyle}"
                         Content="&#xE894;"
+                        VerticalAlignment="{StaticResource SystemControlMSEdgeNotificationDismissButtonVerticalAlignment}"
                         FontFamily="Segoe MDL2 Assets" 
                         AutomationProperties.Name="Dismiss">
                     <Button.RenderTransform>
-                        <TranslateTransform x:Name="DismissButtonTransform" X="18" />
+                        <TranslateTransform x:Name="DismissButtonTransform" X="{StaticResource SystemControlMSEdgeNotificationDismissButtonTranslate}" />
                     </Button.RenderTransform>
                 </Button>
             </Grid>

From a776872e92909d32e123025dd614f7339520bb3e Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 1 Jul 2020 12:00:12 +0200
Subject: [PATCH 222/595] improve accessibility

---
 .../InAppNotification.Events.cs               | 26 +++++--------------
 .../InAppNotification/InAppNotification.cs    |  8 +++++-
 .../InAppNotification/InAppNotification.xaml  | 24 ++++++++++-------
 .../Styles/MSEdgeNotificationStyle.xaml       |  1 +
 .../Strings/en-US/Resources.resw              | 10 +++----
 5 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
index 107f55a0342..fa38dbb8a26 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Automation.Peers;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -51,29 +49,19 @@ private void OpenAnimationTimer_Tick(object sender, object e)
             {
                 _openAnimationTimer.Stop();
                 Opened?.Invoke(this, EventArgs.Empty);
-                SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
-                if (ContentTemplateRoot != null)
-                {
-                    var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
-                    if (Content?.GetType() == typeof(string))
-                    {
-                        AutomateTextNotification(peer, Content.ToString());
-                    }
-                }
+                RaiseAutomationNotification();
             }
         }
 
-        private void AutomateTextNotification(AutomationPeer peer, string message)
+        private void RaiseAutomationNotification()
         {
-            if (peer != null)
+            if (!AutomationPeer.ListenerExists(AutomationEvents.LiveRegionChanged))
             {
-                peer.SetFocus();
-                peer.RaiseNotificationEvent(
-                    AutomationNotificationKind.Other,
-                    AutomationNotificationProcessing.ImportantMostRecent,
-                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
-                    Guid.NewGuid().ToString());
+                return;
             }
+
+            var peer = FrameworkElementAutomationPeer.CreatePeerForElement(this);
+            peer.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
         }
 
         private void ClosingAnimationTimer_Tick(object sender, object e)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 222c43e8723..935fc6da7cc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -5,7 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -41,6 +44,8 @@ public InAppNotification()
         /// <inheritdoc />
         protected override void OnApplyTemplate()
         {
+            base.OnApplyTemplate();
+
             if (_dismissButton != null)
             {
                 _dismissButton.Click -= DismissButton_Click;
@@ -53,6 +58,7 @@ protected override void OnApplyTemplate()
             {
                 _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed;
                 _dismissButton.Click += DismissButton_Click;
+                AutomationProperties.SetName(_dismissButton, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
             }
 
             if (Visibility == Visibility.Visible)
@@ -64,7 +70,7 @@ protected override void OnApplyTemplate()
                 VisualStateManager.GoToState(this, StateContentCollapsed, true);
             }
 
-            base.OnApplyTemplate();
+            AutomationProperties.SetLabeledBy(this, VisualTree.FindDescendant<ContentPresenter>(this));
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
index 77b97ba6b58..5277f9b09f9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
@@ -1,16 +1,16 @@
-<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"
-    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="local:InAppNotification" x:Key="BaseInAppNotificationsStyle">
+    <Style x:Key="BaseInAppNotificationsStyle"
+           TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseLowBrush}" />
@@ -28,14 +28,20 @@
         <Setter Property="AnimationDuration" Value="0:0:0.100" />
         <Setter Property="VerticalOffset" Value="100" />
         <Setter Property="HorizontalOffset" Value="0" />
+        <Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
+        <!--  The setter value is localized using x:Uid but we still need to set it explicitly to avoid a compiler warning  -->
+        <Setter x:Uid="WindowsCommunityToolkit_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
+        <Setter Property="AutomationProperties.LiveSetting" Value="Assertive" />
         <Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
     </Style>
 
-    <contract7NotPresent:Style TargetType="local:InAppNotification" BasedOn="{StaticResource BaseInAppNotificationsStyle}">
+    <contract7NotPresent:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
+                               TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
     </contract7NotPresent:Style>
 
-    <contract7Present:Style TargetType="local:InAppNotification" BasedOn="{StaticResource BaseInAppNotificationsStyle}">
+    <contract7Present:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
+                            TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumLowAcrylicElementMediumBrush}" />
     </contract7Present:Style>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index 63e376f0b62..d3983c49800 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -34,6 +34,7 @@
                         <Border x:Name="TextBorder" BorderThickness="2" BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}">
                             <ContentPresenter x:Name="Text"
                                               Content="{TemplateBinding Content}"
+                                              AutomationProperties.AccessibilityView="Raw"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                         </Border>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
index 4235b160a2b..9da0e56d058 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
@@ -205,13 +205,13 @@
     <value>GridSpliter</value>
     <comment>Narrator Resource for GridSplitter control</comment>
   </data>
-  <data name="WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage" xml:space="preserve">
-    <value>New notification</value>
-    <comment>Narrator resource for a new notification using the InAppNotification</comment>
+  <data name="WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
+    <value>Dismiss</value>
+    <comment>The automation name for the dismiss button of the InAppNotification control.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_InAppNotification_NameProperty" xml:space="preserve">
+  <data name="WindowsCommunityToolkit_InAppNotification_LandmarkProperty.Value" xml:space="preserve">
     <value>Notification</value>
-    <comment>Name property for InAppNotification</comment>
+    <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
   <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Close tab</value>

From 7b755a8601168abe80f2ad213ba45c12d6f93708 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 1 Jul 2020 12:57:09 +0200
Subject: [PATCH 223/595] Minor tweaks to AsyncCollectionRequestMessage<T>

---
 .../AsyncCollectionRequestMessage{T}.cs       | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
index afcc7842dd2..afebef687c8 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.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.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,12 +18,12 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     /// <typeparam name="T">The type of request to make.</typeparam>
     public class AsyncCollectionRequestMessage<T> : IAsyncEnumerable<T>
     {
-        private readonly ConcurrentBag<Task<T>> responses = new ConcurrentBag<Task<T>>();
-
         /// <summary>
-        /// Gets the message responses.
+        /// The collection of received replies. We accept both <see cref="Task{TResult}"/> instance, representing already running
+        /// operations that can be executed in parallel, or <see cref="Func{T,TResult}"/> instances, which can be used so that multiple
+        /// asynchronous operations are only started sequentially from <see cref="GetAsyncEnumerator"/> and do not overlap in time.
         /// </summary>
-        public IReadOnlyCollection<Task<T>> Responses => this.responses;
+        private readonly ConcurrentBag<(Task<T>?, Func<CancellationToken, Task<T>>?)> responses = new ConcurrentBag<(Task<T>?, Func<CancellationToken, Task<T>>?)>();
 
         /// <summary>
         /// The <see cref="CancellationTokenSource"/> instance used to link the token passed to
@@ -77,7 +78,16 @@ public void Reply(T response)
         /// <param name="response">The response to use to reply to the request message.</param>
         public void Reply(Task<T> response)
         {
-            this.responses.Add(response);
+            this.responses.Add((response, null));
+        }
+
+        /// <summary>
+        /// Replies to the current request message.
+        /// </summary>
+        /// <param name="response">The response to use to reply to the request message.</param>
+        public void Reply(Func<CancellationToken, Task<T>> response)
+        {
+            this.responses.Add((null, response));
         }
 
         /// <inheritdoc/>
@@ -90,14 +100,21 @@ public async IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellati
                 cancellationToken.Register(this.cancellationTokenSource.Cancel);
             }
 
-            foreach (var task in this.responses)
+            foreach (var (task, func) in this.responses)
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
                     yield break;
                 }
 
-                yield return await task.ConfigureAwait(false);
+                if (!(task is null))
+                {
+                    yield return await task.ConfigureAwait(false);
+                }
+                else
+                {
+                    yield return await func!(cancellationToken).ConfigureAwait(false);
+                }
             }
         }
     }

From 4a1ec142226b836d2f696972dc2feb5b42185161 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 1 Jul 2020 13:06:57 +0200
Subject: [PATCH 224/595] Added GetResponsesAsync API to
 AsyncCollectionRequestMessage<T>

---
 .../AsyncCollectionRequestMessage{T}.cs       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
index afebef687c8..6d34f512162 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
@@ -90,6 +90,29 @@ public void Reply(Func<CancellationToken, Task<T>> response)
             this.responses.Add((null, response));
         }
 
+        /// <summary>
+        /// Gets the collection of received response items.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken"/> value to stop the operation.</param>
+        /// <returns>The collection of received response items.</returns>
+        [Pure]
+        public async Task<IReadOnlyCollection<T>> GetResponsesAsync(CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.CanBeCanceled)
+            {
+                cancellationToken.Register(this.cancellationTokenSource.Cancel);
+            }
+
+            List<T> results = new List<T>(this.responses.Count);
+
+            await foreach (var response in this.WithCancellation(cancellationToken))
+            {
+                results.Add(response);
+            }
+
+            return results;
+        }
+
         /// <inheritdoc/>
         [Pure]
         [EditorBrowsable(EditorBrowsableState.Never)]

From 573bbad3166d2f3a4eba0f5421e837bf087217fb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 1 Jul 2020 16:01:25 +0200
Subject: [PATCH 225/595] Fixed a bug in the unit tests

---
 .../UnitTests.Shared/Mvvm/Test_Messenger.Request.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index 7038852a048..07fef8d9300 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -207,7 +207,7 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies()
+        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies()
         {
             var messenger = new Messenger();
             var recipient = new object();
@@ -218,7 +218,7 @@ void Receive(AsyncNumbersCollectionRequestMessage m)
 
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient, Receive);
 
-            var results = messenger.Send<AsyncNumbersCollectionRequestMessage>().Responses;
+            var results = await messenger.Send<AsyncNumbersCollectionRequestMessage>().GetResponsesAsync();
 
             Assert.AreEqual(results.Count, 0);
         }
@@ -231,7 +231,8 @@ public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplie
             object
                 recipient1 = new object(),
                 recipient2 = new object(),
-                recipient3 = new object();
+                recipient3 = new object(),
+                recipient4 = new object();
 
             async Task<int> GetNumberAsync()
             {
@@ -243,10 +244,12 @@ async Task<int> GetNumberAsync()
             void Receive1(AsyncNumbersCollectionRequestMessage m) => m.Reply(1);
             void Receive2(AsyncNumbersCollectionRequestMessage m) => m.Reply(Task.FromResult(2));
             void Receive3(AsyncNumbersCollectionRequestMessage m) => m.Reply(GetNumberAsync());
+            void Receive4(AsyncNumbersCollectionRequestMessage m) => m.Reply(_ => GetNumberAsync());
 
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient1, Receive1);
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient2, Receive2);
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient4, Receive4);
 
             List<int> responses = new List<int>();
 
@@ -255,7 +258,7 @@ async Task<int> GetNumberAsync()
                 responses.Add(response);
             }
 
-            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3 });
+            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3, 3 });
         }
 
         public class AsyncNumbersCollectionRequestMessage : AsyncCollectionRequestMessage<int>

From 9643ee7d70d1384ea06ab14e2b21b33d74756ef2 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 09:02:01 +0200
Subject: [PATCH 226/595] add
 SystemControlMSEdgeNotificationButtonBorderThickness resource

---
 .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index 74a0ddf6ddc..37a6a9b974d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -24,6 +24,7 @@
     <Thickness x:Key="SystemControlMSEdgeNotificationDismissButtonMargin">24,0,0,0</Thickness>
     <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonTranslate">18</x:Double>
     <VerticalAlignment x:Key="SystemControlMSEdgeNotificationDismissButtonVerticalAlignment">Center</VerticalAlignment>
+    <Thickness x:Key="SystemControlMSEdgeNotificationButtonBorderThickness">2</Thickness>
     
     <Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
@@ -36,7 +37,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
                     <Grid x:Name="RootGrid" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
-                        <Border x:Name="TextBorder" BorderThickness="2" BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}">
+                        <Border x:Name="TextBorder" BorderThickness="{StaticResource SystemControlMSEdgeNotificationButtonBorderThickness}" BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}">
                             <ContentPresenter x:Name="Text"
                                               Content="{TemplateBinding Content}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

From 7acb5867e593e5463738e5bc9eb0643b071432f0 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 09:33:37 +0200
Subject: [PATCH 227/595] Update code sample

---
 .../InAppNotification/InAppNotificationCode.bind     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationCode.bind
index 5b656636a0b..b151f91a4fe 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationCode.bind
@@ -46,6 +46,14 @@ if (isTemplatePresent && inAppNotificationWithButtonsTemplate is DataTemplate)
     ExampleInAppNotification.Show(inAppNotificationWithButtonsTemplate as DataTemplate);
 }
 
+// Show notification using an object
+<controls:InAppNotification
+    x:Name="ExampleInAppNotification"
+    ContentTemplate="{StaticResource MyNotificationDataTemplate}" />
+
+var notificationData = new MyNotificationData("Title", "Message");
+ExampleInAppNotification.Show(notificationData, duration: 2000);
+
 // Dismiss notification
 ExampleInAppNotification.Dismiss();
 
@@ -53,14 +61,14 @@ ExampleInAppNotification.Dismiss();
 
 private void YesButton_Click(object sender, RoutedEventArgs e)
 {
-	// TODO : Do something when user accepted
+    // TODO : Do something when user accepted
 
     ExampleInAppNotification.Dismiss();
 }
 
 private void NoButton_Click(object sender, RoutedEventArgs e)
 {
-	// TODO : Do something when user refused
+    // TODO : Do something when user refused
 
     ExampleInAppNotification.Dismiss();
 }
\ No newline at end of file

From 9658240639823b1e76e17a1b388bdaaf4d21fad5 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 09:38:22 +0200
Subject: [PATCH 228/595] fix xaml style

---
 .../InAppNotification/InAppNotification.xaml  | 20 +++++++------
 .../Styles/MSEdgeNotificationStyle.xaml       | 30 ++++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
index 77b97ba6b58..cf0ba8c691b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
@@ -1,16 +1,16 @@
-<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"
-    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="local:InAppNotification" x:Key="BaseInAppNotificationsStyle">
+    <Style x:Key="BaseInAppNotificationsStyle"
+           TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseLowBrush}" />
@@ -31,11 +31,13 @@
         <Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
     </Style>
 
-    <contract7NotPresent:Style TargetType="local:InAppNotification" BasedOn="{StaticResource BaseInAppNotificationsStyle}">
+    <contract7NotPresent:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
+                               TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
     </contract7NotPresent:Style>
 
-    <contract7Present:Style TargetType="local:InAppNotification" BasedOn="{StaticResource BaseInAppNotificationsStyle}">
+    <contract7Present:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
+                            TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumLowAcrylicElementMediumBrush}" />
     </contract7Present:Style>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
index daffd3dda8e..87b217d0d13 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
@@ -8,18 +8,26 @@
             out below
         -->
         <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="Transparent" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemBaseMediumColor}" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush"
+                             Color="Transparent" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush"
+                             Color="{ThemeResource SystemBaseMediumColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush"
+                             Color="{ThemeResource SystemBaseHighColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush"
+                             Color="Transparent" />
         </ResourceDictionary>
 
         <!--  HighContrast is used in all high contrast themes  -->
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemBaseHighColor}"/>
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush"
+                             Color="{ThemeResource SystemBaseHighColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush"
+                             Color="{ThemeResource SystemBaseHighColor}" />
+            <SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
@@ -64,8 +72,10 @@
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerPressedForegroundBrush}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlMSEdgeNotificationPointerPressedForegroundBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
                                                                        Storyboard.TargetProperty="Background">

From 9b082377e2725a7fce2e8c760de2af930fb8bd3d Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 10:09:36 +0200
Subject: [PATCH 229/595] add missing timer stop

---
 .../InAppNotification/InAppNotification.cs    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 03df7373b67..de838e989b0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -80,16 +80,6 @@ protected override void OnApplyTemplate()
         /// <param name="duration">Displayed duration of the notification in ms (less or equal 0 means infinite duration)</param>
         public void Show(int duration = 0)
         {
-            _dismissTimer.Stop();
-
-            var eventArgs = new InAppNotificationOpeningEventArgs();
-            Opening?.Invoke(this, eventArgs);
-
-            if (eventArgs.Cancel)
-            {
-                return;
-            }
-
             // We keep our current content
             var notificationOptions = new NotificationOptions
             {
@@ -258,6 +248,14 @@ private void UpdateContent(NotificationOptions notificationOptions)
         /// <param name="notificationOptions">Information about the notification to display</param>
         private void Show(NotificationOptions notificationOptions)
         {
+            var eventArgs = new InAppNotificationOpeningEventArgs();
+            Opening?.Invoke(this, eventArgs);
+
+            if (eventArgs.Cancel)
+            {
+                return;
+            }
+
             var shouldDisplayImmediately = true;
             switch (StackMode)
             {
@@ -288,6 +286,10 @@ private void Show(NotificationOptions notificationOptions)
                     _dismissTimer.Interval = TimeSpan.FromMilliseconds(notificationOptions.Duration);
                     _dismissTimer.Start();
                 }
+                else
+                {
+                    _dismissTimer.Stop();
+                }
             }
         }
     }

From e44951b3765048a9376e6b2204ad7dd464a6c5cc Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 14:01:00 +0200
Subject: [PATCH 230/595] fix unit tests

---
 UnitTests/UnitTests.UWP/UnitTestApp.xaml | 31 ++++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
index ab5fb38f2f8..877955a71f2 100644
--- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml
+++ b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
@@ -1,28 +1,27 @@
 <Application x:Class="UnitTests.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
              xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+             xmlns:helpers="using:UnitTests.Extensions.Helpers"
              xmlns:unitTestExtensions="using:UnitTests.Extensions"
-             RequestedTheme="Light" >
+             RequestedTheme="Light">
     <Application.Resources>
 
-        <!-- Workarounds for .NET Native issue in unit tests -->
+        <!--  Workarounds for .NET Native issue in unit tests  -->
         <CommandBar x:Key="DummyCommandBar">
-            <AppBarButton Icon="{extensions:FontIcon Glyph=&#xE102;}"/>
-            <AppBarButton Icon="{extensions:SymbolIcon Symbol=Play}"/>
+            <AppBarButton Icon="{extensions:FontIcon Glyph=&#xE102;}" />
+            <AppBarButton Icon="{extensions:SymbolIcon Symbol=Play}" />
         </CommandBar>
 
-        <unitTestExtensions:MockSwipeItem
-            x:Key="DummySwipeControl1"
-            IconSource="{extensions:FontIconSource Glyph=&#xE10B;}"/>
+        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
+                                          IconSource="{extensions:FontIconSource Glyph=&#xE10B;}" />
 
-        <unitTestExtensions:MockSwipeItem
-            x:Key="DummySwipeControl2"
-            IconSource="{extensions:SymbolIconSource Symbol=Play}"/>
+        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
+                                          IconSource="{extensions:SymbolIconSource Symbol=Play}" />
 
-        <unitTestExtensions:MockSwipeItem
-            x:Key="DummySwipeControl3"
-            IconSource="{extensions:BitmapIconSource Source=/Assets/StoreLogo.png}"/>
+        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
+                                          IconSource="{extensions:BitmapIconSource Source=/Assets/StoreLogo.png}" />
 
         <Button x:Key="DummyButton">
             <Button.Flyout>
@@ -31,5 +30,11 @@
                 </MenuFlyout>
             </Button.Flyout>
         </Button>
+
+        <Style TargetType="controls:UniformGrid" />
+        <extensions:NullableBool x:Key="nullableBool" />
+
+        <helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
+
     </Application.Resources>
 </Application>

From a07e8ab9a694dc45f5cf9a9b7cba702b45245137 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 2 Jul 2020 14:14:34 +0200
Subject: [PATCH 231/595] removed no longer used file

---
 UnitTests/UnitTestApp.xaml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 UnitTests/UnitTestApp.xaml

diff --git a/UnitTests/UnitTestApp.xaml b/UnitTests/UnitTestApp.xaml
deleted file mode 100644
index 40cd3de0047..00000000000
--- a/UnitTests/UnitTestApp.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Application x:Class="UnitTests.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-             xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-             xmlns:local="using:UnitTests"
-             RequestedTheme="Light">
-
-    <Application.Resources>
-        <!--
-            We need to manually import some types here to force the XAML compiler to add them to the XamlTypeInfo file.
-            This is needed only when dynamically loading controls that the XAML compiler cannot find (ie using XamlReader.Load to load the controls).
-        -->
-        <Style TargetType="controls:UniformGrid" />
-        <ex:NullableBool x:Key="nullableBool" />
-    </Application.Resources>
-</Application>

From 08a5cb25ba1a98beaf3255ea981e84ff15c5f7ce Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 5 Jul 2020 16:03:17 +0200
Subject: [PATCH 232/595] Improved codegen for
 ReadOnlySpanExtensions.DangerousGetLookupReferenceAt

---
 .../Extensions/ReadOnlySpanExtensions.cs                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index 4d3f2ad9c93..89bf9a5f8b3 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -106,12 +106,12 @@ public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<
             // lookup table can just be assumed to always be false.
             bool isInRange = (uint)i < (uint)span.Length;
             byte rangeFlag = Unsafe.As<bool, byte>(ref isInRange);
-            int
-                negativeFlag = rangeFlag - 1,
+            uint
+                negativeFlag = rangeFlag - 1u,
                 mask = ~negativeFlag,
-                offset = i & mask;
+                offset = (uint)i & mask;
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T r1 = ref Unsafe.Add(ref r0, offset);
+            ref T r1 = ref Unsafe.Add(ref r0, (IntPtr)offset);
 
             return ref r1;
         }

From 42dc9d8e3fb2cafe56e7e29c35fe621f00332d90 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 5 Jul 2020 16:44:42 +0200
Subject: [PATCH 233/595] Added explicit unchecked for clarity

---
 .../Extensions/ReadOnlySpanExtensions.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index 89bf9a5f8b3..bc15fccc900 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -107,7 +107,7 @@ public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<
             bool isInRange = (uint)i < (uint)span.Length;
             byte rangeFlag = Unsafe.As<bool, byte>(ref isInRange);
             uint
-                negativeFlag = rangeFlag - 1u,
+                negativeFlag = unchecked(rangeFlag - 1u),
                 mask = ~negativeFlag,
                 offset = (uint)i & mask;
             ref T r0 = ref MemoryMarshal.GetReference(span);

From 0d4db3a0daffeb9ffcc88c86676d469f0ce860d1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 20:25:16 +0200
Subject: [PATCH 234/595] Added StringPool type

---
 .../Buffers/StringPool.cs                     | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
new file mode 100644
index 00000000000..91f877870e3
--- /dev/null
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -0,0 +1,171 @@
+// 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.HighPerformance.Extensions;
+using Microsoft.Toolkit.HighPerformance.Helpers;
+
+namespace Microsoft.Toolkit.HighPerformance.Buffers
+{
+    /// <summary>
+    /// A configurable pool for <see cref="string"/> instances. This can be used to minimize allocations
+    /// when creating multiple <see cref="string"/> instances from buffers of <see cref="char"/> values.
+    /// The <see cref="GetOrAdd"/> method provides a best-effort alternative to just creating a new
+    /// <see cref="string"/> instance every time, in order to minimize the number of duplicated instances.
+    /// </summary>
+    public sealed class StringPool
+    {
+        /// <summary>
+        /// The default number of <see cref="Bucket"/> instances in <see cref="buckets"/>.
+        /// </summary>
+        private const int DefaultNumberOfBuckets = 20;
+
+        /// <summary>
+        /// The default number of entries stored in each <see cref="Bucket"/> instance.
+        /// </summary>
+        private const int DefaultEntriesPerBucket = 64;
+
+        /// <summary>
+        /// The current array of <see cref="Bucket"/> instances in use.
+        /// </summary>
+        private readonly Bucket[] buckets;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StringPool"/> class.
+        /// </summary>
+        /// <param name="numberOfBuckets">The total number of buckets to use.</param>
+        /// <param name="entriesPerBucket">The maximum number of <see cref="string"/> entries per bucket.</param>
+        public StringPool(int numberOfBuckets, int entriesPerBucket)
+        {
+            Span<Bucket> span = this.buckets = new Bucket[numberOfBuckets];
+
+            // We preallocate the buckets in advance, since each bucket only contains the
+            // array field, which is not preinitialized, so the allocations are minimal.
+            // This lets us lock on each individual buckets when retrieving a string instance.
+            foreach (ref Bucket bucket in span)
+            {
+                bucket = new Bucket();
+            }
+
+            NumberOfBuckets = numberOfBuckets;
+            EntriesPerBucket = entriesPerBucket;
+        }
+
+        /// <summary>
+        /// Gets the default <see cref="StringPool"/> instance.
+        /// </summary>
+        public static StringPool Default { get; } = new StringPool(DefaultNumberOfBuckets, DefaultEntriesPerBucket);
+
+        /// <summary>
+        /// Gets the total number of buckets in use.
+        /// </summary>
+        public int NumberOfBuckets { get; }
+
+        /// <summary>
+        /// Gets the maximum number of <see cref="string"/> entries stored in each bucket.
+        /// </summary>
+        public int EntriesPerBucket { get; }
+
+        /// <summary>
+        /// Gets a cached <see cref="string"/> instance matching the input content, or creates a new one.
+        /// </summary>
+        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+        /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
+        public string GetOrAdd(ReadOnlySpan<char> span)
+        {
+            if (span.IsEmpty)
+            {
+                return string.Empty;
+            }
+
+            int bucketIndex = span.Length % NumberOfBuckets;
+
+            Bucket bucket = this.buckets.DangerousGetReferenceAt(bucketIndex);
+
+            lock (bucket)
+            {
+                return bucket.GetOrAdd(span, EntriesPerBucket);
+            }
+        }
+
+        /// <summary>
+        /// Resets the current instance and its associated buckets.
+        /// </summary>
+        public void Reset()
+        {
+            foreach (Bucket bucket in this.buckets)
+            {
+                lock (bucket)
+                {
+                    bucket.Reset();
+                }
+            }
+        }
+
+        /// <summary>
+        /// A configurable bucket containing a group of cached <see cref="string"/> instances.
+        /// </summary>
+        private sealed class Bucket
+        {
+            /// <summary>
+            /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
+            /// This will ignore overflows, as we just need this to map hashcodes into the valid bucket range.
+            /// </summary>
+            private const int SignMask = ~(1 << 31);
+
+            /// <summary>
+            /// The array of entries currently in use.
+            /// </summary>
+            private string?[]? entries;
+
+            /// <summary>
+            /// Implements <see cref="StringPool.GetOrAdd"/> for the current <see cref="Bucket"/> instance.
+            /// </summary>
+            /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+            /// <param name="entriesPerBucket">The number of entries being used in the current instance.</param>
+            /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
+            public string GetOrAdd(ReadOnlySpan<char> span, int entriesPerBucket)
+            {
+                ref string?[]? entries = ref this.entries;
+
+                entries ??= new string[entriesPerBucket];
+
+                int entryIndex =
+#if NETSTANDARD1_4
+                    (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+#else
+                    (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+#endif
+
+                ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+
+                if (!(entry is null) &&
+                    entry.AsSpan().SequenceEqual(span))
+                {
+                    return entry;
+                }
+
+#if SPAN_RUNTIME_SUPPORT
+                return entry = new string(span);
+#else
+                unsafe
+                {
+                    fixed (char* c = span)
+                    {
+                        return entry = new string(c, 0, span.Length);
+                    }
+                }
+#endif
+            }
+
+            /// <summary>
+            /// Resets the current array of entries.
+            /// </summary>
+            public void Reset()
+            {
+                this.entries = null;
+            }
+        }
+    }
+}

From 55ddf1d1884a22abdfa87ab736688c6102e4f2bd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 20:41:33 +0200
Subject: [PATCH 235/595] Added StringPool default constructor, input checks

---
 .../Buffers/StringPool.cs                     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 91f877870e3..cd80e90da0e 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -4,7 +4,9 @@
 
 using System;
 using Microsoft.Toolkit.HighPerformance.Extensions;
+#if !NETSTANDARD1_4
 using Microsoft.Toolkit.HighPerformance.Helpers;
+#endif
 
 namespace Microsoft.Toolkit.HighPerformance.Buffers
 {
@@ -31,6 +33,14 @@ public sealed class StringPool
         /// </summary>
         private readonly Bucket[] buckets;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StringPool"/> class.
+        /// </summary>
+        public StringPool()
+            : this(DefaultNumberOfBuckets, DefaultEntriesPerBucket)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StringPool"/> class.
         /// </summary>
@@ -38,6 +48,16 @@ public sealed class StringPool
         /// <param name="entriesPerBucket">The maximum number of <see cref="string"/> entries per bucket.</param>
         public StringPool(int numberOfBuckets, int entriesPerBucket)
         {
+            if (numberOfBuckets < 0)
+            {
+                ThrowArgumentOutOfRangeException(nameof(numberOfBuckets));
+            }
+
+            if (entriesPerBucket < 0)
+            {
+                ThrowArgumentOutOfRangeException(nameof(entriesPerBucket));
+            }
+
             Span<Bucket> span = this.buckets = new Bucket[numberOfBuckets];
 
             // We preallocate the buckets in advance, since each bucket only contains the
@@ -55,7 +75,7 @@ public StringPool(int numberOfBuckets, int entriesPerBucket)
         /// <summary>
         /// Gets the default <see cref="StringPool"/> instance.
         /// </summary>
-        public static StringPool Default { get; } = new StringPool(DefaultNumberOfBuckets, DefaultEntriesPerBucket);
+        public static StringPool Default { get; } = new StringPool();
 
         /// <summary>
         /// Gets the total number of buckets in use.
@@ -167,5 +187,13 @@ public void Reset()
                 this.entries = null;
             }
         }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when the requested size exceeds the capacity.
+        /// </summary>
+        private static void ThrowArgumentOutOfRangeException(string name)
+        {
+            throw new ArgumentOutOfRangeException(name, $"The input parameter must be greater than 0");
+        }
     }
 }

From 6f48d84c541720e59ff3f663f9b9ea9c6dff24f9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 20:46:33 +0200
Subject: [PATCH 236/595] Fixed input checks

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index cd80e90da0e..7a26065ce1d 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -48,12 +48,12 @@ public StringPool()
         /// <param name="entriesPerBucket">The maximum number of <see cref="string"/> entries per bucket.</param>
         public StringPool(int numberOfBuckets, int entriesPerBucket)
         {
-            if (numberOfBuckets < 0)
+            if (numberOfBuckets <= 0)
             {
                 ThrowArgumentOutOfRangeException(nameof(numberOfBuckets));
             }
 
-            if (entriesPerBucket < 0)
+            if (entriesPerBucket <= 0)
             {
                 ThrowArgumentOutOfRangeException(nameof(entriesPerBucket));
             }
@@ -193,7 +193,7 @@ public void Reset()
         /// </summary>
         private static void ThrowArgumentOutOfRangeException(string name)
         {
-            throw new ArgumentOutOfRangeException(name, $"The input parameter must be greater than 0");
+            throw new ArgumentOutOfRangeException(name, "The input parameter must be greater than 0");
         }
     }
 }

From 77217a363476d656fbe734569f37f620f2008ff7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 20:46:48 +0200
Subject: [PATCH 237/595] Added StringPool tests

---
 .../Buffers/Test_StringPool.cs                | 68 +++++++++++++++++++
 ...UnitTests.HighPerformance.Shared.projitems |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
new file mode 100644
index 00000000000..39b8733f1c6
--- /dev/null
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -0,0 +1,68 @@
+// 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.HighPerformance.Buffers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.HighPerformance.Buffers
+{
+    [TestClass]
+    public class Test_StringPool
+    {
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_Empty()
+        {
+            string empty = StringPool.Default.GetOrAdd(default);
+
+            Assert.AreSame(string.Empty, empty);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        [DataRow(0, 0)]
+        [DataRow(1, 0)]
+        [DataRow(0, 1)]
+        [DataRow(-3248234, 22)]
+        [DataRow(int.MinValue, int.MinValue)]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void Test_StringPool_Fail(int buckets, int entries)
+        {
+            var pool = new StringPool(buckets, entries);
+
+            Assert.Fail();
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_Misc()
+        {
+            var pool = new StringPool();
+
+            string
+                hello = pool.GetOrAdd(nameof(hello)),
+                world = pool.GetOrAdd(nameof(world)),
+                windowsCommunityToolkit = pool.GetOrAdd(nameof(windowsCommunityToolkit));
+
+            Assert.AreEqual(nameof(hello), hello);
+            Assert.AreEqual(nameof(world), world);
+            Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
+
+            Assert.AreSame(hello, pool.GetOrAdd(hello));
+            Assert.AreSame(world, pool.GetOrAdd(world));
+            Assert.AreSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit));
+
+            pool.Reset();
+
+            Assert.AreEqual(nameof(hello), hello);
+            Assert.AreEqual(nameof(world), world);
+            Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
+
+            Assert.AreNotSame(hello, pool.GetOrAdd(hello));
+            Assert.AreNotSame(world, pool.GetOrAdd(world));
+            Assert.AreNotSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit));
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
index 06b7503c5f8..3b52650e85b 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
+++ b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
@@ -12,6 +12,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_MemoryBufferWriter{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_ArrayPoolBufferWriter{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_MemoryOwner{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_StringPool.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_SpanOwner{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.2D.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />

From 4601f7e18cf17136553c47127893f95fa89b62bb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 22:42:32 +0200
Subject: [PATCH 238/595] Minor code refactoring

---
 .../Buffers/StringPool.cs                     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 7a26065ce1d..421120f7812 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -65,7 +65,7 @@ public StringPool(int numberOfBuckets, int entriesPerBucket)
             // This lets us lock on each individual buckets when retrieving a string instance.
             foreach (ref Bucket bucket in span)
             {
-                bucket = new Bucket();
+                bucket = new Bucket(entriesPerBucket);
             }
 
             NumberOfBuckets = numberOfBuckets;
@@ -105,7 +105,7 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
             lock (bucket)
             {
-                return bucket.GetOrAdd(span, EntriesPerBucket);
+                return bucket.GetOrAdd(span);
             }
         }
 
@@ -134,18 +134,31 @@ private sealed class Bucket
             /// </summary>
             private const int SignMask = ~(1 << 31);
 
+            /// <summary>
+            /// The number of entries being used in the current instance.
+            /// </summary>
+            private readonly int entriesPerBucket;
+
             /// <summary>
             /// The array of entries currently in use.
             /// </summary>
             private string?[]? entries;
 
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Bucket"/> class.
+            /// </summary>
+            /// <param name="entriesPerBucket">The number of entries being used in the current instance.</param>
+            public Bucket(int entriesPerBucket)
+            {
+                this.entriesPerBucket = entriesPerBucket;
+            }
+
             /// <summary>
             /// Implements <see cref="StringPool.GetOrAdd"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
-            /// <param name="entriesPerBucket">The number of entries being used in the current instance.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
-            public string GetOrAdd(ReadOnlySpan<char> span, int entriesPerBucket)
+            public string GetOrAdd(ReadOnlySpan<char> span)
             {
                 ref string?[]? entries = ref this.entries;
 

From 63446ce1649a312e9f59872ced53ab0e256a73d8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 22:48:00 +0200
Subject: [PATCH 239/595] Added StringPool.TryGet API

---
 .../Buffers/StringPool.cs                     | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 421120f7812..471a93169bf 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 #if !NETSTANDARD1_4
 using Microsoft.Toolkit.HighPerformance.Helpers;
@@ -109,6 +110,31 @@ public string GetOrAdd(ReadOnlySpan<char> span)
             }
         }
 
+        /// <summary>
+        /// Tries to get a cached <see cref="string"/> instance matching the input content, if present.
+        /// </summary>
+        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+        /// <param name="value">The resulting cached <see cref="string"/> instance, if present</param>
+        /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
+        public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? value)
+        {
+            if (span.IsEmpty)
+            {
+                value = string.Empty;
+
+                return true;
+            }
+
+            int bucketIndex = span.Length % NumberOfBuckets;
+
+            Bucket bucket = this.buckets.DangerousGetReferenceAt(bucketIndex);
+
+            lock (bucket)
+            {
+                return bucket.TryGet(span, out value);
+            }
+        }
+
         /// <summary>
         /// Resets the current instance and its associated buckets.
         /// </summary>
@@ -192,6 +218,41 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 #endif
             }
 
+            /// <summary>
+            /// Implements <see cref="StringPool.TryGet"/> for the current <see cref="Bucket"/> instance.
+            /// </summary>
+            /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+            /// <param name="value">The resulting cached <see cref="string"/> instance, if present</param>
+            /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
+            public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? value)
+            {
+                ref string?[]? entries = ref this.entries;
+
+                if (!(entries is null))
+                {
+                    int entryIndex =
+#if NETSTANDARD1_4
+                        (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+#else
+                        (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+#endif
+
+                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+
+                    if (!(entry is null) &&
+                        entry.AsSpan().SequenceEqual(span))
+                    {
+                        value = entry;
+
+                        return true;
+                    }
+                }
+
+                value = null;
+
+                return false;
+            }
+
             /// <summary>
             /// Resets the current array of entries.
             /// </summary>

From a877555910bd16218bd2a951d27222d538f2fa03 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 7 Jul 2020 22:58:32 +0200
Subject: [PATCH 240/595] Fixed build errors on UWP (string -> ReadOnlySpan<T>)

---
 .../Buffers/Test_StringPool.cs                 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 39b8733f1c6..3dd5a7164ab 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -42,17 +42,17 @@ public void Test_StringPool_Misc()
             var pool = new StringPool();
 
             string
-                hello = pool.GetOrAdd(nameof(hello)),
-                world = pool.GetOrAdd(nameof(world)),
-                windowsCommunityToolkit = pool.GetOrAdd(nameof(windowsCommunityToolkit));
+                hello = pool.GetOrAdd(nameof(hello).AsSpan()),
+                world = pool.GetOrAdd(nameof(world).AsSpan()),
+                windowsCommunityToolkit = pool.GetOrAdd(nameof(windowsCommunityToolkit).AsSpan());
 
             Assert.AreEqual(nameof(hello), hello);
             Assert.AreEqual(nameof(world), world);
             Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
 
-            Assert.AreSame(hello, pool.GetOrAdd(hello));
-            Assert.AreSame(world, pool.GetOrAdd(world));
-            Assert.AreSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit));
+            Assert.AreSame(hello, pool.GetOrAdd(hello.AsSpan()));
+            Assert.AreSame(world, pool.GetOrAdd(world.AsSpan()));
+            Assert.AreSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit.AsSpan()));
 
             pool.Reset();
 
@@ -60,9 +60,9 @@ public void Test_StringPool_Misc()
             Assert.AreEqual(nameof(world), world);
             Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
 
-            Assert.AreNotSame(hello, pool.GetOrAdd(hello));
-            Assert.AreNotSame(world, pool.GetOrAdd(world));
-            Assert.AreNotSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit));
+            Assert.AreNotSame(hello, pool.GetOrAdd(hello.AsSpan()));
+            Assert.AreNotSame(world, pool.GetOrAdd(world.AsSpan()));
+            Assert.AreNotSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit.AsSpan()));
         }
     }
 }

From e2737e08e0cbe5d392a327ba63850c3cbbb22f00 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 00:37:04 +0200
Subject: [PATCH 241/595] Switched Bucket type to a struct

---
 .../Buffers/StringPool.cs                     | 107 ++++++++++--------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 471a93169bf..872e23cffee 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -102,12 +102,9 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
             int bucketIndex = span.Length % NumberOfBuckets;
 
-            Bucket bucket = this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            lock (bucket)
-            {
-                return bucket.GetOrAdd(span);
-            }
+            return bucket.GetOrAdd(span);
         }
 
         /// <summary>
@@ -127,12 +124,9 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
 
             int bucketIndex = span.Length % NumberOfBuckets;
 
-            Bucket bucket = this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            lock (bucket)
-            {
-                return bucket.TryGet(span, out value);
-            }
+            return bucket.TryGet(span, out value);
         }
 
         /// <summary>
@@ -140,19 +134,16 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
         /// </summary>
         public void Reset()
         {
-            foreach (Bucket bucket in this.buckets)
+            foreach (ref Bucket bucket in this.buckets.AsSpan())
             {
-                lock (bucket)
-                {
-                    bucket.Reset();
-                }
+                bucket.Reset();
             }
         }
 
         /// <summary>
         /// A configurable bucket containing a group of cached <see cref="string"/> instances.
         /// </summary>
-        private sealed class Bucket
+        private struct Bucket
         {
             /// <summary>
             /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
@@ -165,18 +156,25 @@ private sealed class Bucket
             /// </summary>
             private readonly int entriesPerBucket;
 
+            /// <summary>
+            /// A dummy <see cref="object"/> used for synchronization.
+            /// </summary>
+            private readonly object dummy;
+
             /// <summary>
             /// The array of entries currently in use.
             /// </summary>
             private string?[]? entries;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="Bucket"/> class.
+            /// Initializes a new instance of the <see cref="Bucket"/> struct.
             /// </summary>
             /// <param name="entriesPerBucket">The number of entries being used in the current instance.</param>
             public Bucket(int entriesPerBucket)
             {
                 this.entriesPerBucket = entriesPerBucket;
+                this.dummy = new object();
+                this.entries = null;
             }
 
             /// <summary>
@@ -186,36 +184,39 @@ public Bucket(int entriesPerBucket)
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
             public string GetOrAdd(ReadOnlySpan<char> span)
             {
-                ref string?[]? entries = ref this.entries;
+                lock (this.dummy)
+                {
+                    ref string?[]? entries = ref this.entries;
 
-                entries ??= new string[entriesPerBucket];
+                    entries ??= new string[entriesPerBucket];
 
-                int entryIndex =
+                    int entryIndex =
 #if NETSTANDARD1_4
-                    (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+                        (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
 #else
-                    (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+                        (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
 #endif
 
-                ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
-                if (!(entry is null) &&
-                    entry.AsSpan().SequenceEqual(span))
-                {
-                    return entry;
-                }
+                    if (!(entry is null) &&
+                        entry.AsSpan().SequenceEqual(span))
+                    {
+                        return entry;
+                    }
 
 #if SPAN_RUNTIME_SUPPORT
-                return entry = new string(span);
+                    return entry = new string(span);
 #else
-                unsafe
-                {
-                    fixed (char* c = span)
+                    unsafe
                     {
-                        return entry = new string(c, 0, span.Length);
+                        fixed (char* c = span)
+                        {
+                            return entry = new string(c, 0, span.Length);
+                        }
                     }
-                }
 #endif
+                }
             }
 
             /// <summary>
@@ -226,31 +227,34 @@ public string GetOrAdd(ReadOnlySpan<char> span)
             /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
             public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? value)
             {
-                ref string?[]? entries = ref this.entries;
-
-                if (!(entries is null))
+                lock (this.dummy)
                 {
-                    int entryIndex =
+                    ref string?[]? entries = ref this.entries;
+
+                    if (!(entries is null))
+                    {
+                        int entryIndex =
 #if NETSTANDARD1_4
-                        (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+                            (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
 #else
-                        (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+                            (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
 #endif
 
-                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+                        ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
-                    if (!(entry is null) &&
-                        entry.AsSpan().SequenceEqual(span))
-                    {
-                        value = entry;
+                        if (!(entry is null) &&
+                            entry.AsSpan().SequenceEqual(span))
+                        {
+                            value = entry;
 
-                        return true;
+                            return true;
+                        }
                     }
-                }
 
-                value = null;
+                    value = null;
 
-                return false;
+                    return false;
+                }
             }
 
             /// <summary>
@@ -258,7 +262,10 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
             /// </summary>
             public void Reset()
             {
-                this.entries = null;
+                lock (this.dummy)
+                {
+                    this.entries = null;
+                }
             }
         }
 

From 194e082f118db738af60fe16966dd1472b071dbe Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 00:56:03 +0200
Subject: [PATCH 242/595] Added StringPool.Add(string) method

---
 .../Buffers/StringPool.cs                     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 872e23cffee..4c11994c47c 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -88,6 +88,24 @@ public StringPool(int numberOfBuckets, int entriesPerBucket)
         /// </summary>
         public int EntriesPerBucket { get; }
 
+        /// <summary>
+        /// Stores a <see cref="string"/> instance in the internal cache.
+        /// </summary>
+        /// <param name="value">The input <see cref="string"/> instance to cache.</param>
+        public void Add(string value)
+        {
+            if (value.Length == 0)
+            {
+                return;
+            }
+
+            int bucketIndex = value.Length % NumberOfBuckets;
+
+            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+
+            bucket.Add(value);
+        }
+
         /// <summary>
         /// Gets a cached <see cref="string"/> instance matching the input content, or creates a new one.
         /// </summary>
@@ -177,6 +195,29 @@ public Bucket(int entriesPerBucket)
                 this.entries = null;
             }
 
+            /// <summary>
+            /// Implements <see cref="StringPool.Add"/> for the current <see cref="Bucket"/> instance.
+            /// </summary>
+            /// <param name="value">The input <see cref="string"/> instance to cache.</param>
+            public void Add(string value)
+            {
+                lock (this.dummy)
+                {
+                    ref string?[]? entries = ref this.entries;
+
+                    entries ??= new string[entriesPerBucket];
+
+                    int entryIndex =
+#if NETSTANDARD1_4
+                        (value.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+#else
+                        (HashCode<char>.Combine(value.AsSpan()) & SignMask) % entriesPerBucket;
+#endif
+
+                    entries.DangerousGetReferenceAt(entryIndex) = value;
+                }
+            }
+
             /// <summary>
             /// Implements <see cref="StringPool.GetOrAdd"/> for the current <see cref="Bucket"/> instance.
             /// </summary>

From 769126f45fa117ccfbfbb1c6112d7e664c953129 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:08:32 +0200
Subject: [PATCH 243/595] Minor code refactoring

---
 .../Buffers/StringPool.cs                     | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 4c11994c47c..9d03eb12d2d 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 #if !NETSTANDARD1_4
 using Microsoft.Toolkit.HighPerformance.Helpers;
@@ -207,12 +209,7 @@ public void Add(string value)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex =
-#if NETSTANDARD1_4
-                        (value.GetDjb2HashCode() & SignMask) % entriesPerBucket;
-#else
-                        (HashCode<char>.Combine(value.AsSpan()) & SignMask) % entriesPerBucket;
-#endif
+                    int entryIndex = GetIndex(value.AsSpan());
 
                     entries.DangerousGetReferenceAt(entryIndex) = value;
                 }
@@ -231,12 +228,7 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex =
-#if NETSTANDARD1_4
-                        (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
-#else
-                        (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
-#endif
+                    int entryIndex = GetIndex(span);
 
                     ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -274,12 +266,7 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
 
                     if (!(entries is null))
                     {
-                        int entryIndex =
-#if NETSTANDARD1_4
-                            (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
-#else
-                            (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
-#endif
+                        int entryIndex = GetIndex(span);
 
                         ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -308,6 +295,22 @@ public void Reset()
                     this.entries = null;
                 }
             }
+
+            /// <summary>
+            /// Gets the target index for a given <see cref="ReadOnlySpan{T}"/> instance.
+            /// </summary>
+            /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
+            /// <returns>The target bucket index for <paramref name="span"/>.</returns>
+            [Pure]
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            private int GetIndex(ReadOnlySpan<char> span)
+            {
+#if NETSTANDARD1_4
+                return (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+#else
+                return (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+#endif
+            }
         }
 
         /// <summary>

From a217cfe8136462f702c4d7f6c9870780b3f17acc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:15:56 +0200
Subject: [PATCH 244/595] Added uni tests for StringPool.Add and TryGet

---
 .../Buffers/Test_StringPool.cs                | 64 +++++++++++++++----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 3dd5a7164ab..34cd301139c 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -6,20 +6,13 @@
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+#nullable enable
+
 namespace UnitTests.HighPerformance.Buffers
 {
     [TestClass]
     public class Test_StringPool
     {
-        [TestCategory("StringPool")]
-        [TestMethod]
-        public void Test_StringPool_Empty()
-        {
-            string empty = StringPool.Default.GetOrAdd(default);
-
-            Assert.AreSame(string.Empty, empty);
-        }
-
         [TestCategory("StringPool")]
         [TestMethod]
         [DataRow(0, 0)]
@@ -28,7 +21,7 @@ public void Test_StringPool_Empty()
         [DataRow(-3248234, 22)]
         [DataRow(int.MinValue, int.MinValue)]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_StringPool_Fail(int buckets, int entries)
+        public void Test_StringPool_Cctor_Fail(int buckets, int entries)
         {
             var pool = new StringPool(buckets, entries);
 
@@ -37,7 +30,56 @@ public void Test_StringPool_Fail(int buckets, int entries)
 
         [TestCategory("StringPool")]
         [TestMethod]
-        public void Test_StringPool_Misc()
+        public void Test_StringPool_Add_Empty()
+        {
+            StringPool.Default.Add(string.Empty);
+
+            bool found = StringPool.Default.TryGet(default, out string? text);
+
+            Assert.IsTrue(found);
+            Assert.AreSame(string.Empty, text);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_Add_Misc()
+        {
+            var pool = new StringPool();
+
+            string
+                hello = nameof(hello),
+                world = nameof(world),
+                windowsCommunityToolkit = nameof(windowsCommunityToolkit);
+
+            Assert.IsFalse(pool.TryGet(hello.AsSpan(), out _));
+            Assert.IsFalse(pool.TryGet(world.AsSpan(), out _));
+            Assert.IsFalse(pool.TryGet(windowsCommunityToolkit.AsSpan(), out _));
+
+            pool.Add(hello);
+            pool.Add(world);
+            pool.Add(windowsCommunityToolkit);
+
+            Assert.IsTrue(pool.TryGet(hello.AsSpan(), out string? hello2));
+            Assert.IsTrue(pool.TryGet(world.AsSpan(), out string? world2));
+            Assert.IsTrue(pool.TryGet(windowsCommunityToolkit.AsSpan(), out string? windowsCommunityToolkit2));
+
+            Assert.AreSame(hello, hello2);
+            Assert.AreSame(world, world2);
+            Assert.AreSame(windowsCommunityToolkit, windowsCommunityToolkit2);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_Empty()
+        {
+            string empty = StringPool.Default.GetOrAdd(default);
+
+            Assert.AreSame(string.Empty, empty);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_Misc()
         {
             var pool = new StringPool();
 

From 39949c81546a440113b1ca21204d2fe58897ee5e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:23:50 +0200
Subject: [PATCH 245/595] Fixed unit tests on UWP

---
 .../Buffers/Test_StringPool.cs                | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 34cd301139c..2e065009d70 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -40,6 +40,23 @@ public void Test_StringPool_Add_Empty()
             Assert.AreSame(string.Empty, text);
         }
 
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_Add_Single()
+        {
+            var pool = new StringPool();
+
+            string hello = nameof(hello);
+
+            Assert.IsFalse(pool.TryGet(hello.AsSpan(), out _));
+
+            pool.Add(hello);
+
+            Assert.IsTrue(pool.TryGet(hello.AsSpan(), out string? hello2));
+
+            Assert.AreSame(hello, hello2);
+        }
+
         [TestCategory("StringPool")]
         [TestMethod]
         public void Test_StringPool_Add_Misc()
@@ -48,23 +65,23 @@ public void Test_StringPool_Add_Misc()
 
             string
                 hello = nameof(hello),
-                world = nameof(world),
+                helloworld = nameof(helloworld),
                 windowsCommunityToolkit = nameof(windowsCommunityToolkit);
 
             Assert.IsFalse(pool.TryGet(hello.AsSpan(), out _));
-            Assert.IsFalse(pool.TryGet(world.AsSpan(), out _));
+            Assert.IsFalse(pool.TryGet(helloworld.AsSpan(), out _));
             Assert.IsFalse(pool.TryGet(windowsCommunityToolkit.AsSpan(), out _));
 
             pool.Add(hello);
-            pool.Add(world);
+            pool.Add(helloworld);
             pool.Add(windowsCommunityToolkit);
 
             Assert.IsTrue(pool.TryGet(hello.AsSpan(), out string? hello2));
-            Assert.IsTrue(pool.TryGet(world.AsSpan(), out string? world2));
+            Assert.IsTrue(pool.TryGet(helloworld.AsSpan(), out string? world2));
             Assert.IsTrue(pool.TryGet(windowsCommunityToolkit.AsSpan(), out string? windowsCommunityToolkit2));
 
             Assert.AreSame(hello, hello2);
-            Assert.AreSame(world, world2);
+            Assert.AreSame(helloworld, world2);
             Assert.AreSame(windowsCommunityToolkit, windowsCommunityToolkit2);
         }
 
@@ -85,25 +102,25 @@ public void Test_StringPool_GetOrAdd_Misc()
 
             string
                 hello = pool.GetOrAdd(nameof(hello).AsSpan()),
-                world = pool.GetOrAdd(nameof(world).AsSpan()),
+                helloworld = pool.GetOrAdd(nameof(helloworld).AsSpan()),
                 windowsCommunityToolkit = pool.GetOrAdd(nameof(windowsCommunityToolkit).AsSpan());
 
             Assert.AreEqual(nameof(hello), hello);
-            Assert.AreEqual(nameof(world), world);
+            Assert.AreEqual(nameof(helloworld), helloworld);
             Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
 
             Assert.AreSame(hello, pool.GetOrAdd(hello.AsSpan()));
-            Assert.AreSame(world, pool.GetOrAdd(world.AsSpan()));
+            Assert.AreSame(helloworld, pool.GetOrAdd(helloworld.AsSpan()));
             Assert.AreSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit.AsSpan()));
 
             pool.Reset();
 
             Assert.AreEqual(nameof(hello), hello);
-            Assert.AreEqual(nameof(world), world);
+            Assert.AreEqual(nameof(helloworld), helloworld);
             Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
 
             Assert.AreNotSame(hello, pool.GetOrAdd(hello.AsSpan()));
-            Assert.AreNotSame(world, pool.GetOrAdd(world.AsSpan()));
+            Assert.AreNotSame(helloworld, pool.GetOrAdd(helloworld.AsSpan()));
             Assert.AreNotSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit.AsSpan()));
         }
     }

From 76b3115ecfa43b5ffc8116994031f63f459830c6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:51:04 +0200
Subject: [PATCH 246/595] Added GetOrAdd(string) overload

---
 .../Buffers/StringPool.cs                     | 52 +++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 9d03eb12d2d..b9cdab7dcd1 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -16,8 +16,8 @@ namespace Microsoft.Toolkit.HighPerformance.Buffers
     /// <summary>
     /// A configurable pool for <see cref="string"/> instances. This can be used to minimize allocations
     /// when creating multiple <see cref="string"/> instances from buffers of <see cref="char"/> values.
-    /// The <see cref="GetOrAdd"/> method provides a best-effort alternative to just creating a new
-    /// <see cref="string"/> instance every time, in order to minimize the number of duplicated instances.
+    /// The <see cref="GetOrAdd(ReadOnlySpan{char})"/> method provides a best-effort alternative to just creating
+    /// a new <see cref="string"/> instance every time, in order to minimize the number of duplicated instances.
     /// </summary>
     public sealed class StringPool
     {
@@ -108,6 +108,25 @@ public void Add(string value)
             bucket.Add(value);
         }
 
+        /// <summary>
+        /// Gets a cached <see cref="string"/> instance matching the input content, or stores the input one.
+        /// </summary>
+        /// <param name="value">The input <see cref="string"/> instance with the contents to use.</param>
+        /// <returns>A <see cref="string"/> instance with the contents of <paramref name="value"/>, cached if possible.</returns>
+        public string GetOrAdd(string value)
+        {
+            if (value.Length == 0)
+            {
+                return string.Empty;
+            }
+
+            int bucketIndex = value.Length % NumberOfBuckets;
+
+            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+
+            return bucket.GetOrAdd(value);
+        }
+
         /// <summary>
         /// Gets a cached <see cref="string"/> instance matching the input content, or creates a new one.
         /// </summary>
@@ -216,7 +235,34 @@ public void Add(string value)
             }
 
             /// <summary>
-            /// Implements <see cref="StringPool.GetOrAdd"/> for the current <see cref="Bucket"/> instance.
+            /// Implements <see cref="StringPool.GetOrAdd(string)"/> for the current <see cref="Bucket"/> instance.
+            /// </summary>
+            /// <param name="value">The input <see cref="string"/> instance with the contents to use.</param>
+            /// <returns>A <see cref="string"/> instance with the contents of <paramref name="value"/>.</returns>
+            public string GetOrAdd(string value)
+            {
+                lock (this.dummy)
+                {
+                    ref string?[]? entries = ref this.entries;
+
+                    entries ??= new string[entriesPerBucket];
+
+                    int entryIndex = GetIndex(value.AsSpan());
+
+                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+
+                    if (!(entry is null) &&
+                        entry.AsSpan().SequenceEqual(value.AsSpan()))
+                    {
+                        return entry;
+                    }
+
+                    return entry = value;
+                }
+            }
+
+            /// <summary>
+            /// Implements <see cref="StringPool.GetOrAdd(ReadOnlySpan{char})"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>

From bab3d82a27623d9314a997b8582b63f30b5a02b3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:52:54 +0200
Subject: [PATCH 247/595] Minor tweaks to unit tests

---
 .../Buffers/Test_StringPool.cs                                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 2e065009d70..bfc7521775f 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -34,7 +34,7 @@ public void Test_StringPool_Add_Empty()
         {
             StringPool.Default.Add(string.Empty);
 
-            bool found = StringPool.Default.TryGet(default, out string? text);
+            bool found = StringPool.Default.TryGet(ReadOnlySpan<char>.Empty, out string? text);
 
             Assert.IsTrue(found);
             Assert.AreSame(string.Empty, text);
@@ -89,7 +89,7 @@ public void Test_StringPool_Add_Misc()
         [TestMethod]
         public void Test_StringPool_GetOrAdd_Empty()
         {
-            string empty = StringPool.Default.GetOrAdd(default);
+            string empty = StringPool.Default.GetOrAdd(ReadOnlySpan<char>.Empty);
 
             Assert.AreSame(string.Empty, empty);
         }

From 1958ac6c3c3e2929fb0242b60e1f4fded182b066 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 01:58:13 +0200
Subject: [PATCH 248/595] Minor code refactoring

---
 .../Buffers/StringPool.cs                         | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index b9cdab7dcd1..9c9e52667a2 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -284,17 +284,10 @@ public string GetOrAdd(ReadOnlySpan<char> span)
                         return entry;
                     }
 
-#if SPAN_RUNTIME_SUPPORT
-                    return entry = new string(span);
-#else
-                    unsafe
-                    {
-                        fixed (char* c = span)
-                        {
-                            return entry = new string(c, 0, span.Length);
-                        }
-                    }
-#endif
+                    // ReadOnlySpan<char>.ToString() creates a string with the span contents.
+                    // This is equivalent to doing new string(span) on Span<T>-enabled runtimes,
+                    // or to using an unsafe block, a fixed statement and new string(char*, int, int).
+                    return entry = span.ToString();
                 }
             }
 

From 96196fee1a528b65636700ca17427757ac5e971f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 02:01:55 +0200
Subject: [PATCH 249/595] Added unit tests for GetOrAdd(string) overload

---
 .../Buffers/Test_StringPool.cs                | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index bfc7521775f..03fae39384e 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -87,7 +87,43 @@ public void Test_StringPool_Add_Misc()
 
         [TestCategory("StringPool")]
         [TestMethod]
-        public void Test_StringPool_GetOrAdd_Empty()
+        public void Test_StringPool_GetOrAdd_String_Empty()
+        {
+            string empty = StringPool.Default.GetOrAdd(string.Empty);
+
+            Assert.AreSame(string.Empty, empty);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_String_Misc()
+        {
+            var pool = new StringPool();
+
+            string helloworld = nameof(helloworld);
+
+            string cached = pool.GetOrAdd(helloworld);
+
+            Assert.AreSame(helloworld, cached);
+
+            Span<char> span = stackalloc char[helloworld.Length];
+
+            helloworld.AsSpan().CopyTo(span);
+
+            string helloworld2 = span.ToString();
+
+            cached = pool.GetOrAdd(helloworld2);
+
+            Assert.AreSame(helloworld, cached);
+
+            cached = pool.GetOrAdd(new string(helloworld.ToCharArray()));
+
+            Assert.AreSame(helloworld, cached);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_ReadOnlySpan_Empty()
         {
             string empty = StringPool.Default.GetOrAdd(ReadOnlySpan<char>.Empty);
 
@@ -96,7 +132,7 @@ public void Test_StringPool_GetOrAdd_Empty()
 
         [TestCategory("StringPool")]
         [TestMethod]
-        public void Test_StringPool_GetOrAdd_Misc()
+        public void Test_StringPool_GetOrAdd_ReadOnlySpan_Misc()
         {
             var pool = new StringPool();
 

From cc143714022de85ab1c47d61263645b65552c1ef Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 12:03:51 +0200
Subject: [PATCH 250/595] Added GetOrAdd(ReadOnlySpan<byte>, Encoding) overload

---
 .../Buffers/StringPool.cs                     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 9c9e52667a2..c8c9f2c37e4 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
+using System.Text;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 #if !NETSTANDARD1_4
 using Microsoft.Toolkit.HighPerformance.Helpers;
@@ -146,6 +147,32 @@ public string GetOrAdd(ReadOnlySpan<char> span)
             return bucket.GetOrAdd(span);
         }
 
+        /// <summary>
+        /// Gets a cached <see cref="string"/> instance matching the input content (converted to Unicode), or creates a new one.
+        /// </summary>
+        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use, in a specified encoding.</param>
+        /// <param name="encoding">The <see cref="Encoding"/> instance to use to decode the contents of <paramref name="span"/>.</param>
+        /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
+        public unsafe string GetOrAdd(ReadOnlySpan<byte> span, Encoding encoding)
+        {
+            if (span.IsEmpty)
+            {
+                return string.Empty;
+            }
+
+            int maxLength = encoding.GetMaxCharCount(span.Length);
+
+            using SpanOwner<char> buffer = SpanOwner<char>.Allocate(maxLength);
+
+            fixed (byte* source = span)
+            fixed (char* destination = &buffer.DangerousGetReference())
+            {
+                int effectiveLength = encoding.GetChars(source, span.Length, destination, maxLength);
+
+                return GetOrAdd(new ReadOnlySpan<char>(destination, effectiveLength));
+            }
+        }
+
         /// <summary>
         /// Tries to get a cached <see cref="string"/> instance matching the input content, if present.
         /// </summary>

From cfb6d230ef623e325e04c6bbd06ae8dfc1ab1a54 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 12:08:11 +0200
Subject: [PATCH 251/595] Added tests for GetOrAdd with encoding

---
 .../Buffers/Test_StringPool.cs                | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 03fae39384e..249620ba440 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Text;
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -159,5 +160,41 @@ public void Test_StringPool_GetOrAdd_ReadOnlySpan_Misc()
             Assert.AreNotSame(helloworld, pool.GetOrAdd(helloworld.AsSpan()));
             Assert.AreNotSame(windowsCommunityToolkit, pool.GetOrAdd(windowsCommunityToolkit.AsSpan()));
         }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_Encoding_Empty()
+        {
+            string empty = StringPool.Default.GetOrAdd(ReadOnlySpan<byte>.Empty, Encoding.ASCII);
+
+            Assert.AreSame(string.Empty, empty);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_Encoding_Misc()
+        {
+            var pool = new StringPool();
+
+            string helloworld = nameof(helloworld);
+
+            pool.Add(helloworld);
+
+            Span<byte> span = Encoding.UTF8.GetBytes(nameof(helloworld));
+
+            string helloworld2 = pool.GetOrAdd(span, Encoding.UTF8);
+
+            Assert.AreSame(helloworld, helloworld2);
+
+            string windowsCommunityToolkit = nameof(windowsCommunityToolkit);
+
+            Span<byte> span2 = Encoding.ASCII.GetBytes(windowsCommunityToolkit);
+
+            string
+                windowsCommunityToolkit2 = pool.GetOrAdd(span2, Encoding.ASCII),
+                windowsCommunityToolkit3 = pool.GetOrAdd(windowsCommunityToolkit);
+
+            Assert.AreSame(windowsCommunityToolkit2, windowsCommunityToolkit3);
+        }
     }
 }

From 3134668217bc3781ed2fccdf5993d6566e63bcb8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Jul 2020 16:12:18 +0200
Subject: [PATCH 252/595] Improved StringPool distribution

We're now using the content hashcode to calculate both the bucket index and the entry index, so that even if a given StringPool instance is used just with a series of strings with a very small range of different lengths, all the available buckets will still be used
---
 .../Buffers/StringPool.cs                     | 85 +++++++++++--------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index c8c9f2c37e4..bfa98446209 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -32,6 +32,12 @@ public sealed class StringPool
         /// </summary>
         private const int DefaultEntriesPerBucket = 64;
 
+        /// <summary>
+        /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
+        /// This will ignore overflows, as we just need this to map hashcodes into the valid bucket range.
+        /// </summary>
+        private const int SignMask = ~(1 << 31);
+
         /// <summary>
         /// The current array of <see cref="Bucket"/> instances in use.
         /// </summary>
@@ -102,11 +108,13 @@ public void Add(string value)
                 return;
             }
 
-            int bucketIndex = value.Length % NumberOfBuckets;
+            int
+                hashcode = GetHashCode(value.AsSpan()),
+                bucketIndex = hashcode % NumberOfBuckets;
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            bucket.Add(value);
+            bucket.Add(value, hashcode);
         }
 
         /// <summary>
@@ -121,11 +129,13 @@ public string GetOrAdd(string value)
                 return string.Empty;
             }
 
-            int bucketIndex = value.Length % NumberOfBuckets;
+            int
+                hashcode = GetHashCode(value.AsSpan()),
+                bucketIndex = hashcode % NumberOfBuckets;
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.GetOrAdd(value);
+            return bucket.GetOrAdd(value, hashcode);
         }
 
         /// <summary>
@@ -140,11 +150,13 @@ public string GetOrAdd(ReadOnlySpan<char> span)
                 return string.Empty;
             }
 
-            int bucketIndex = span.Length % NumberOfBuckets;
+            int
+                hashcode = GetHashCode(span),
+                bucketIndex = hashcode % NumberOfBuckets;
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.GetOrAdd(span);
+            return bucket.GetOrAdd(span, hashcode);
         }
 
         /// <summary>
@@ -188,11 +200,13 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
                 return true;
             }
 
-            int bucketIndex = span.Length % NumberOfBuckets;
+            int
+                hashcode = GetHashCode(span),
+                bucketIndex = hashcode % NumberOfBuckets;
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.TryGet(span, out value);
+            return bucket.TryGet(span, hashcode, out value);
         }
 
         /// <summary>
@@ -211,12 +225,6 @@ public void Reset()
         /// </summary>
         private struct Bucket
         {
-            /// <summary>
-            /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
-            /// This will ignore overflows, as we just need this to map hashcodes into the valid bucket range.
-            /// </summary>
-            private const int SignMask = ~(1 << 31);
-
             /// <summary>
             /// The number of entries being used in the current instance.
             /// </summary>
@@ -247,7 +255,8 @@ public Bucket(int entriesPerBucket)
             /// Implements <see cref="StringPool.Add"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="value">The input <see cref="string"/> instance to cache.</param>
-            public void Add(string value)
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
+            public void Add(string value, int hashcode)
             {
                 lock (this.dummy)
                 {
@@ -255,7 +264,7 @@ public void Add(string value)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = GetIndex(value.AsSpan());
+                    int entryIndex = hashcode % this.entriesPerBucket;
 
                     entries.DangerousGetReferenceAt(entryIndex) = value;
                 }
@@ -265,8 +274,9 @@ public void Add(string value)
             /// Implements <see cref="StringPool.GetOrAdd(string)"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="value">The input <see cref="string"/> instance with the contents to use.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="value"/>.</returns>
-            public string GetOrAdd(string value)
+            public string GetOrAdd(string value, int hashcode)
             {
                 lock (this.dummy)
                 {
@@ -274,7 +284,7 @@ public string GetOrAdd(string value)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = GetIndex(value.AsSpan());
+                    int entryIndex = hashcode % this.entriesPerBucket;
 
                     ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -292,8 +302,9 @@ public string GetOrAdd(string value)
             /// Implements <see cref="StringPool.GetOrAdd(ReadOnlySpan{char})"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
-            public string GetOrAdd(ReadOnlySpan<char> span)
+            public string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
             {
                 lock (this.dummy)
                 {
@@ -301,7 +312,7 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = GetIndex(span);
+                    int entryIndex = hashcode % this.entriesPerBucket;
 
                     ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -322,9 +333,10 @@ public string GetOrAdd(ReadOnlySpan<char> span)
             /// Implements <see cref="StringPool.TryGet"/> for the current <see cref="Bucket"/> instance.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
             /// <param name="value">The resulting cached <see cref="string"/> instance, if present</param>
             /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
-            public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? value)
+            public bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] out string? value)
             {
                 lock (this.dummy)
                 {
@@ -332,7 +344,7 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
 
                     if (!(entries is null))
                     {
-                        int entryIndex = GetIndex(span);
+                        int entryIndex = hashcode % this.entriesPerBucket;
 
                         ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -361,22 +373,27 @@ public void Reset()
                     this.entries = null;
                 }
             }
+        }
 
-            /// <summary>
-            /// Gets the target index for a given <see cref="ReadOnlySpan{T}"/> instance.
-            /// </summary>
-            /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-            /// <returns>The target bucket index for <paramref name="span"/>.</returns>
-            [Pure]
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            private int GetIndex(ReadOnlySpan<char> span)
-            {
+        /// <summary>
+        /// Gets the (positive) hashcode for a given <see cref="ReadOnlySpan{T}"/> instance.
+        /// </summary>
+        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
+        /// <returns>The hashcode for <paramref name="span"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int GetHashCode(ReadOnlySpan<char> span)
+        {
+            // We calculate the content hashcode for the input span and
+            // perform a XOR with the input length, to try to reduce collisions
+            // in case two sequences of different length result in the same one.
+            return
+                span.Length ^
 #if NETSTANDARD1_4
-                return (span.GetDjb2HashCode() & SignMask) % entriesPerBucket;
+                (span.GetDjb2HashCode() & SignMask);
 #else
-                return (HashCode<char>.Combine(span) & SignMask) % entriesPerBucket;
+                (HashCode<char>.Combine(span) & SignMask);
 #endif
-            }
         }
 
         /// <summary>

From 3055a461436c5d7b2efe50c741f2f7da104cc103 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 8 Jul 2020 16:11:57 -0700
Subject: [PATCH 253/595] Updated TFM of Notifications package from
 netcoreapp3.0 to netcoreapp3.1.

---
 .../Microsoft.Toolkit.Services.csproj         | 24 ++++---------------
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |  2 +-
 .../Helpers/Test_StorageFileHelper.cs         |  2 +-
 .../Helpers/Test_StreamHelper.cs              |  2 +-
 azure-pipelines.yml                           | 11 ++-------
 5 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index 069fbd9eb27..1db59a5b434 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -19,6 +19,11 @@
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <UseWpf>true</UseWpf>
+    <EnableDefaultPageItems>false</EnableDefaultPageItems>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
@@ -40,28 +45,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462'">
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
-    <Page Update="PlatformSpecific\NetFramework\PopupWPF.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Update="PlatformSpecific\NetFramework\PopupWPF.xaml.cs">
-      <DependentUpon>PlatformSpecific\NetFramework\PopupWPF.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index c030d26f429..e62e7d57b1e 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
     <Title>Windows Community Toolkit Notifications</Title>
     <Description>
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
index ca5218860d5..41d1f36f462 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
@@ -15,7 +15,7 @@ namespace UnitTests.Helpers
     public class Test_StorageFileHelper
     {
         private const string Sampletext = "Lorem ipsum dolor sit amet";
-        private const string Filename = "filename.txt";
+        private const string Filename = "Test_StorageFileHelper_file.txt";
         private const string PackagedFilePath = @"Assets\Samples\lorem.txt";
 
         [TestCategory("Helpers")]
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
index 4cc10793cd0..5e7ef684d64 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
@@ -17,7 +17,7 @@ namespace UnitTests.Helpers
     public class Test_StreamHelper
     {
         private const string SampleText = "Lorem ipsum dolor sit amet";
-        private const string Filename = "filename.txt";
+        private const string Filename = "Test_StreamHelper_file.txt";
         private const string PackagedFilePath = @"Assets\Samples\lorem.txt";
 
         [TestCategory("Helpers")]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0464d953939..76470fb759b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,16 +21,9 @@ steps:
   displayName: Setup Environment Variables
   
 - task: NuGetToolInstaller@0
-  displayName: Use NuGet 5.0.0
+  displayName: Use NuGet 5.6.0
   inputs:
-    versionSpec: 5.0.0
-
-- task: UseDotNet@2
-  inputs:
-    packageType: 'sdk'
-    version: '3.1.200'
-    performMultiLevelLookup: true
-  displayName: Use .NET Core sdk 3
+    versionSpec: 5.6.0
 
 - task: DotNetCoreCLI@2  
   inputs:

From 5ebb510ca11361c2b176bc2fd8fab18a3729430d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Jul 2020 18:45:12 +0200
Subject: [PATCH 254/595] Restructured buckets/entries setup with target size

---
 .../Buffers/StringPool.cs                     | 137 ++++++++++++++----
 .../Buffers/Test_StringPool.cs                |  45 +++++-
 2 files changed, 143 insertions(+), 39 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index bfa98446209..1a218ccbf80 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -5,6 +5,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+#if NETCOREAPP3_1
+using System.Numerics;
+#endif
 using System.Runtime.CompilerServices;
 using System.Text;
 using Microsoft.Toolkit.HighPerformance.Extensions;
@@ -23,14 +26,14 @@ namespace Microsoft.Toolkit.HighPerformance.Buffers
     public sealed class StringPool
     {
         /// <summary>
-        /// The default number of <see cref="Bucket"/> instances in <see cref="buckets"/>.
+        /// The size for the <see cref="Default"/> instance.
         /// </summary>
-        private const int DefaultNumberOfBuckets = 20;
+        private const int DefaultSize = 2048;
 
         /// <summary>
-        /// The default number of entries stored in each <see cref="Bucket"/> instance.
+        /// The minimum size for <see cref="StringPool"/> instances.
         /// </summary>
-        private const int DefaultEntriesPerBucket = 64;
+        private const int MinimumSize = 32;
 
         /// <summary>
         /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
@@ -43,59 +46,129 @@ public sealed class StringPool
         /// </summary>
         private readonly Bucket[] buckets;
 
+        /// <summary>
+        /// The total number of buckets in use.
+        /// </summary>
+        private readonly int numberOfBuckets;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StringPool"/> class.
         /// </summary>
         public StringPool()
-            : this(DefaultNumberOfBuckets, DefaultEntriesPerBucket)
+            : this(DefaultSize)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StringPool"/> class.
         /// </summary>
-        /// <param name="numberOfBuckets">The total number of buckets to use.</param>
-        /// <param name="entriesPerBucket">The maximum number of <see cref="string"/> entries per bucket.</param>
-        public StringPool(int numberOfBuckets, int entriesPerBucket)
+        /// <param name="minimumSize">The minimum size for the pool to create.</param>
+        public StringPool(int minimumSize)
         {
-            if (numberOfBuckets <= 0)
+            if (minimumSize <= 0)
+            {
+                ThrowArgumentOutOfRangeException();
+            }
+
+            // Set the minimum size
+            minimumSize = Math.Max(minimumSize, MinimumSize);
+
+            // Calculates the rounded up factors for a specific size/factor pair
+            static void FindFactors(int size, int factor, out int x, out int y)
+            {
+                double
+                    a = Math.Sqrt((double)size / factor),
+                    b = factor * a;
+
+                x = RoundUpPowerOfTwo((int)a);
+                y = RoundUpPowerOfTwo((int)b);
+            }
+
+            // We want to find two powers of 2 factors that produce a number
+            // that is at least equal to the requested size. In order to find the
+            // combination producing the optimal factors (with the product being as
+            // close as possible to the requested size), we test a number of ratios
+            // that we consider acceptable, and pick the best results produced.
+            // The ratio between buckets influences the number of objects being allocated,
+            // as well as the multithreading performance when locking on buckets.
+            // We still want to contraint this number to avoid situations where we
+            // have a way too high number of buckets compared to total size.
+            FindFactors(minimumSize, 2, out int x2, out int y2);
+            FindFactors(minimumSize, 3, out int x3, out int y3);
+            FindFactors(minimumSize, 4, out int x4, out int y4);
+
+            int
+                p2 = x2 * y2,
+                p3 = x3 * y3,
+                p4 = x4 * y4;
+
+            if (p3 < p2)
             {
-                ThrowArgumentOutOfRangeException(nameof(numberOfBuckets));
+                p2 = p3;
+                x2 = x3;
+                y2 = y3;
             }
 
-            if (entriesPerBucket <= 0)
+            if (p4 < p2)
             {
-                ThrowArgumentOutOfRangeException(nameof(entriesPerBucket));
+                p2 = p4;
+                x2 = x4;
+                y2 = y4;
             }
 
-            Span<Bucket> span = this.buckets = new Bucket[numberOfBuckets];
+            Span<Bucket> span = this.buckets = new Bucket[x2];
 
             // We preallocate the buckets in advance, since each bucket only contains the
             // array field, which is not preinitialized, so the allocations are minimal.
             // This lets us lock on each individual buckets when retrieving a string instance.
             foreach (ref Bucket bucket in span)
             {
-                bucket = new Bucket(entriesPerBucket);
+                bucket = new Bucket(y2);
             }
 
-            NumberOfBuckets = numberOfBuckets;
-            EntriesPerBucket = entriesPerBucket;
+            this.numberOfBuckets = x2;
+
+            Size = p2;
         }
 
         /// <summary>
-        /// Gets the default <see cref="StringPool"/> instance.
+        /// Rounds up an <see cref="int"/> value to a power of 2.
         /// </summary>
-        public static StringPool Default { get; } = new StringPool();
+        /// <param name="x">The input value to round up.</param>
+        /// <returns>The smallest power of two greater than or equal to <paramref name="x"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int RoundUpPowerOfTwo(int x)
+        {
+#if NETCOREAPP3_1
+            return 1 << (32 - BitOperations.LeadingZeroCount((uint)(x - 1)));
+#else
+            x--;
+            x |= x >> 1;
+            x |= x >> 2;
+            x |= x >> 4;
+            x |= x >> 8;
+            x |= x >> 16;
+            x++;
+
+            return x;
+#endif
+        }
 
         /// <summary>
-        /// Gets the total number of buckets in use.
+        /// Gets the default <see cref="StringPool"/> instance.
         /// </summary>
-        public int NumberOfBuckets { get; }
+        public static StringPool Default { get; } = new StringPool();
 
         /// <summary>
-        /// Gets the maximum number of <see cref="string"/> entries stored in each bucket.
+        /// Gets the total number of <see cref="string"/> that can be stored in the current instance.
+        /// <remarks>
+        /// This property only refers to the total number of available slots, ignoring collisions.
+        /// The requested size should always be set to a higher value than the target number of items
+        /// that will be stored in the cache, to reduce the number of collisions when caching values.
+        /// </remarks>
         /// </summary>
-        public int EntriesPerBucket { get; }
+        public int Size { get; }
 
         /// <summary>
         /// Stores a <see cref="string"/> instance in the internal cache.
@@ -110,7 +183,7 @@ public void Add(string value)
 
             int
                 hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode % NumberOfBuckets;
+                bucketIndex = hashcode & (this.numberOfBuckets - 1);
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
@@ -131,7 +204,7 @@ public string GetOrAdd(string value)
 
             int
                 hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode % NumberOfBuckets;
+                bucketIndex = hashcode & (this.numberOfBuckets - 1);
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
@@ -152,7 +225,7 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
             int
                 hashcode = GetHashCode(span),
-                bucketIndex = hashcode % NumberOfBuckets;
+                bucketIndex = hashcode & (this.numberOfBuckets - 1);
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
@@ -202,7 +275,7 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
 
             int
                 hashcode = GetHashCode(span),
-                bucketIndex = hashcode % NumberOfBuckets;
+                bucketIndex = hashcode & (this.numberOfBuckets - 1);
 
             ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
 
@@ -264,7 +337,7 @@ public void Add(string value, int hashcode)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = hashcode % this.entriesPerBucket;
+                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
 
                     entries.DangerousGetReferenceAt(entryIndex) = value;
                 }
@@ -284,7 +357,7 @@ public string GetOrAdd(string value, int hashcode)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = hashcode % this.entriesPerBucket;
+                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
 
                     ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -312,7 +385,7 @@ public string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
 
                     entries ??= new string[entriesPerBucket];
 
-                    int entryIndex = hashcode % this.entriesPerBucket;
+                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
 
                     ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -344,7 +417,7 @@ public bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] ou
 
                     if (!(entries is null))
                     {
-                        int entryIndex = hashcode % this.entriesPerBucket;
+                        int entryIndex = hashcode & (this.entriesPerBucket - 1);
 
                         ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
 
@@ -399,9 +472,9 @@ private static int GetHashCode(ReadOnlySpan<char> span)
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when the requested size exceeds the capacity.
         /// </summary>
-        private static void ThrowArgumentOutOfRangeException(string name)
+        private static void ThrowArgumentOutOfRangeException()
         {
-            throw new ArgumentOutOfRangeException(name, "The input parameter must be greater than 0");
+            throw new ArgumentOutOfRangeException("minimumSize", "The requested size must be greater than 0");
         }
     }
 }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 249620ba440..e9da8268b70 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Reflection;
 using System.Text;
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -16,15 +17,45 @@ public class Test_StringPool
     {
         [TestCategory("StringPool")]
         [TestMethod]
-        [DataRow(0, 0)]
-        [DataRow(1, 0)]
-        [DataRow(0, 1)]
-        [DataRow(-3248234, 22)]
-        [DataRow(int.MinValue, int.MinValue)]
+        [DataRow(44, 4, 16, 64)]
+        [DataRow(76, 8, 16, 128)]
+        [DataRow(128, 8, 16, 128)]
+        [DataRow(179, 8, 32, 256)]
+        [DataRow(366, 16, 32, 512)]
+        [DataRow(512, 16, 32, 512)]
+        [DataRow(890, 16, 64, 1024)]
+        [DataRow(1280, 32, 64, 2048)]
+        [DataRow(2445, 32, 128, 4096)]
+        [DataRow(5000, 64, 128, 8192)]
+        [DataRow(8000, 64, 128, 8192)]
+        [DataRow(12442, 64, 256, 16384)]
+        [DataRow(234000, 256, 1024, 262144)]
+        public void Test_StringPool_Cctor_Ok(int minimumSize, int x, int y, int size)
+        {
+            var pool = new StringPool(minimumSize);
+
+            Assert.AreEqual(size, pool.Size);
+
+            Array buckets = (Array)typeof(StringPool).GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
+
+            Assert.AreEqual(x, buckets.Length);
+
+            Type bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+Bucket, Microsoft.Toolkit.HighPerformance");
+
+            int bucketSize = (int)bucketType.GetField("entriesPerBucket", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(buckets.GetValue(0));
+
+            Assert.AreEqual(y, bucketSize);
+        }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        [DataRow(0)]
+        [DataRow(-3248234)]
+        [DataRow(int.MinValue)]
         [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_StringPool_Cctor_Fail(int buckets, int entries)
+        public void Test_StringPool_Cctor_Fail(int size)
         {
-            var pool = new StringPool(buckets, entries);
+            var pool = new StringPool(size);
 
             Assert.Fail();
         }

From 14896611b4c2e6133b02d201e7a15df083938b75 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 9 Jul 2020 18:46:16 +0200
Subject: [PATCH 255/595] Reverted hashcode computation to just SIMD djb2

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 1a218ccbf80..04012c29303 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -457,15 +457,10 @@ public void Reset()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static int GetHashCode(ReadOnlySpan<char> span)
         {
-            // We calculate the content hashcode for the input span and
-            // perform a XOR with the input length, to try to reduce collisions
-            // in case two sequences of different length result in the same one.
-            return
-                span.Length ^
 #if NETSTANDARD1_4
-                (span.GetDjb2HashCode() & SignMask);
+            return span.GetDjb2HashCode() & SignMask;
 #else
-                (HashCode<char>.Combine(span) & SignMask);
+            return HashCode<char>.Combine(span) & SignMask;
 #endif
         }
 

From c6d65a2ff2c976baaf24f1143e561fe8fb94ca16 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 14:40:29 +0200
Subject: [PATCH 256/595] Added ISubscriber<TMessage> interface, new extensions

---
 .../ComponentModel/ViewModelBase.cs           |  8 ++
 .../Messaging/ISubscriber{TMessage}.cs        | 20 +++++
 .../Messaging/MessengerExtensions.Default.cs  | 80 +++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 4a6f8680390..b0743fe3692 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -73,8 +73,16 @@ public bool IsActive
         /// Raised whenever the <see cref="IsActive"/> property is set to <see langword="true"/>.
         /// Use this method to register to messages and do other initialization for this instance.
         /// </summary>
+        /// <remarks>
+        /// The base implementation registers all messages for this recipients that have been declared
+        /// explicitly through the <see cref="ISubscriber{TMessage}"/> interface, using the default channel.
+        /// For more details on how this works, see the <see cref="MessengerExtensions.Register"/> method.
+        /// If you need more fine tuned control, want to register messages individually or just prefer
+        /// the lambda-style syntax for message registration, override this method and register manually.
+        /// </remarks>
         protected virtual void OnActivated()
         {
+            Messenger.Register(this);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs b/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
new file mode 100644
index 00000000000..610fbc3e1ce
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
@@ -0,0 +1,20 @@
+// 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.Mvvm.Messaging
+{
+    /// <summary>
+    /// An interface for a recipient that declares a registration for a specific message type.
+    /// </summary>
+    /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+    public interface ISubscriber<in TMessage>
+        where TMessage : class
+    {
+        /// <summary>
+        /// Receives a given <typeparamref name="TMessage"/> message instance.
+        /// </summary>
+        /// <param name="message">The message being received.</param>
+        void Receive(TMessage message);
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
index 3aabce5212c..76bf7ce06e4 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics.Contracts;
+using System.Reflection;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -27,6 +28,85 @@ public static bool IsRegistered<TMessage>(this IMessenger messenger, object reci
             return messenger.IsRegistered<TMessage, Unit>(recipient, default);
         }
 
+        /// <summary>
+        /// Registers all declared message handlers for a given recipient, using the default channel.
+        /// </summary>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <remarks>See notes for <see cref="Register{TToken}(IMessenger,object,TToken)"/> for more info.</remarks>
+        public static void Register(this IMessenger messenger, object recipient)
+        {
+            messenger.Register(recipient, default(Unit));
+        }
+
+        /// <summary>
+        /// Registers all declared message handlers for a given recipient.
+        /// </summary>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to receive messages.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <remarks>
+        /// This method will register all messages corresponding to the <see cref="ISubscriber{TMessage}"/> interfaces
+        /// being implemented by <paramref name="recipient"/>. If none are present, this method will do nothing.
+        /// Note that unlike all other extensions, this method will use reflection to find the handlers to register.
+        /// Once the registration is complete though, the performance will be exactly the same as with handlers
+        /// registered directly through any of the other generic extensions for the <see cref="IMessenger"/> interface.
+        /// </remarks>
+        public static void Register<TToken>(this IMessenger messenger, object recipient, TToken token)
+            where TToken : IEquatable<TToken>
+        {
+            foreach (Type subscriptionType in recipient.GetType().GetInterfaces())
+            {
+                if (!subscriptionType.IsGenericType ||
+                    subscriptionType.GetGenericTypeDefinition() != typeof(ISubscriber<>))
+                {
+                    return;
+                }
+
+                Type messageType = subscriptionType.GenericTypeArguments[0];
+
+                MethodInfo
+                    receiveMethod = recipient.GetType().GetMethod(nameof(ISubscriber<object>.Receive), new[] { messageType }),
+                    registerMethod = messenger.GetType().GetMethod(nameof(IMessenger.Register)).MakeGenericMethod(messageType, typeof(TToken));
+
+                Delegate handler = receiveMethod.CreateDelegate(typeof(Action<>).MakeGenericType(messageType));
+
+                registerMethod.Invoke(messenger, new[] { recipient, token, handler });
+            }
+        }
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
+        public static void Register<TMessage>(this IMessenger messenger, ISubscriber<TMessage> recipient)
+            where TMessage : class
+        {
+            messenger.Register<TMessage, Unit>(recipient, default, recipient.Receive);
+        }
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to identify what channel to use to receive messages.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="token">The token indicating what channel to use.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
+        public static void Register<TMessage, TToken>(this IMessenger messenger, ISubscriber<TMessage> recipient, TToken token)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            messenger.Register<TMessage, TToken>(recipient, token, recipient.Receive);
+        }
+
         /// <summary>
         /// Registers a recipient for a given type of message.
         /// </summary>

From 1cbe53c61d8576c47ba94dd8718c11213a454c75 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 14:40:47 +0200
Subject: [PATCH 257/595] Minor code refactoring

---
 .../{MessengerExtensions.Default.cs => MessengerExtensions.cs}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{MessengerExtensions.Default.cs => MessengerExtensions.cs} (100%)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Default.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs

From 7fa599432399d82559c845dc331395de8d426d30 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 16:08:09 +0200
Subject: [PATCH 258/595] Added new unit tests, minor bug fixes

---
 .../Messaging/MessengerExtensions.cs          |  6 +-
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 91 +++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 76bf7ce06e4..592510dd817 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -64,13 +64,15 @@ public static void Register<TToken>(this IMessenger messenger, object recipient,
                     return;
                 }
 
-                Type messageType = subscriptionType.GenericTypeArguments[0];
+                Type
+                    messageType = subscriptionType.GenericTypeArguments[0],
+                    handlerType = typeof(Action<>).MakeGenericType(messageType);
 
                 MethodInfo
                     receiveMethod = recipient.GetType().GetMethod(nameof(ISubscriber<object>.Receive), new[] { messageType }),
                     registerMethod = messenger.GetType().GetMethod(nameof(IMessenger.Register)).MakeGenericMethod(messageType, typeof(TToken));
 
-                Delegate handler = receiveMethod.CreateDelegate(typeof(Action<>).MakeGenericType(messageType));
+                Delegate handler = receiveMethod.CreateDelegate(handlerType, recipient);
 
                 registerMethod.Invoke(messenger, new[] { recipient, token, handler });
             }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index f001ca16db0..cc916dbe291 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -218,9 +218,100 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
             });
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_ISubscriber_NoMessages()
+        {
+            var messenger = new Messenger();
+            var recipient = new RecipientWithNoMessages();
+
+            messenger.Register(recipient);
+
+            // We just need to verify we got here with no errors, this
+            // recipient has no declared handlers so there's nothing to do
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_ISubscriber_SomeMessages_NoToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new RecipientWithSomeMessages();
+
+            messenger.Register(recipient);
+
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient));
+
+            messenger.Send<MessageA>();
+            messenger.Send<MessageB>();
+
+            Assert.AreEqual(recipient.As, 1);
+            Assert.AreEqual(recipient.Bs, 1);
+
+            messenger.Unregister(recipient);
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_ISubscriber_SomeMessages_WithToken()
+        {
+            var messenger = new Messenger();
+            var recipient = new RecipientWithSomeMessages();
+            var token = nameof(Test_Messenger_ISubscriber_SomeMessages_WithToken);
+
+            messenger.Register(recipient, token);
+
+            Assert.IsTrue(messenger.IsRegistered<MessageA, string>(recipient, token));
+            Assert.IsTrue(messenger.IsRegistered<MessageB, string>(recipient, token));
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
+
+            messenger.Send<MessageA, string>(token);
+            messenger.Send<MessageB, string>(token);
+
+            Assert.AreEqual(recipient.As, 1);
+            Assert.AreEqual(recipient.Bs, 1);
+
+            messenger.Unregister(recipient, token);
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
+        }
+
+        public sealed class RecipientWithNoMessages
+        {
+        }
+
+        public sealed class RecipientWithSomeMessages
+             : ISubscriber<MessageA>, ISubscriber<MessageB>
+        {
+            public int As { get; private set; }
+
+            public void Receive(MessageA message)
+            {
+                As++;
+            }
+
+            public int Bs { get; private set; }
+
+            public void Receive(MessageB message)
+            {
+                Bs++;
+            }
+        }
+
         public sealed class MessageA
         {
             public string Text { get; set; }
         }
+
+        public sealed class MessageB
+        {
+        }
     }
 }

From 34af434d47e1ddb0051591477bbb009357db1407 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 19:11:46 +0200
Subject: [PATCH 259/595] Added ViewModelBase test for message unregistration

---
 UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
index a2d22123da3..a1eafa11adf 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
@@ -23,10 +23,12 @@ public void Test_ViewModelBase_Activation()
             viewmodel.IsActive = true;
 
             Assert.IsTrue(viewmodel.IsActivatedCheck);
+            Assert.IsTrue(viewmodel.CurrentMessenger.IsRegistered<SampleMessage>(viewmodel));
 
             viewmodel.IsActive = false;
 
             Assert.IsFalse(viewmodel.IsActivatedCheck);
+            Assert.IsFalse(viewmodel.CurrentMessenger.IsRegistered<SampleMessage>(viewmodel));
         }
 
         [TestCategory("Mvvm")]
@@ -94,6 +96,8 @@ public T Data
             protected override void OnActivated()
             {
                 IsActivatedCheck = true;
+
+                Messenger.Register<SampleMessage>(this, m => { });
             }
 
             protected override void OnDeactivated()
@@ -103,5 +107,9 @@ protected override void OnDeactivated()
                 IsActivatedCheck = false;
             }
         }
+
+        public class SampleMessage
+        {
+        }
     }
 }

From 53d1a9d42fbcbfe2cd510b172ecdd1275fb0a61a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 19:25:53 +0200
Subject: [PATCH 260/595] Added more comments to SetAndNotifyOnCompletion

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 94767f4dd4d..932fed5a0ce 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -275,6 +275,12 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
 
             OnPropertyChanged(propertyName);
 
+            // If the input task is either null or already completed, we don't need to
+            // execute the additional logic to monitor its completion, so we can just bypass
+            // the rest of the method and return that the field changed here. The return value
+            // does not indicate that the task itself has completed, but just that the property
+            // value itself has changed (ie. the referenced task instance has changed).
+            // This mirrors the return value of all the other synchronous Set methods as well.
             if (isAlreadyCompletedOrNull)
             {
                 return true;

From 866dc8c6721dd3723f98b3cc65fa67050b58948f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 19:51:35 +0200
Subject: [PATCH 261/595] Improved remarks for ViewModeBase.OnDeactivated

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index b0743fe3692..49504b5c251 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -89,7 +89,12 @@ protected virtual void OnActivated()
         /// Raised whenever the <see cref="IsActive"/> property is set to <see langword="false"/>.
         /// Use this method to unregister from messages and do general cleanup for this instance.
         /// </summary>
-        /// <remarks>The base implementation unregisters all messages for this recipient (with no token).</remarks>
+        /// <remarks>
+        /// The base implementation unregisters all messages for this recipient. It does so by
+        /// invoking <see cref="IMessenger.Unregister(object)"/>, which removes all registered
+        /// handlers for a given subscriber, regardless of what token was used to register them.
+        /// That is, all registered handlers across all subscription channels will be removed.
+        /// </remarks>
         protected virtual void OnDeactivated()
         {
             Messenger.Unregister(this);

From 7da27bce6c888adb03a7876b9ab17a453aa93803 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 20:11:09 +0200
Subject: [PATCH 262/595] Improved tests for ISubscriber<T> APIs

---
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index cc916dbe291..04c6bf47252 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -243,7 +243,14 @@ public void Test_Messenger_ISubscriber_SomeMessages_NoToken()
             Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
             Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient));
 
+            Assert.AreEqual(recipient.As, 0);
+            Assert.AreEqual(recipient.Bs, 0);
+
             messenger.Send<MessageA>();
+
+            Assert.AreEqual(recipient.As, 1);
+            Assert.AreEqual(recipient.Bs, 0);
+
             messenger.Send<MessageB>();
 
             Assert.AreEqual(recipient.As, 1);
@@ -271,9 +278,16 @@ public void Test_Messenger_ISubscriber_SomeMessages_WithToken()
             Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
             Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
 
-            messenger.Send<MessageA, string>(token);
+            Assert.AreEqual(recipient.As, 0);
+            Assert.AreEqual(recipient.Bs, 0);
+
             messenger.Send<MessageB, string>(token);
 
+            Assert.AreEqual(recipient.As, 0);
+            Assert.AreEqual(recipient.Bs, 1);
+
+            messenger.Send<MessageA, string>(token);
+
             Assert.AreEqual(recipient.As, 1);
             Assert.AreEqual(recipient.Bs, 1);
 

From f9165dfd3dd0caae7a54e787323ff2843b9b2fc3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 23:58:03 +0200
Subject: [PATCH 263/595] Initial code refactoring to SetAndNotifyOnCompletion

---
 .../ComponentModel/ObservableObject.cs        | 79 ++++++++++++-------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 932fed5a0ce..888a19008eb 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -224,42 +224,26 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         }
 
         /// <summary>
-        /// Compares the current and new values for a given field (which should be the backing
-        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
-        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
-        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
-        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
-        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
-        /// Here is a sample property declaration using this method:
-        /// <code>
-        /// private Task myTask;
-        ///
-        /// public Task MyTask
-        /// {
-        ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
-        /// }
-        /// </code>
+        /// Provides the internal backing implementation for <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>.
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
-        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
-        /// </param>
+        /// <param name="fieldExpression">An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="monitorTask">A <see cref="Task"/> that completes when </param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
+        private protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, out Task monitorTask, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
             if (ReferenceEquals(field, newValue))
             {
+                monitorTask = Task.CompletedTask;
+
                 return false;
             }
 
@@ -283,6 +267,8 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
             // This mirrors the return value of all the other synchronous Set methods as well.
             if (isAlreadyCompletedOrNull)
             {
+                monitorTask = Task.CompletedTask;
+
                 return true;
             }
 
@@ -293,18 +279,15 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
                 ThrowArgumentExceptionForInvalidFieldExpression();
 
                 // This is never executed, as the method above always throws
+                monitorTask = Task.CompletedTask;
+
                 return false;
             }
 
             // We use a local async function here so that the main method can
             // remain synchronous and return a value that can be immediately
             // used by the caller. This mirrors Set<T>(ref T, T, string).
-            // We use an async void function instead of a Task-returning function
-            // so that if a binding update caused by the property change notification
-            // causes a crash, it is immediately reported in the application instead of
-            // the exception being ignored (as the returned task wouldn't be awaited),
-            // which would result in a confusing behavior for users.
-            async void MonitorTask()
+            async Task MonitorTask()
             {
                 try
                 {
@@ -324,11 +307,49 @@ async void MonitorTask()
                 }
             }
 
-            MonitorTask();
+            monitorTask = MonitorTask();
 
             return true;
         }
 
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
+        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
+        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
+        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// Here is a sample property declaration using this method:
+        /// <code>
+        /// private Task myTask;
+        ///
+        /// public Task MyTask
+        /// {
+        ///     get => myTask;
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
+        /// }
+        /// </code>
+        /// </summary>
+        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
+        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
+        /// </param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
+            where TTask : Task
+        {
+            return SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, out _);
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>

From 904cd55589c118d15359b52f7593509dd5da19e1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 10 Jul 2020 23:58:15 +0200
Subject: [PATCH 264/595] Added IsRunning property to async commands

---
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs     | 11 ++++++++++-
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs  | 11 ++++++++++-
 .../Input/Interfaces/IAsyncRelayCommand.cs            |  5 +++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index f3bebc606ea..cf9bc73cc04 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -56,9 +56,18 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
+            private set
+            {
+                if (SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value, out Task task))
+                {
+                    task.ContinueWith(_ => this.OnPropertyChanged(nameof(IsRunning)));
+                }
+            }
         }
 
+        /// <inheritdoc/>
+        public bool IsRunning => ExecutionTask?.IsCompleted ?? false;
+
         /// <inheritdoc/>
         public void NotifyCanExecuteChanged()
         {
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 6d1faefcf1c..fefdd4ed301 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -56,9 +56,18 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value);
+            private set
+            {
+                if (SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value, out Task task))
+                {
+                    task.ContinueWith(_ => this.OnPropertyChanged(nameof(IsRunning)));
+                }
+            }
         }
 
+        /// <inheritdoc/>
+        public bool IsRunning => ExecutionTask?.IsCompleted ?? false;
+
         /// <inheritdoc/>
         public void NotifyCanExecuteChanged()
         {
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
index 79b9ef605ef..d1419d05aec 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -18,6 +18,11 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         /// </summary>
         Task? ExecutionTask { get; }
 
+        /// <summary>
+        /// Indicates whether the command currently has a pending operation being executed.
+        /// </summary>
+        bool IsRunning { get; }
+
         /// <summary>
         /// Provides a more specific version of <see cref="System.Windows.Input.ICommand.Execute"/>,
         /// also returning the <see cref="Task"/> representing the async operation being executed.

From 88f85ab2938a4a7db95f4653ef4f360eb51db0e5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:11:45 +0200
Subject: [PATCH 265/595] Added SetAndNotifyOnCompletion overload with callback

---
 .../ComponentModel/ObservableObject.cs        | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 888a19008eb..d4795903a8a 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -350,6 +350,36 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
             return SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, out _);
         }
 
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// This method is just like <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
+        /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
+        /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
+        /// </summary>
+        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
+            where TTask : Task
+        {
+            bool result = SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, out Task task);
+
+            task.ContinueWith(t => callback((TTask?)t));
+
+            return result;
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>

From b33b2faf753208ffc646ef7482d72cd493406b0e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:25:55 +0200
Subject: [PATCH 266/595] More code refactoring to SetAndNotifyOnCompletion

---
 .../ComponentModel/ObservableObject.cs        | 143 ++++++++----------
 .../Input/AsyncRelayCommand.cs                |   8 +-
 .../Input/AsyncRelayCommand{T}.cs             |   8 +-
 3 files changed, 66 insertions(+), 93 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index d4795903a8a..8bce740d55f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -224,26 +224,74 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         }
 
         /// <summary>
-        /// Provides the internal backing implementation for <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>.
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
+        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
+        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
+        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// Here is a sample property declaration using this method:
+        /// <code>
+        /// private Task myTask;
+        ///
+        /// public Task MyTask
+        /// {
+        ///     get => myTask;
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
+        /// }
+        /// </code>
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
+        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
+        /// </param>
         /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="monitorTask">A <see cref="Task"/> that completes when </param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        private protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, out Task monitorTask, [CallerMemberName] string propertyName = null!)
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
+            where TTask : Task
+        {
+            // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
+            // The lambda expression here is transformed by the C# compiler into an empty closure class with a
+            // static singleton field containing a closure instance, and another caching the instantiated Action<TTask>
+            // instance. This will result in no further allocations after the first time this method is called for a given
+            // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
+            // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
+            return SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// This method is just like <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
+        /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
+        /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
+        /// </summary>
+        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
             if (ReferenceEquals(field, newValue))
             {
-                monitorTask = Task.CompletedTask;
-
                 return false;
             }
 
@@ -267,7 +315,7 @@ private protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Express
             // This mirrors the return value of all the other synchronous Set methods as well.
             if (isAlreadyCompletedOrNull)
             {
-                monitorTask = Task.CompletedTask;
+                callback(newValue);
 
                 return true;
             }
@@ -279,15 +327,18 @@ private protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Express
                 ThrowArgumentExceptionForInvalidFieldExpression();
 
                 // This is never executed, as the method above always throws
-                monitorTask = Task.CompletedTask;
-
                 return false;
             }
 
             // We use a local async function here so that the main method can
             // remain synchronous and return a value that can be immediately
             // used by the caller. This mirrors Set<T>(ref T, T, string).
-            async Task MonitorTask()
+            // We use an async void function instead of a Task-returning function
+            // so that if a binding update caused by the property change notification
+            // causes a crash, it is immediately reported in the application instead of
+            // the exception being ignored (as the returned task wouldn't be awaited),
+            // which would result in a confusing behavior for users.
+            async void MonitorTask()
             {
                 try
                 {
@@ -305,81 +356,15 @@ async Task MonitorTask()
                 {
                     OnPropertyChanged(propertyName);
                 }
+
+                callback(newValue);
             }
 
-            monitorTask = MonitorTask();
+            MonitorTask();
 
             return true;
         }
 
-        /// <summary>
-        /// Compares the current and new values for a given field (which should be the backing
-        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
-        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
-        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
-        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
-        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
-        /// Here is a sample property declaration using this method:
-        /// <code>
-        /// private Task myTask;
-        ///
-        /// public Task MyTask
-        /// {
-        ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
-        /// }
-        /// </code>
-        /// </summary>
-        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
-        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
-        /// </param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
-        /// if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
-            where TTask : Task
-        {
-            return SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, out _);
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given field (which should be the backing
-        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
-        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
-        /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
-        /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
-        /// </summary>
-        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="callback">A callback to invoke to update the property value.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
-        /// if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
-            where TTask : Task
-        {
-            bool result = SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, out Task task);
-
-            task.ContinueWith(t => callback((TTask?)t));
-
-            return result;
-        }
-
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index cf9bc73cc04..b9aa6240643 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -56,13 +56,7 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set
-            {
-                if (SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value, out Task task))
-                {
-                    task.ContinueWith(_ => this.OnPropertyChanged(nameof(IsRunning)));
-                }
-            }
+            private set => SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning)));
         }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index fefdd4ed301..95ea62d9918 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -56,13 +56,7 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set
-            {
-                if (SetAndNotifyOnCompletion(ref executionTask, () => executionTask, value, out Task task))
-                {
-                    task.ContinueWith(_ => this.OnPropertyChanged(nameof(IsRunning)));
-                }
-            }
+            private set => SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning)));
         }
 
         /// <inheritdoc/>

From f634006aaadc3fea15341002ae99268cbb949c73 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:26:52 +0200
Subject: [PATCH 267/595] Fixed an XML doc

---
 Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
index d1419d05aec..ea56dfae4e3 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -19,7 +19,7 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         Task? ExecutionTask { get; }
 
         /// <summary>
-        /// Indicates whether the command currently has a pending operation being executed.
+        /// Gets a value indicating whether the command currently has a pending operation being executed.
         /// </summary>
         bool IsRunning { get; }
 

From d98c2575fe29cd810ec407683b145547c48aa642 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:29:55 +0200
Subject: [PATCH 268/595] Fixed initial IsRunning property update

---
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs    | 8 +++++++-
 Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index b9aa6240643..2c91f66fb63 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -56,7 +56,13 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning)));
+            private set
+            {
+                if (SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                {
+                    OnPropertyChanged(nameof(IsRunning));
+                }
+            }
         }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 95ea62d9918..08b124773a7 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -56,7 +56,13 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         public Task? ExecutionTask
         {
             get => this.executionTask;
-            private set => SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning)));
+            private set
+            {
+                if (SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                {
+                    OnPropertyChanged(nameof(IsRunning));
+                }
+            }
         }
 
         /// <inheritdoc/>

From b91b218ccd1d546d3d9b534978b262cdf8827da8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:41:28 +0200
Subject: [PATCH 269/595] Added unit tests for AsyncRelayCommand, bug fixes

---
 .../Input/AsyncRelayCommand.cs                |   2 +-
 .../Input/AsyncRelayCommand{T}.cs             |   2 +-
 .../Mvvm/Test_AsyncRelayCommand.cs            | 112 ++++++++++++++++++
 .../UnitTests.Shared.projitems                |   1 +
 4 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index 2c91f66fb63..dfd5c883550 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -66,7 +66,7 @@ private set
         }
 
         /// <inheritdoc/>
-        public bool IsRunning => ExecutionTask?.IsCompleted ?? false;
+        public bool IsRunning => ExecutionTask?.IsCompleted == false;
 
         /// <inheritdoc/>
         public void NotifyCanExecuteChanged()
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 08b124773a7..471808f09ce 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -66,7 +66,7 @@ private set
         }
 
         /// <inheritdoc/>
-        public bool IsRunning => ExecutionTask?.IsCompleted ?? false;
+        public bool IsRunning => ExecutionTask?.IsCompleted == false;
 
         /// <inheritdoc/>
         public void NotifyCanExecuteChanged()
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
new file mode 100644
index 00000000000..4a10690c6b2
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
@@ -0,0 +1,112 @@
+// 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.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_AsyncRelayCommand
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_AsyncRelayCommand_AlwaysEnabled()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand(async () =>
+            {
+                await Task.Delay(1000);
+                ticks++;
+                await Task.Delay(1000);
+            });
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute(new object()));
+
+            (object, EventArgs) args = default;
+
+            command.CanExecuteChanged += (s, e) => args = (s, e);
+
+            command.NotifyCanExecuteChanged();
+
+            Assert.AreSame(args.Item1, command);
+            Assert.AreSame(args.Item2, EventArgs.Empty);
+
+            Assert.IsNull(command.ExecutionTask);
+            Assert.IsFalse(command.IsRunning);
+
+            Task task = command.ExecuteAsync(null);
+
+            Assert.IsNotNull(command.ExecutionTask);
+            Assert.AreSame(command.ExecutionTask, task);
+            Assert.IsTrue(command.IsRunning);
+
+            await task;
+
+            Assert.IsFalse(command.IsRunning);
+
+            Assert.AreEqual(ticks, 1);
+
+            command.Execute(new object());
+
+            await command.ExecutionTask!;
+
+            Assert.AreEqual(ticks, 2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_AsyncRelayCommand_WithCanExecuteFunctionTrue()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand(
+                () =>
+            {
+                ticks++;
+                return Task.CompletedTask;
+            }, () => true);
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute(new object()));
+
+            command.Execute(null);
+
+            Assert.AreEqual(ticks, 1);
+
+            command.Execute(new object());
+
+            Assert.AreEqual(ticks, 2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_AsyncRelayCommand_WithCanExecuteFunctionFalse()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand(
+                () =>
+            {
+                ticks++;
+                return Task.CompletedTask;
+            }, () => false);
+
+            Assert.IsFalse(command.CanExecute(null));
+            Assert.IsFalse(command.CanExecute(new object()));
+
+            command.Execute(null);
+
+            Assert.AreEqual(ticks, 0);
+
+            command.Execute(new object());
+
+            Assert.AreEqual(ticks, 0);
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index a79a56f3ca3..2ab5258a795 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -26,6 +26,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.Request.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_AsyncRelayCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ViewModelBase.cs" />

From 5725d45c69464800bf34f867601e0c032235422d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 00:57:31 +0200
Subject: [PATCH 270/595] Improved remarks for SetAndNotifyOnCompletion

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 8bce740d55f..5efe6f6ec5f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -252,8 +252,10 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
-        /// if the current and new value for the target property are the same.
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
+        /// and new value for the target property are the same. The return value being <see langword="true"/> only
+        /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
+        /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
         protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
             where TTask : Task

From 2a9d3e55c70eb052c51508dde8dd2b254ceb1376 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 01:02:08 +0200
Subject: [PATCH 271/595] Improved Test_ObservableObject_Events

(Also checks for events order now)
---
 UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 2ed4d0d6e67..c6334cbf872 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -23,14 +23,22 @@ public void Test_ObservableObject_Events()
 
             model.PropertyChanging += (s, e) =>
             {
+                Assert.IsNull(changing.Item1);
+                Assert.IsNull(changed.Item1);
                 Assert.AreSame(model, s);
+                Assert.IsNotNull(s);
+                Assert.IsNotNull(e);
 
                 changing = (e, model.Data);
             };
 
             model.PropertyChanged += (s, e) =>
             {
+                Assert.IsNotNull(changing.Item1);
+                Assert.IsNull(changed.Item1);
                 Assert.AreSame(model, s);
+                Assert.IsNotNull(s);
+                Assert.IsNotNull(e);
 
                 changed = (e, model.Data);
             };

From 0938168f2a24a47f797a0e0701109dff21ed91e1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 01:15:02 +0200
Subject: [PATCH 272/595] Tweaked visibility of some test members

---
 .../Mvvm/Test_ObservableObject.cs             | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index c6334cbf872..9a9b4432991 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -66,7 +66,7 @@ public T Data
         [TestMethod]
         public void Test_ObservableObject_ProxyCrudWithProperty()
         {
-            var model = new WrappingModelWithProperty { Person = new Person { Name = "Alice" } };
+            var model = new WrappingModelWithProperty(new Person { Name = "Alice" });
 
             (PropertyChangingEventArgs, string) changing = default;
             (PropertyChangedEventArgs, string) changed = default;
@@ -91,7 +91,7 @@ public void Test_ObservableObject_ProxyCrudWithProperty()
             Assert.AreEqual(changing.Item2, "Alice");
             Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModelWithProperty.Name));
             Assert.AreEqual(changed.Item2, "Bob");
-            Assert.AreEqual(model.Person.Name, "Bob");
+            Assert.AreEqual(model.PersonProxy.Name, "Bob");
         }
 
         public class Person
@@ -101,7 +101,14 @@ public class Person
 
         public class WrappingModelWithProperty : ObservableObject
         {
-            public Person Person { get; set; }
+            private Person Person { get; }
+
+            public WrappingModelWithProperty(Person person)
+            {
+                Person = person;
+            }
+
+            public Person PersonProxy => Person;
 
             public string Name
             {
@@ -114,7 +121,7 @@ public string Name
         [TestMethod]
         public void Test_ObservableObject_ProxyCrudWithField()
         {
-            var model = new WrappingModelWithField { Person = new Person { Name = "Alice" } };
+            var model = new WrappingModelWithField(new Person { Name = "Alice" });
 
             (PropertyChangingEventArgs, string) changing = default;
             (PropertyChangedEventArgs, string) changed = default;
@@ -139,19 +146,24 @@ public void Test_ObservableObject_ProxyCrudWithField()
             Assert.AreEqual(changing.Item2, "Alice");
             Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModelWithField.Name));
             Assert.AreEqual(changed.Item2, "Bob");
-            Assert.AreEqual(model.Person.Name, "Bob");
+            Assert.AreEqual(model.PersonProxy.Name, "Bob");
         }
 
         public class WrappingModelWithField : ObservableObject
         {
-#pragma warning disable SA1401 // Fields should be private
-            public Person Person;
-#pragma warning restore SA1401
+            private readonly Person person;
+
+            public WrappingModelWithField(Person person)
+            {
+                this.person = person;
+            }
+
+            public Person PersonProxy => this.person;
 
             public string Name
             {
-                get => Person.Name;
-                set => Set(() => Person.Name, value);
+                get => this.person.Name;
+                set => Set(() => this.person.Name, value);
             }
         }
 

From eab9d9adc5c4156ee2306db2b9ad1b2a84d5a91a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 01:31:08 +0200
Subject: [PATCH 273/595] Added more tests for faulty monitored tasks

---
 .../Mvvm/Test_ObservableObject.cs             | 62 +++++++++++--------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 9a9b4432991..8a03daeaa71 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.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.ComponentModel;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -171,44 +172,51 @@ public string Name
         [TestMethod]
         public async Task Test_ObservableObject_NotifyTask()
         {
-            var model = new SampleModelWithTask<int>();
-            var tcs = new TaskCompletionSource<int>();
-            var task = tcs.Task;
+            static async Task TestAsync(Action<TaskCompletionSource<int>> callback)
+            {
+                var model = new SampleModelWithTask<int>();
+                var tcs = new TaskCompletionSource<int>();
+                var task = tcs.Task;
 
-            (PropertyChangingEventArgs, Task<int>) changing = default;
-            (PropertyChangedEventArgs, Task<int>) changed = default;
+                (PropertyChangingEventArgs, Task<int>) changing = default;
+                (PropertyChangedEventArgs, Task<int>) changed = default;
 
-            model.PropertyChanging += (s, e) =>
-            {
-                Assert.AreSame(model, s);
+                model.PropertyChanging += (s, e) =>
+                {
+                    Assert.AreSame(model, s);
 
-                changing = (e, model.Data);
-            };
+                    changing = (e, model.Data);
+                };
 
-            model.PropertyChanged += (s, e) =>
-            {
-                Assert.AreSame(model, s);
+                model.PropertyChanged += (s, e) =>
+                {
+                    Assert.AreSame(model, s);
 
-                changed = (e, model.Data);
-            };
+                    changed = (e, model.Data);
+                };
 
-            model.Data = task;
+                model.Data = task;
 
-            Assert.IsFalse(task.IsCompleted);
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
-            Assert.IsNull(changing.Item2);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
-            Assert.AreSame(changed.Item2, task);
+                Assert.IsFalse(task.IsCompleted);
+                Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
+                Assert.IsNull(changing.Item2);
+                Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModelWithTask<int>.Data));
+                Assert.AreSame(changed.Item2, task);
 
-            changed = default;
+                changed = default;
 
-            tcs.SetResult(42);
+                callback(tcs);
 
-            await Task.Delay(100); // Time for the notification to dispatch
+                await Task.Delay(100); // Time for the notification to dispatch
 
-            Assert.IsTrue(task.IsCompleted);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel<int>.Data));
-            Assert.AreSame(changed.Item2, task);
+                Assert.IsTrue(task.IsCompleted);
+                Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel<int>.Data));
+                Assert.AreSame(changed.Item2, task);
+            }
+
+            await TestAsync(tcs => tcs.SetResult(42));
+            await TestAsync(tcs => tcs.SetException(new ArgumentException("Something went wrong")));
+            await TestAsync(tcs => tcs.SetCanceled());
         }
 
         public class SampleModelWithTask<T> : ObservableObject

From 6a85ce808b2d37940ab81f06e132baac3412b256 Mon Sep 17 00:00:00 2001
From: Regis Brid <regisb@microsoft.com>
Date: Fri, 10 Jul 2020 17:53:50 -0700
Subject: [PATCH 274/595] Removing // #define DEBUG_AUTOMATION

---
 .../DataGrid/Automation/DataGridAutomationPeer.cs                | 1 -
 .../DataGrid/Automation/DataGridCellAutomationPeer.cs            | 1 -
 .../DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs    | 1 -
 .../Automation/DataGridColumnHeadersPresenterAutomationPeer.cs   | 1 -
 .../Automation/DataGridDetailsPresenterAutomationPeer.cs         | 1 -
 .../DataGrid/Automation/DataGridGroupItemAutomationPeer.cs       | 1 -
 .../DataGrid/Automation/DataGridItemAutomationPeer.cs            | 1 -
 .../DataGrid/Automation/DataGridRowAutomationPeer.cs             | 1 -
 .../DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs  | 1 -
 .../DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs       | 1 -
 .../DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs   | 1 -
 11 files changed, 11 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
index f8d17e6a840..3e0bd9e6aaa 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Toolkit.Uwp.UI.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
index d734f9d3b8e..3dca2639066 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
index 526b34b630d..1ae16f60241 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System.ComponentModel;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
index 6889abad24d..329b16dbd6a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
index 0fc7791d2c3..1c98a20292f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
index e7323da0047..5652d70296d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
index 4956d2d7d5d..e7f5764c62d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
index 0ddbcbfb2e5..488b86c4d5a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
index 413bf8679aa..cf44f22f5be 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
index 3cd36059cf1..b9a1db25fed 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
index aa1e53d303b..70073047b83 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;

From 0d423e8dd93b95692e469a3fb1a476de434d4b12 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 11:59:37 +0200
Subject: [PATCH 275/595] Added more Ioc tests

---
 UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs | 56 +++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
index 69cba2ad8c6..66d662b4f36 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
@@ -4,7 +4,9 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.DependencyInjection;
+using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTests.Mvvm
@@ -38,6 +40,47 @@ public void Test_Ioc_LambdaInitialization()
             Assert.IsInstanceOfType(service, typeof(AliceService));
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_LambdaInitialization_ConcreteType()
+        {
+            var ioc = new Ioc();
+
+            ioc.ConfigureServices(services =>
+            {
+                services.AddSingleton<AliceService, AliceService>();
+            });
+
+            var service = ioc.GetRequiredService<AliceService>();
+
+            Assert.IsNotNull(service);
+            Assert.IsInstanceOfType(service, typeof(AliceService));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Ioc_LambdaInitialization_ConstructorInjection()
+        {
+            var ioc = new Ioc();
+            var messenger = new Messenger();
+
+            ioc.ConfigureServices(services =>
+            {
+                services.AddSingleton<INameService, AliceService>();
+                services.AddSingleton<IMessenger>(messenger);
+                services.AddTransient<MyViewModel>();
+            });
+
+            var service = ioc.GetRequiredService<MyViewModel>();
+
+            Assert.IsNotNull(service);
+            Assert.IsInstanceOfType(service, typeof(MyViewModel));
+            Assert.IsNotNull(service.NameService);
+            Assert.IsInstanceOfType(service.NameService, typeof(AliceService));
+            Assert.IsNotNull(service.MessengerService);
+            Assert.AreSame(service.MessengerService, messenger);
+        }
+
         [TestCategory("Mvvm")]
         [TestMethod]
         public void Test_Ioc_CollectionInitialization()
@@ -94,5 +137,18 @@ public class AliceService : INameService
         {
             public string GetName() => "Alice";
         }
+
+        public class MyViewModel : ViewModelBase
+        {
+            public MyViewModel(INameService nameService, IMessenger messengerService)
+                : base(messengerService)
+            {
+                NameService = nameService;
+            }
+
+            public INameService NameService { get; }
+
+            public IMessenger MessengerService => Messenger;
+        }
     }
 }

From e4137b4bb4f529cf280b2227f46e84ba0f5ed446 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 11 Jul 2020 12:51:21 +0200
Subject: [PATCH 276/595] Refactored Task result extensions/converter

---
 .../Converters/TaskResultConverter.cs         | 48 ++-------------
 .../Attributes/MaybeNullAttribute.cs          | 18 ++++++
 .../Extensions/TaskExtensions.cs              | 46 ++++++++++++++
 .../Extensions/Test_TaskExtensions.cs         | 29 ++++++++-
 .../Converters/Test_TaskResultConverter.cs    | 60 -------------------
 5 files changed, 95 insertions(+), 106 deletions(-)
 create mode 100644 Microsoft.Toolkit/Attributes/MaybeNullAttribute.cs

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
index b834c0a9e0a..c8944ed824c 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics.Contracts;
-using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Extensions;
 using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.UI.Converters
@@ -20,54 +19,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// </summary>
     public sealed class TaskResultConverter : IValueConverter
     {
-        /// <summary>
-        /// Non-generic overload of <see cref="Convert{T}"/>, for compatibility reasons.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/>.</param>
-        /// <returns>The result of <paramref name="task"/>, as an <see cref="object"/>.</returns>
-        [Obsolete("This method is here for compatibility reasons, use the generic overload")]
-        public static object Convert(Task task)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the result of a <see cref="Task{TResult}"/> if available, or <see langword="default"/> otherwise.
-        /// </summary>
-        /// <typeparam name="T">The type of <see cref="Task{TResult}"/> to get the result for.</typeparam>
-        /// <param name="task">The input <see cref="Task{TResult}"/> instance to get the result for.</param>
-        /// <returns>The result of <paramref name="task"/> if completed successfully, or <see langword="default"/> otherwise.</returns>
-        /// <remarks>This method does not block if <paramref name="task"/> has not completed yet.</remarks>
-        [Pure]
-        public static T Convert<T>(Task<T> task)
-        {
-            return task.IsCompletedSuccessfully ? task.Result : default;
-        }
-
         /// <inheritdoc/>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            // Check if the instance is a completed Task
-            if (!(value is Task task) ||
-                !task.IsCompletedSuccessfully)
-            {
-                return null;
-            }
-
-            Type taskType = task.GetType();
-
-            // Check if the task is actually some Task<T>
-            if (!taskType.IsGenericType ||
-                taskType.GetGenericTypeDefinition() != typeof(Task<>))
+            if (value is Task task)
             {
-                return null;
+                return task.ResultOrDefault();
             }
 
-            // Get the Task<T>.Result property
-            PropertyInfo propertyInfo = taskType.GetProperty(nameof(Task<object>.Result));
-
-            // Finally retrieve the result
-            return propertyInfo!.GetValue(task);
+            return null;
         }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit/Attributes/MaybeNullAttribute.cs b/Microsoft.Toolkit/Attributes/MaybeNullAttribute.cs
new file mode 100644
index 00000000000..655b912b57b
--- /dev/null
+++ b/Microsoft.Toolkit/Attributes/MaybeNullAttribute.cs
@@ -0,0 +1,18 @@
+// 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.
+
+#if !NETSTANDARD2_1
+
+namespace System.Diagnostics.CodeAnalysis
+{
+    /// <summary>
+    /// Specifies that an output may be <see langword="null"/> even if the corresponding type disallows it.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]
+    internal sealed class MaybeNullAttribute : Attribute
+    {
+    }
+}
+
+#endif
diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index c9c3d4a650f..a24c4855ae2 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -2,10 +2,15 @@
 // 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.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace Microsoft.Toolkit.Extensions
 {
     /// <summary>
@@ -13,6 +18,46 @@ namespace Microsoft.Toolkit.Extensions
     /// </summary>
     public static class TaskExtensions
     {
+        /// <summary>
+        /// Gets the result of a <see cref="Task"/> if available, or <see langword="null"/> otherwise.
+        /// </summary>
+        /// <param name="task">The input <see cref="Task"/> instance to get the result for.</param>
+        /// <returns>The result of <paramref name="task"/> if completed successfully, or <see langword="default"/> otherwise.</returns>
+        /// <remarks>
+        /// This method does not block if <paramref name="task"/> has not completed yet. Furthermore, it is not generic
+        /// and uses reflection to access the <see cref="Task{TResult}.Result"/> property and boxes the result if it's
+        /// a value type, which adds overhead. It should only be used when using generics is not possible.
+        /// </remarks>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static object? ResultOrDefault(this Task task)
+        {
+            // Check if the instance is a completed Task
+            if (
+#if NETSTANDARD2_1
+                task.IsCompletedSuccessfully
+#else
+                task.Status == TaskStatus.RanToCompletion
+#endif
+            )
+            {
+                Type taskType = task.GetType();
+
+                // Check if the task is actually some Task<T>
+                if (taskType.IsGenericType &&
+                    taskType.GetGenericTypeDefinition() == typeof(Task<>))
+                {
+                    // Get the Task<T>.Result property
+                    PropertyInfo propertyInfo = taskType.GetProperty(nameof(Task<object>.Result));
+
+                    // Finally retrieve the result
+                    return propertyInfo!.GetValue(task);
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Gets the result of a <see cref="Task{TResult}"/> if available, or <see langword="default"/> otherwise.
         /// </summary>
@@ -22,6 +67,7 @@ public static class TaskExtensions
         /// <remarks>This method does not block if <paramref name="task"/> has not completed yet.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [return: MaybeNull]
         public static T ResultOrDefault<T>(this Task<T> task)
         {
 #if NETSTANDARD2_1
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
index 526d22a8fd3..173e2f3e99b 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
@@ -14,7 +14,32 @@ public class Test_TaskExtensions
     {
         [TestCategory("TaskExtensions")]
         [TestMethod]
-        public void Test_TaskExtensions_ResultOrDefault_Int32()
+        public void Test_TaskExtensions_ResultOrDefault()
+        {
+            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
+
+            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+
+            tcs.SetCanceled();
+
+            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetException(new InvalidOperationException("Test"));
+
+            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+
+            tcs = new TaskCompletionSource<int>();
+
+            tcs.SetResult(42);
+
+            Assert.AreEqual(42, ((Task)tcs.Task).ResultOrDefault());
+        }
+
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public void Test_TaskExtensions_ResultOrDefault_OfT_Int32()
         {
             TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
 
@@ -39,7 +64,7 @@ public void Test_TaskExtensions_ResultOrDefault_Int32()
 
         [TestCategory("TaskExtensions")]
         [TestMethod]
-        public void Test_TaskExtensions_ResultOrDefault_String()
+        public void Test_TaskExtensions_ResultOrDefault_OfT_String()
         {
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
 
diff --git a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
index 87b756494cf..7b122dabcb5 100644
--- a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
+++ b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs
@@ -14,66 +14,6 @@ namespace UnitTests.Converters
     [TestClass]
     public class Test_TaskResultConverter
     {
-#pragma warning disable CS0618 // Type or member is obsolete
-        [TestCategory("Converters")]
-        [UITestMethod]
-        [ExpectedException(typeof(NotImplementedException))]
-        public void Test_TaskResultConverter_Static_Obsolete()
-        {
-            _ = TaskResultConverter.Convert(Task.CompletedTask);
-        }
-#pragma warning restore CS0618
-
-        [TestCategory("Converters")]
-        [UITestMethod]
-        public void Test_TaskResultConverter_Static_Int32()
-        {
-            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
-
-            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
-
-            tcs.SetCanceled();
-
-            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetException(new InvalidOperationException("Test"));
-
-            Assert.AreEqual(0, TaskResultConverter.Convert(tcs.Task));
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetResult(42);
-
-            Assert.AreEqual(42, TaskResultConverter.Convert(tcs.Task));
-        }
-
-        [TestCategory("Converters")]
-        [UITestMethod]
-        public void Test_TaskResultConverter_Static_String()
-        {
-            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
-
-            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
-
-            tcs.SetCanceled();
-
-            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
-
-            tcs = new TaskCompletionSource<string>();
-
-            tcs.SetException(new InvalidOperationException("Test"));
-
-            Assert.AreEqual(null, TaskResultConverter.Convert(tcs.Task));
-
-            tcs = new TaskCompletionSource<string>();
-
-            tcs.SetResult("Hello world");
-
-            Assert.AreEqual("Hello world", TaskResultConverter.Convert(tcs.Task));
-        }
-
         [TestCategory("Converters")]
         [UITestMethod]
         public void Test_TaskResultConverter_Instance_Int32()

From 7069e73cb88eab556ef762f0f04ce96a17768a7d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 12 Jul 2020 19:21:20 +0200
Subject: [PATCH 277/595] Removed movsxd from DangerousGetReferenceAt APIs

---
 .../Extensions/ArrayExtensions.2D.cs                     | 9 +++------
 .../Extensions/ArrayExtensions.cs                        | 9 +++------
 .../Extensions/ReadOnlySpanExtensions.cs                 | 8 ++++----
 .../Extensions/SpanExtensions.cs                         | 4 ++--
 .../Extensions/StringExtensions.cs                       | 4 ++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
index 965c54b4aea..67130cd2bdf 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
@@ -66,13 +66,13 @@ public static ref T DangerousGetReference<T>(this T[,] array)
         /// </remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this T[,] array, int i, int j)
+        public static unsafe ref T DangerousGetReferenceAt<T>(this T[,] array, int i, int j)
         {
 #if NETCORE_RUNTIME
             var arrayData = Unsafe.As<RawArray2DData>(array);
             int offset = (i * arrayData.Width) + j;
             ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-            ref T ri = ref Unsafe.Add(ref r0, offset);
+            ref T ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)offset);
 
             return ref ri;
 #else
@@ -82,10 +82,7 @@ public static ref T DangerousGetReferenceAt<T>(this T[,] array, int i, int j)
                 return ref array[i, j];
             }
 
-            unsafe
-            {
-                return ref Unsafe.AsRef<T>(null);
-            }
+            return ref Unsafe.AsRef<T>(null);
 #endif
         }
 
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
index d29b2290dca..771b993ce5e 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
@@ -62,12 +62,12 @@ public static ref T DangerousGetReference<T>(this T[] array)
         /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to ensure the <paramref name="i"/> parameter is valid.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this T[] array, int i)
+        public static unsafe ref T DangerousGetReferenceAt<T>(this T[] array, int i)
         {
 #if NETCORE_RUNTIME
             var arrayData = Unsafe.As<RawArrayData>(array);
             ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-            ref T ri = ref Unsafe.Add(ref r0, i);
+            ref T ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)i);
 
             return ref ri;
 #else
@@ -76,10 +76,7 @@ public static ref T DangerousGetReferenceAt<T>(this T[] array, int i)
                 return ref array[i];
             }
 
-            unsafe
-            {
-                return ref Unsafe.AsRef<T>(null);
-            }
+            return ref Unsafe.AsRef<T>(null);
 #endif
         }
 
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index bc15fccc900..cb84e3358af 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -40,10 +40,10 @@ public static ref T DangerousGetReference<T>(this ReadOnlySpan<T> span)
         /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to ensure the <paramref name="i"/> parameter is valid.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this ReadOnlySpan<T> span, int i)
+        public static unsafe ref T DangerousGetReferenceAt<T>(this ReadOnlySpan<T> span, int i)
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T ri = ref Unsafe.Add(ref r0, i);
+            ref T ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)i);
 
             return ref ri;
         }
@@ -87,7 +87,7 @@ public static ref T DangerousGetReferenceAt<T>(this ReadOnlySpan<T> span, int i)
         /// </returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<T> span, int i)
+        public static unsafe ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<T> span, int i)
         {
             // Check whether the input is in range by first casting both
             // operands to uint and then comparing them, as this allows
@@ -111,7 +111,7 @@ public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<
                 mask = ~negativeFlag,
                 offset = (uint)i & mask;
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T r1 = ref Unsafe.Add(ref r0, (IntPtr)offset);
+            ref T r1 = ref Unsafe.Add(ref r0, (IntPtr)(void*)offset);
 
             return ref r1;
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
index bb2550257ba..b7012683884 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
@@ -40,10 +40,10 @@ public static ref T DangerousGetReference<T>(this Span<T> span)
         /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to ensure the <paramref name="i"/> parameter is valid.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this Span<T> span, int i)
+        public static unsafe ref T DangerousGetReferenceAt<T>(this Span<T> span, int i)
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T ri = ref Unsafe.Add(ref r0, i);
+            ref T ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)i);
 
             return ref ri;
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
index 2d96413baa4..fca2a27b5c5 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -46,7 +46,7 @@ public static ref char DangerousGetReference(this string text)
         /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to ensure the <paramref name="i"/> parameter is valid.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref char DangerousGetReferenceAt(this string text, int i)
+        public static unsafe ref char DangerousGetReferenceAt(this string text, int i)
         {
 #if NETCOREAPP3_1
             ref char r0 = ref Unsafe.AsRef(text.GetPinnableReference());
@@ -55,7 +55,7 @@ public static ref char DangerousGetReferenceAt(this string text, int i)
 #else
             ref char r0 = ref MemoryMarshal.GetReference(text.AsSpan());
 #endif
-            ref char ri = ref Unsafe.Add(ref r0, i);
+            ref char ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)i);
 
             return ref ri;
         }

From d18566cc3e1595915a25fc562ef8107c4d1fdff2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 12 Jul 2020 19:22:41 +0200
Subject: [PATCH 278/595] Removed movsxd from ParallelHelper iterators

---
 .../Helpers/ParallelHelper.ForEach.IInAction.cs               | 4 ++--
 .../Helpers/ParallelHelper.ForEach.IRefAction.cs              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
index d2a9be06eb6..79c72ca122b 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
@@ -136,7 +136,7 @@ public InActionInvoker(
             /// </summary>
             /// <param name="i">The index of the batch to process</param>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Invoke(int i)
+            public unsafe void Invoke(int i)
             {
                 int
                     low = i * this.batchSize,
@@ -147,7 +147,7 @@ public void Invoke(int i)
 
                 for (int j = low; j < end; j++)
                 {
-                    ref TItem rj = ref Unsafe.Add(ref r0, j);
+                    ref TItem rj = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)j);
 
                     Unsafe.AsRef(this.action).Invoke(rj);
                 }
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
index e6dae6624d8..18802dd0100 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
@@ -136,7 +136,7 @@ public RefActionInvoker(
             /// </summary>
             /// <param name="i">The index of the batch to process</param>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Invoke(int i)
+            public unsafe void Invoke(int i)
             {
                 int
                     low = i * this.batchSize,
@@ -147,7 +147,7 @@ public void Invoke(int i)
 
                 for (int j = low; j < end; j++)
                 {
-                    ref TItem rj = ref Unsafe.Add(ref r0, j);
+                    ref TItem rj = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)j);
 
                     Unsafe.AsRef(this.action).Invoke(ref rj);
                 }

From 2fd35c8aa204e61608d3f0a0a33b2b8767cc87a1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Jul 2020 16:26:35 +0200
Subject: [PATCH 279/595] Updated StringPool with new priority-map backend

---
 .../Buffers/StringPool.cs                     | 515 ++++++++++++++----
 .../Buffers/Test_StringPool.cs                |  10 +-
 2 files changed, 409 insertions(+), 116 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 04012c29303..a9956477774 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 #if NETCOREAPP3_1
@@ -15,6 +16,8 @@
 using Microsoft.Toolkit.HighPerformance.Helpers;
 #endif
 
+#nullable enable
+
 namespace Microsoft.Toolkit.HighPerformance.Buffers
 {
     /// <summary>
@@ -22,6 +25,9 @@ namespace Microsoft.Toolkit.HighPerformance.Buffers
     /// when creating multiple <see cref="string"/> instances from buffers of <see cref="char"/> values.
     /// The <see cref="GetOrAdd(ReadOnlySpan{char})"/> method provides a best-effort alternative to just creating
     /// a new <see cref="string"/> instance every time, in order to minimize the number of duplicated instances.
+    /// The <see cref="StringPool"/> type will internally manage a highly efficient priority queue for the
+    /// cached <see cref="string"/> instances, so that when the full capacity is reached, the last recently
+    /// used values will be automatically discarded to leave room for new values to cache.
     /// </summary>
     public sealed class StringPool
     {
@@ -36,20 +42,14 @@ public sealed class StringPool
         private const int MinimumSize = 32;
 
         /// <summary>
-        /// A bitmask used to avoid branches when computing the absolute value of an <see cref="int"/>.
-        /// This will ignore overflows, as we just need this to map hashcodes into the valid bucket range.
+        /// The current array of <see cref="FixedSizePriorityMap"/> instances in use.
         /// </summary>
-        private const int SignMask = ~(1 << 31);
+        private readonly FixedSizePriorityMap[] maps;
 
         /// <summary>
-        /// The current array of <see cref="Bucket"/> instances in use.
+        /// The total number of maps in use.
         /// </summary>
-        private readonly Bucket[] buckets;
-
-        /// <summary>
-        /// The total number of buckets in use.
-        /// </summary>
-        private readonly int numberOfBuckets;
+        private readonly int numberOfMaps;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StringPool"/> class.
@@ -89,10 +89,10 @@ static void FindFactors(int size, int factor, out int x, out int y)
             // combination producing the optimal factors (with the product being as
             // close as possible to the requested size), we test a number of ratios
             // that we consider acceptable, and pick the best results produced.
-            // The ratio between buckets influences the number of objects being allocated,
-            // as well as the multithreading performance when locking on buckets.
+            // The ratio between maps influences the number of objects being allocated,
+            // as well as the multithreading performance when locking on maps.
             // We still want to contraint this number to avoid situations where we
-            // have a way too high number of buckets compared to total size.
+            // have a way too high number of maps compared to total size.
             FindFactors(minimumSize, 2, out int x2, out int y2);
             FindFactors(minimumSize, 3, out int x3, out int y3);
             FindFactors(minimumSize, 4, out int x4, out int y4);
@@ -116,17 +116,17 @@ static void FindFactors(int size, int factor, out int x, out int y)
                 y2 = y4;
             }
 
-            Span<Bucket> span = this.buckets = new Bucket[x2];
+            Span<FixedSizePriorityMap> span = this.maps = new FixedSizePriorityMap[x2];
 
-            // We preallocate the buckets in advance, since each bucket only contains the
+            // We preallocate the maps in advance, since each bucket only contains the
             // array field, which is not preinitialized, so the allocations are minimal.
-            // This lets us lock on each individual buckets when retrieving a string instance.
-            foreach (ref Bucket bucket in span)
+            // This lets us lock on each individual maps when retrieving a string instance.
+            foreach (ref FixedSizePriorityMap map in span)
             {
-                bucket = new Bucket(y2);
+                map = new FixedSizePriorityMap(y2);
             }
 
-            this.numberOfBuckets = x2;
+            this.numberOfMaps = x2;
 
             Size = p2;
         }
@@ -183,11 +183,14 @@ public void Add(string value)
 
             int
                 hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode & (this.numberOfBuckets - 1);
+                bucketIndex = hashcode & (this.numberOfMaps - 1);
 
-            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
 
-            bucket.Add(value, hashcode);
+            lock (map.SyncRoot)
+            {
+                map.Add(value, hashcode);
+            }
         }
 
         /// <summary>
@@ -204,11 +207,14 @@ public string GetOrAdd(string value)
 
             int
                 hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode & (this.numberOfBuckets - 1);
+                bucketIndex = hashcode & (this.numberOfMaps - 1);
 
-            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.GetOrAdd(value, hashcode);
+            lock (map.SyncRoot)
+            {
+                return map.GetOrAdd(value, hashcode);
+            }
         }
 
         /// <summary>
@@ -225,11 +231,14 @@ public string GetOrAdd(ReadOnlySpan<char> span)
 
             int
                 hashcode = GetHashCode(span),
-                bucketIndex = hashcode & (this.numberOfBuckets - 1);
+                bucketIndex = hashcode & (this.numberOfMaps - 1);
 
-            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.GetOrAdd(span, hashcode);
+            lock (map.SyncRoot)
+            {
+                return map.GetOrAdd(span, hashcode);
+            }
         }
 
         /// <summary>
@@ -275,175 +284,459 @@ public bool TryGet(ReadOnlySpan<char> span, [NotNullWhen(true)] out string? valu
 
             int
                 hashcode = GetHashCode(span),
-                bucketIndex = hashcode & (this.numberOfBuckets - 1);
+                bucketIndex = hashcode & (this.numberOfMaps - 1);
 
-            ref Bucket bucket = ref this.buckets.DangerousGetReferenceAt(bucketIndex);
+            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
 
-            return bucket.TryGet(span, hashcode, out value);
+            lock (map.SyncRoot)
+            {
+                return map.TryGet(span, hashcode, out value);
+            }
         }
 
         /// <summary>
-        /// Resets the current instance and its associated buckets.
+        /// Resets the current instance and its associated maps.
         /// </summary>
         public void Reset()
         {
-            foreach (ref Bucket bucket in this.buckets.AsSpan())
+            foreach (ref FixedSizePriorityMap map in this.maps.AsSpan())
             {
-                bucket.Reset();
+                lock (map.SyncRoot)
+                {
+                    map.Reset();
+                }
             }
         }
 
         /// <summary>
-        /// A configurable bucket containing a group of cached <see cref="string"/> instances.
+        /// A configurable map containing a group of cached <see cref="string"/> instances.
         /// </summary>
-        private struct Bucket
+        private struct FixedSizePriorityMap
         {
             /// <summary>
-            /// The number of entries being used in the current instance.
+            /// The index representing the end of a given list.
+            /// </summary>
+            private const int EndOfList = -1;
+
+            /// <summary>
+            /// The index representing the negative offset for the start of the free list.
             /// </summary>
-            private readonly int entriesPerBucket;
+            private const int StartOfFreeList = -3;
 
             /// <summary>
-            /// A dummy <see cref="object"/> used for synchronization.
+            /// The array of 1-based indices for the <see cref="MapEntry"/> items stored in <see cref="mapEntries"/>.
             /// </summary>
-            private readonly object dummy;
+            private readonly int[] buckets;
 
             /// <summary>
-            /// The array of entries currently in use.
+            /// The array of currently cached entries (ie. the lists for each hash group).
             /// </summary>
-            private string?[]? entries;
+            private readonly MapEntry[] mapEntries;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="Bucket"/> struct.
+            /// The array of priority values associated to each item stored in <see cref="mapEntries"/>.
             /// </summary>
-            /// <param name="entriesPerBucket">The number of entries being used in the current instance.</param>
-            public Bucket(int entriesPerBucket)
+            private readonly HeapEntry[] heapEntries;
+
+            /// <summary>
+            /// The current number of items stored in the map.
+            /// </summary>
+            private int count;
+
+            /// <summary>
+            /// The 1-based index for the start of the free list within <see cref="mapEntries"/>.
+            /// </summary>
+            private int freeList;
+
+            /// <summary>
+            /// A type representing a map entry, ie. a node in a given list.
+            /// </summary>
+            private struct MapEntry
             {
-                this.entriesPerBucket = entriesPerBucket;
-                this.dummy = new object();
-                this.entries = null;
+                /// <summary>
+                /// The precomputed hashcode for <see cref="Value"/>.
+                /// </summary>
+                public int HashCode;
+
+                /// <summary>
+                /// The <see cref="string"/> instance cached in this entry.
+                /// </summary>
+                public string Value;
+
+                /// <summary>
+                /// The 0-based index for the next node in the current list.
+                /// </summary>
+                public int NextIndex;
+
+                /// <summary>
+                /// The 0-based index for the heap entry corresponding to the current node.
+                /// </summary>
+                public int HeapIndex;
             }
 
             /// <summary>
-            /// Implements <see cref="StringPool.Add"/> for the current <see cref="Bucket"/> instance.
+            /// A type representing a heap entry, used to associate priority to each item.
             /// </summary>
-            /// <param name="value">The input <see cref="string"/> instance to cache.</param>
-            /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
-            public void Add(string value, int hashcode)
+            private struct HeapEntry
             {
-                lock (this.dummy)
-                {
-                    ref string?[]? entries = ref this.entries;
+                /// <summary>
+                /// The timestamp for the current entry (ie. the priority for the item).
+                /// </summary>
+                public long Timestamp;
+
+                /// <summary>
+                /// The <see cref="string"/> instance cached in the associated map entry.
+                /// </summary>
+                public string Value;
+
+                /// <summary>
+                /// The 0-based index for the map entry corresponding to the current item.
+                /// </summary>
+                public int MapIndex;
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="FixedSizePriorityMap"/> struct.
+            /// </summary>
+            /// <param name="capacity">The fixed capacity of the current map.</param>
+            public FixedSizePriorityMap(int capacity)
+            {
+                this.buckets = new int[capacity];
+                this.mapEntries = new MapEntry[capacity];
+                this.heapEntries = new HeapEntry[capacity];
+                this.count = 0;
+                this.freeList = EndOfList;
+            }
 
-                    entries ??= new string[entriesPerBucket];
+            /// <summary>
+            /// Gets an <see cref="object"/> that can be used to synchronize access to the current instance.
+            /// </summary>
+            public object SyncRoot
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get => this.buckets;
+            }
 
-                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
+            /// <summary>
+            /// Implements <see cref="StringPool.Add"/> for the current instance.
+            /// </summary>
+            /// <param name="value">The input <see cref="string"/> instance to cache.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public unsafe void Add(string value, int hashcode)
+            {
+                ref string? target = ref TryGet(value.AsSpan(), hashcode);
 
-                    entries.DangerousGetReferenceAt(entryIndex) = value;
+                if (Unsafe.AreSame(ref target!, ref Unsafe.AsRef<string>(null)))
+                {
+                    Insert(value, hashcode);
+                }
+                else
+                {
+                    target = value;
                 }
             }
 
             /// <summary>
-            /// Implements <see cref="StringPool.GetOrAdd(string)"/> for the current <see cref="Bucket"/> instance.
+            /// Implements <see cref="StringPool.GetOrAdd(string)"/> for the current instance.
             /// </summary>
             /// <param name="value">The input <see cref="string"/> instance with the contents to use.</param>
             /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="value"/>.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public string GetOrAdd(string value, int hashcode)
             {
-                lock (this.dummy)
+                if (TryGet(value.AsSpan(), hashcode, out string? result))
                 {
-                    ref string?[]? entries = ref this.entries;
-
-                    entries ??= new string[entriesPerBucket];
-
-                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
-
-                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+                    return result;
+                }
 
-                    if (!(entry is null) &&
-                        entry.AsSpan().SequenceEqual(value.AsSpan()))
-                    {
-                        return entry;
-                    }
+                Insert(value, hashcode);
 
-                    return entry = value;
-                }
+                return value;
             }
 
             /// <summary>
-            /// Implements <see cref="StringPool.GetOrAdd(ReadOnlySpan{char})"/> for the current <see cref="Bucket"/> instance.
+            /// Implements <see cref="StringPool.GetOrAdd(ReadOnlySpan{char})"/> for the current instance.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
             /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
             {
-                lock (this.dummy)
+                if (TryGet(span, hashcode, out string? result))
                 {
-                    ref string?[]? entries = ref this.entries;
+                    return result!;
+                }
 
-                    entries ??= new string[entriesPerBucket];
+                string value = span.ToString();
 
-                    int entryIndex = hashcode & (this.entriesPerBucket - 1);
+                Insert(value, hashcode);
 
-                    ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+                return value;
+            }
 
-                    if (!(entry is null) &&
-                        entry.AsSpan().SequenceEqual(span))
-                    {
-                        return entry;
-                    }
+            /// <summary>
+            /// Implements <see cref="StringPool.TryGet"/> for the current instance.
+            /// </summary>
+            /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
+            /// <param name="value">The resulting cached <see cref="string"/> instance, if present</param>
+            /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public unsafe bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] out string? value)
+            {
+                ref string? result = ref TryGet(span, hashcode);
+
+                if (!Unsafe.AreSame(ref result!, ref Unsafe.AsRef<string>(null)))
+                {
+                    value = result;
 
-                    // ReadOnlySpan<char>.ToString() creates a string with the span contents.
-                    // This is equivalent to doing new string(span) on Span<T>-enabled runtimes,
-                    // or to using an unsafe block, a fixed statement and new string(char*, int, int).
-                    return entry = span.ToString();
+                    return true;
                 }
+
+                value = null;
+
+                return false;
             }
 
             /// <summary>
-            /// Implements <see cref="StringPool.TryGet"/> for the current <see cref="Bucket"/> instance.
+            /// Resets the current instance and throws away all the cached values.
+            /// </summary>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void Reset()
+            {
+                this.buckets.AsSpan().Clear();
+                this.mapEntries.AsSpan().Clear();
+                this.heapEntries.AsSpan().Clear();
+                this.count = 0;
+                this.freeList = EndOfList;
+            }
+
+            /// <summary>
+            /// Tries to get a target <see cref="string"/> instance, if it exists, and returns a reference to it.
             /// </summary>
             /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> with the contents to use.</param>
             /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
-            /// <param name="value">The resulting cached <see cref="string"/> instance, if present</param>
-            /// <returns>Whether or not the target <see cref="string"/> instance was found.</returns>
-            public bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] out string? value)
+            /// <returns>A reference to the slot where the target <see cref="string"/> instance could be.</returns>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private unsafe ref string? TryGet(ReadOnlySpan<char> span, int hashcode)
             {
-                lock (this.dummy)
+                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
+                ref MapEntry entry = ref Unsafe.AsRef<MapEntry>(null);
+                int
+                    bucketIndex = hashcode & (this.buckets.Length - 1),
+                    length = this.buckets.Length;
+
+                for (int i = this.buckets.DangerousGetReferenceAt(bucketIndex) - 1;
+                     (uint)i < (uint)length;
+                     i = entry.NextIndex)
                 {
-                    ref string?[]? entries = ref this.entries;
+                    entry = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)i);
 
-                    if (!(entries is null))
+                    if (entry.HashCode == hashcode &&
+                        entry.Value.AsSpan().SequenceEqual(span))
                     {
-                        int entryIndex = hashcode & (this.entriesPerBucket - 1);
+                        UpdateTimestamp(ref entry.HeapIndex);
+
+                        return ref entry.Value!;
+                    }
+                }
+
+                return ref Unsafe.AsRef<string?>(null);
+            }
+
+            /// <summary>
+            /// Inserts a new <see cref="string"/> instance in the current map, freeing up a space if needed.
+            /// </summary>
+            /// <param name="value">The new <see cref="string"/> instance to store.</param>
+            /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private unsafe void Insert(string value, int hashcode)
+            {
+                ref int bucketsRef = ref this.buckets.DangerousGetReference();
+                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
+                ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
+                int entryIndex, heapIndex;
+
+                // If the free list is not empty, get that map node and update the field
+                if (this.freeList != EndOfList)
+                {
+                    entryIndex = this.freeList;
+                    heapIndex = this.count;
+
+                    int nextIndex = Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex).NextIndex;
+
+                    // Update the free list pointer: either to the next free node or to the invalid marker
+                    this.freeList = StartOfFreeList - nextIndex;
+                }
+                else if (this.count == this.mapEntries.Length)
+                {
+                    // If the current map is empty, first get the oldest value, which is
+                    // always the first item in the heap. Then, free up a slot by
+                    // removing that, and insert the new value in that empty location.
+                    string key = heapEntriesRef.Value;
+
+                    entryIndex = Remove(key);
+                    heapIndex = 0;
+                }
+                else
+                {
+                    entryIndex = this.count;
+                    heapIndex = this.count;
+                }
+
+                int bucketIndex = hashcode & (this.buckets.Length - 1);
+                ref int targetBucket = ref Unsafe.Add(ref bucketsRef, (IntPtr)(void*)(uint)bucketIndex);
+                ref MapEntry targetMapEntry = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex);
+                ref HeapEntry targetHeapEntry = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)heapIndex);
+
+                // Assign the values in the new map entry
+                targetMapEntry.HashCode = hashcode;
+                targetMapEntry.Value = value;
+                targetMapEntry.NextIndex = targetBucket - 1;
+                targetMapEntry.HeapIndex = heapIndex;
+
+                // Update the bucket slot and the current count
+                targetBucket = entryIndex + 1;
+                this.count++;
+
+                // Link the heap node with the current entry
+                targetHeapEntry.Value = value;
+                targetHeapEntry.MapIndex = entryIndex;
+
+                // Update the timestamp and balance the heap again
+                UpdateTimestamp(ref targetMapEntry.HeapIndex);
+            }
 
-                        ref string? entry = ref entries.DangerousGetReferenceAt(entryIndex);
+            /// <summary>
+            /// Removes a specified <see cref="string"/> instance from the map to free up one slot.
+            /// </summary>
+            /// <param name="key">The target <see cref="string"/> instance to remove.</param>
+            /// <returns>The index of the freed up slot within <see cref="mapEntries"/>.</returns>
+            /// <remarks>The input <see cref="string"/> instance needs to already exist in the map.</remarks>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private unsafe int Remove(string key)
+            {
+                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
+                int
+                    hashcode = StringPool.GetHashCode(key.AsSpan()),
+                    bucketIndex = hashcode & (this.buckets.Length - 1),
+                    entryIndex = this.buckets.DangerousGetReferenceAt(bucketIndex) - 1,
+                    lastIndex = EndOfList;
+
+                // We can just have an undefined loop, as the input
+                // value we're looking for is guaranteed to be present
+                while (true)
+                {
+                    ref MapEntry candidate = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex);
 
-                        if (!(entry is null) &&
-                            entry.AsSpan().SequenceEqual(span))
+                    // Check the current value for a match
+                    if (candidate.HashCode == hashcode &&
+                        candidate.Value.Equals(key))
+                    {
+                        // If this was not the first list node, update the parent as well
+                        if (lastIndex != EndOfList)
                         {
-                            value = entry;
+                            ref MapEntry lastEntry = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)lastIndex);
 
-                            return true;
+                            lastEntry.NextIndex = candidate.NextIndex;
+                        }
+                        else
+                        {
+                            // Otherwise, update the target index from the bucket slot
+                            this.buckets.DangerousGetReferenceAt(bucketIndex) = candidate.NextIndex + 1;
                         }
-                    }
 
-                    value = null;
+                        this.count--;
 
-                    return false;
+                        return entryIndex;
+                    }
+
+                    // Move to the following node in the current list
+                    lastIndex = entryIndex;
+                    entryIndex = candidate.NextIndex;
                 }
             }
 
             /// <summary>
-            /// Resets the current array of entries.
+            /// Updates the timestamp of a heap node at the specified index (which is then synced back).
             /// </summary>
-            public void Reset()
+            /// <param name="heapIndex">The index of the target heap node to update.</param>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private unsafe void UpdateTimestamp(ref int heapIndex)
             {
-                lock (this.dummy)
+                int currentIndex = heapIndex;
+
+                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
+                ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
+                ref HeapEntry root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
+
+                // Assign a new timestamp to the target heap node
+                root.Timestamp = Stopwatch.GetTimestamp();
+
+                // Once the timestamp is updated (which will cause the heap to become
+                // unbalanced), start a sift down loop to balance the heap again.
+                while (true)
                 {
-                    this.entries = null;
+                    root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
+
+                    // The heap is 0-based (so that the array length can remain the same
+                    // as the power of 2 value used for the other arrays in this type).
+                    // This means that children of each node are at positions:
+                    //   - left: (2 * n) + 1
+                    //   - right: (2 * n) + 2
+                    ref HeapEntry minimum = ref root;
+                    int
+                        left = (currentIndex * 2) + 1,
+                        right = (currentIndex * 2) + 2,
+                        targetIndex = currentIndex;
+
+                    // Check and update the left child, if necessary
+                    if (left < this.count)
+                    {
+                        ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)left);
+
+                        if (child.Timestamp < minimum.Timestamp)
+                        {
+                            minimum = ref child;
+                            targetIndex = left;
+                        }
+                    }
+
+                    // Same check as above for the right child
+                    if (right < this.count)
+                    {
+                        ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)right);
+
+                        if (child.Timestamp < minimum.Timestamp)
+                        {
+                            minimum = ref child;
+                            targetIndex = right;
+                        }
+                    }
+
+                    // If no swap is pending, we can just stop here.
+                    // Before returning, we update the target index as well.
+                    if (Unsafe.AreSame(ref root, ref minimum))
+                    {
+                        heapIndex = targetIndex;
+
+                        return;
+                    }
+
+                    // Update the indices in the respective map entries (accounting for the swap)
+                    Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)root.MapIndex).HeapIndex = targetIndex;
+                    Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)minimum.MapIndex).HeapIndex = currentIndex;
+
+                    currentIndex = targetIndex;
+
+                    // Swap the parent and child (so that the minimum value bubbles up)
+                    HeapEntry temp = root;
+
+                    root = minimum;
+                    minimum = temp;
                 }
             }
         }
@@ -458,9 +751,9 @@ public void Reset()
         private static int GetHashCode(ReadOnlySpan<char> span)
         {
 #if NETSTANDARD1_4
-            return span.GetDjb2HashCode() & SignMask;
+            return span.GetDjb2HashCode();
 #else
-            return HashCode<char>.Combine(span) & SignMask;
+            return HashCode<char>.Combine(span);
 #endif
         }
 
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index e9da8268b70..8afa8b87d9c 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -36,15 +36,15 @@ public void Test_StringPool_Cctor_Ok(int minimumSize, int x, int y, int size)
 
             Assert.AreEqual(size, pool.Size);
 
-            Array buckets = (Array)typeof(StringPool).GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
+            Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
 
-            Assert.AreEqual(x, buckets.Length);
+            Assert.AreEqual(x, maps.Length);
 
-            Type bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+Bucket, Microsoft.Toolkit.HighPerformance");
+            Type bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, Microsoft.Toolkit.HighPerformance");
 
-            int bucketSize = (int)bucketType.GetField("entriesPerBucket", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(buckets.GetValue(0));
+            int[] buckets = (int[])bucketType.GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(maps.GetValue(0));
 
-            Assert.AreEqual(y, bucketSize);
+            Assert.AreEqual(y, buckets.Length);
         }
 
         [TestCategory("StringPool")]

From 62f713fe1d479af468d9cd5258c2011b9c705c3d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Jul 2020 17:10:59 +0200
Subject: [PATCH 280/595] ~40% speedup in StringPool, removed system call

Replaced Stopwatch.GetTimestamp() with a local counter to remove the overhead of the system call, which was pretty high
---
 .../Buffers/StringPool.cs                     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index a9956477774..0e78f4175fc 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 #if NETCOREAPP3_1
@@ -348,6 +347,11 @@ private struct FixedSizePriorityMap
             /// </summary>
             private int freeList;
 
+            /// <summary>
+            /// The current incremental timestamp for the items stored in <see cref="heapEntries"/>.
+            /// </summary>
+            private ulong timestamp;
+
             /// <summary>
             /// A type representing a map entry, ie. a node in a given list.
             /// </summary>
@@ -382,7 +386,7 @@ private struct HeapEntry
                 /// <summary>
                 /// The timestamp for the current entry (ie. the priority for the item).
                 /// </summary>
-                public long Timestamp;
+                public ulong Timestamp;
 
                 /// <summary>
                 /// The <see cref="string"/> instance cached in the associated map entry.
@@ -406,6 +410,7 @@ public FixedSizePriorityMap(int capacity)
                 this.heapEntries = new HeapEntry[capacity];
                 this.count = 0;
                 this.freeList = EndOfList;
+                this.timestamp = 0;
             }
 
             /// <summary>
@@ -673,8 +678,15 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                 ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
                 ref HeapEntry root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
 
-                // Assign a new timestamp to the target heap node
-                root.Timestamp = Stopwatch.GetTimestamp();
+                // Assign a new timestamp to the target heap node. We use a
+                // local incremental timestamp instead of using the system timer
+                // as this greatly reduces the overhead and the time spent in system calls.
+                // The ulong type provides a massive range and it's unlikely users would ever
+                // exhaust it anyway (especially considering each map has a separate counter).
+                // Furthermore, even if this happened, the only consequence would be some newly
+                // used string instances potentially being discarded too early, but the map
+                // itself would still continue to work fine (the heap would remain balanced).
+                root.Timestamp = ++this.timestamp;
 
                 // Once the timestamp is updated (which will cause the heap to become
                 // unbalanced), start a sift down loop to balance the heap again.

From 8a5b294b1b6f464f3fb4cdded090192e07f723c1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Jul 2020 20:20:51 +0200
Subject: [PATCH 281/595] Added sealed modifier to DictionarySlim<TKey, TValue>

---
 .../DictionarySlim{TKey,TValue}.cs                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index e566bd489a1..edfeeed50eb 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
+    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : IEquatable<TKey>
         where TValue : class
     {

From e519f3d255e8d47d0b5fdb538d127b4aee7665c6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Jul 2020 20:30:31 +0200
Subject: [PATCH 282/595] Removed outdated remarks (before refactor to map)

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 0e78f4175fc..6c72042b1e3 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -161,11 +161,6 @@ private static int RoundUpPowerOfTwo(int x)
 
         /// <summary>
         /// Gets the total number of <see cref="string"/> that can be stored in the current instance.
-        /// <remarks>
-        /// This property only refers to the total number of available slots, ignoring collisions.
-        /// The requested size should always be set to a higher value than the target number of items
-        /// that will be stored in the cache, to reduce the number of collisions when caching values.
-        /// </remarks>
         /// </summary>
         public int Size { get; }
 

From eb9d70a4bc47ba599bb88f536a207833c6657b96 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 13 Jul 2020 23:25:13 +0200
Subject: [PATCH 283/595] Removed sealed modifier, this was a bad idea

---
 .../DictionarySlim{TKey,TValue}.cs                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index edfeeed50eb..e566bd489a1 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Collections.Extensions
     /// 3) This means it can avoid storing a comparer, and avoid the likely virtual call to a comparer.
     /// </remarks>
     [DebuggerDisplay("Count = {Count}")]
-    internal sealed class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
+    internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : IEquatable<TKey>
         where TValue : class
     {

From a49f72e2dac5aeafdacc07b5dc0110861f19d293 Mon Sep 17 00:00:00 2001
From: takano <takano03@gmail.com>
Date: Tue, 14 Jul 2020 17:30:18 +0900
Subject: [PATCH 284/595] fix a problem when parsing with ---\n---\n

---
 .../Markdown/Blocks/YamlHeaderBlock.cs              |  2 +-
 .../Markdown/Parse/HorizontalRuleTests.cs           | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs b/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
index 1cfd33c1a0c..452f4ca2fe1 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
@@ -78,7 +78,6 @@ internal static YamlHeaderBlock Parse(string markdown, int start, int end, out i
                 else if (end - pos >= 3 && markdown.Substring(pos, 3) == "---")
                 {
                     lockedFinalUnderline = true;
-                    realEndIndex = pos + 3;
                     break;
                 }
                 else if (startOfNextLine == pos + 1)
@@ -134,6 +133,7 @@ internal static YamlHeaderBlock Parse(string markdown, int start, int end, out i
                 return null;
             }
 
+            realEndIndex = pos + 3;
             return result;
         }
 
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
index aa715af076f..473f631a218 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
@@ -107,5 +107,18 @@ public void HorizontalRule_Negative_FourStars()
                 new ParagraphBlock().AddChildren(
                     new TextRunInline { Text = "before ** after" }));
         }
+
+        [TestMethod]
+        [TestCategory("Parse - block")]
+        public void HorizontalRule_DoubleLine()
+        {
+            AssertEqual(
+                CollapseWhitespace(@"
+                ---
+                ---
+                "),
+                new HorizontalRuleBlock(),
+                new HorizontalRuleBlock());
+        }
     }
 }
\ No newline at end of file

From b885adcd372edaed86be7ea4cad464022328fb45 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Jul 2020 13:30:45 +0200
Subject: [PATCH 285/595] Added missing timestamp reset

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 6c72042b1e3..79629c6531e 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -512,6 +512,7 @@ public void Reset()
                 this.heapEntries.AsSpan().Clear();
                 this.count = 0;
                 this.freeList = EndOfList;
+                this.timestamp = 0;
             }
 
             /// <summary>
@@ -573,7 +574,7 @@ private unsafe void Insert(string value, int hashcode)
                 }
                 else if (this.count == this.mapEntries.Length)
                 {
-                    // If the current map is empty, first get the oldest value, which is
+                    // If the current map is full, first get the oldest value, which is
                     // always the first item in the heap. Then, free up a slot by
                     // removing that, and insert the new value in that empty location.
                     string key = heapEntriesRef.Value;

From 315f6871caf66d73c3634f7657b0e8791d96593e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Jul 2020 20:01:25 +0200
Subject: [PATCH 286/595] Removed movsxd from Count/Djb2 extensions

---
 .../Extensions/ArrayExtensions.2D.cs                      | 8 ++++----
 .../Extensions/ArrayExtensions.cs                         | 8 ++++----
 .../Extensions/ReadOnlySpanExtensions.cs                  | 8 ++++----
 .../Extensions/SpanExtensions.cs                          | 8 ++++----
 .../Extensions/StringExtensions.cs                        | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
index 67130cd2bdf..73071dda0fa 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
@@ -271,11 +271,11 @@ public static Span<T> AsSpan<T>(this T[,] array)
         /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="array"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Count<T>(this T[,] array, T value)
+        public static unsafe int Count<T>(this T[,] array, T value)
             where T : IEquatable<T>
         {
             ref T r0 = ref array.DangerousGetReference();
-            IntPtr length = (IntPtr)array.Length;
+            IntPtr length = (IntPtr)(void*)(uint)array.Length;
 
             return SpanHelper.Count(ref r0, length, value);
         }
@@ -290,11 +290,11 @@ public static int Count<T>(this T[,] array, T value)
         /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetDjb2HashCode<T>(this T[,] array)
+        public static unsafe int GetDjb2HashCode<T>(this T[,] array)
             where T : notnull
         {
             ref T r0 = ref array.DangerousGetReference();
-            IntPtr length = (IntPtr)array.Length;
+            IntPtr length = (IntPtr)(void*)(uint)array.Length;
 
             return SpanHelper.GetDjb2HashCode(ref r0, length);
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
index 771b993ce5e..73e3b8ed73f 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.cs
@@ -111,11 +111,11 @@ private sealed class RawArrayData
         /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="array"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Count<T>(this T[] array, T value)
+        public static unsafe int Count<T>(this T[] array, T value)
             where T : IEquatable<T>
         {
             ref T r0 = ref array.DangerousGetReference();
-            IntPtr length = (IntPtr)array.Length;
+            IntPtr length = (IntPtr)(void*)(uint)array.Length;
 
             return SpanHelper.Count(ref r0, length, value);
         }
@@ -182,11 +182,11 @@ public static SpanTokenizer<T> Tokenize<T>(this T[] array, T separator)
         /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetDjb2HashCode<T>(this T[] array)
+        public static unsafe int GetDjb2HashCode<T>(this T[] array)
             where T : notnull
         {
             ref T r0 = ref array.DangerousGetReference();
-            IntPtr length = (IntPtr)array.Length;
+            IntPtr length = (IntPtr)(void*)(uint)array.Length;
 
             return SpanHelper.GetDjb2HashCode(ref r0, length);
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index cb84e3358af..6f46c576275 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -165,11 +165,11 @@ public static unsafe int IndexOf<T>(this ReadOnlySpan<T> span, in T value)
         /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="span"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.NoInlining)]
-        public static int Count<T>(this ReadOnlySpan<T> span, T value)
+        public static unsafe int Count<T>(this ReadOnlySpan<T> span, T value)
             where T : IEquatable<T>
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            IntPtr length = (IntPtr)span.Length;
+            IntPtr length = (IntPtr)(void*)(uint)span.Length;
 
             return SpanHelper.Count(ref r0, length, value);
         }
@@ -291,11 +291,11 @@ public static ReadOnlySpanTokenizer<T> Tokenize<T>(this ReadOnlySpan<T> span, T
         /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetDjb2HashCode<T>(this ReadOnlySpan<T> span)
+        public static unsafe int GetDjb2HashCode<T>(this ReadOnlySpan<T> span)
             where T : notnull
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            IntPtr length = (IntPtr)span.Length;
+            IntPtr length = (IntPtr)(void*)(uint)span.Length;
 
             return SpanHelper.GetDjb2HashCode(ref r0, length);
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
index b7012683884..05f7502e3d6 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
@@ -140,11 +140,11 @@ public static unsafe int IndexOf<T>(this Span<T> span, ref T value)
         /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="span"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Count<T>(this Span<T> span, T value)
+        public static unsafe int Count<T>(this Span<T> span, T value)
             where T : IEquatable<T>
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            IntPtr length = (IntPtr)span.Length;
+            IntPtr length = (IntPtr)(void*)(uint)span.Length;
 
             return SpanHelper.Count(ref r0, length, value);
         }
@@ -211,11 +211,11 @@ public static SpanTokenizer<T> Tokenize<T>(this Span<T> span, T separator)
         /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetDjb2HashCode<T>(this Span<T> span)
+        public static unsafe int GetDjb2HashCode<T>(this Span<T> span)
             where T : notnull
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
-            IntPtr length = (IntPtr)span.Length;
+            IntPtr length = (IntPtr)(void*)(uint)span.Length;
 
             return SpanHelper.GetDjb2HashCode(ref r0, length);
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
index fca2a27b5c5..b71f0375043 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -89,10 +89,10 @@ private sealed class RawStringData
         /// <returns>The number of occurrences of <paramref name="c"/> in <paramref name="text"/>.</returns>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Count(this string text, char c)
+        public static unsafe int Count(this string text, char c)
         {
             ref char r0 = ref text.DangerousGetReference();
-            IntPtr length = (IntPtr)text.Length;
+            IntPtr length = (IntPtr)(void*)(uint)text.Length;
 
             return SpanHelper.Count(ref r0, length, c);
         }
@@ -155,10 +155,10 @@ public static ReadOnlySpanTokenizer<char> Tokenize(this string text, char separa
         /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetDjb2HashCode(this string text)
+        public static unsafe int GetDjb2HashCode(this string text)
         {
             ref char r0 = ref text.DangerousGetReference();
-            IntPtr length = (IntPtr)text.Length;
+            IntPtr length = (IntPtr)(void*)(uint)text.Length;
 
             return SpanHelper.GetDjb2HashCode(ref r0, length);
         }

From 4ebf45510402a74e530a1e975f2cdf9717646c0b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Jul 2020 20:04:42 +0200
Subject: [PATCH 287/595] Added explicit #if for using statement for clarity

---
 .../Extensions/StringExtensions.cs                              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
index b71f0375043..db015f24621 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -5,7 +5,9 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
+#if !NETCOREAPP3_1
 using System.Runtime.InteropServices;
+#endif
 using Microsoft.Toolkit.HighPerformance.Enumerables;
 using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
 

From 08c859bdd60d1558652ea381ca4e865f79b1fdbc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 14 Jul 2020 20:22:26 +0200
Subject: [PATCH 288/595] Further codegen improvements (especially on 32 bit)

---
 .../Helpers/HashCode{T}.cs                         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs b/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs
index c2f96561722..3c2a43c32a4 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs
@@ -57,7 +57,7 @@ public static int Combine(ReadOnlySpan<T> span)
         /// <remarks>The returned hash code is not processed through <see cref="HashCode"/> APIs.</remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static int CombineValues(ReadOnlySpan<T> span)
+        internal static unsafe int CombineValues(ReadOnlySpan<T> span)
         {
             ref T r0 = ref MemoryMarshal.GetReference(span);
 
@@ -67,13 +67,19 @@ internal static int CombineValues(ReadOnlySpan<T> span)
             // compiler, so this branch will never actually be executed by the code.
             if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
             {
-                return SpanHelper.GetDjb2HashCode(ref r0, (IntPtr)span.Length);
+                return SpanHelper.GetDjb2HashCode(ref r0, (IntPtr)(void*)(uint)span.Length);
             }
 #endif
 
-            // Get the info for the target memory area to process
+            // Get the info for the target memory area to process.
+            // The line below is computing the total byte size for the span,
+            // and we cast both input factors to uint first to avoid sign extensions
+            // (they're both guaranteed to always be positive values), and to let the
+            // JIT avoid the 64 bit computation entirely when running in a 32 bit
+            // process. In that case it will just compute the byte size as a 32 bit
+            // multiplication with overflow, which is guaranteed never to happen anyway.
             ref byte rb = ref Unsafe.As<T, byte>(ref r0);
-            IntPtr length = (IntPtr)((long)span.Length * Unsafe.SizeOf<T>());
+            IntPtr length = (IntPtr)(void*)((uint)span.Length * (uint)Unsafe.SizeOf<T>());
 
             return SpanHelper.GetDjb2LikeByteHash(ref rb, length);
         }

From 613cac01b00bf36370589675ea01f2955470fbc4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Jul 2020 04:10:06 +0200
Subject: [PATCH 289/595] ~90% speed improvements (!), reduced memory usage

---
 .../Buffers/StringPool.cs                     | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 79629c6531e..2190d8795dd 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -345,7 +345,7 @@ private struct FixedSizePriorityMap
             /// <summary>
             /// The current incremental timestamp for the items stored in <see cref="heapEntries"/>.
             /// </summary>
-            private ulong timestamp;
+            private uint timestamp;
 
             /// <summary>
             /// A type representing a map entry, ie. a node in a given list.
@@ -381,12 +381,7 @@ private struct HeapEntry
                 /// <summary>
                 /// The timestamp for the current entry (ie. the priority for the item).
                 /// </summary>
-                public ulong Timestamp;
-
-                /// <summary>
-                /// The <see cref="string"/> instance cached in the associated map entry.
-                /// </summary>
-                public string Value;
+                public uint Timestamp;
 
                 /// <summary>
                 /// The 0-based index for the map entry corresponding to the current item.
@@ -577,10 +572,17 @@ private unsafe void Insert(string value, int hashcode)
                     // If the current map is full, first get the oldest value, which is
                     // always the first item in the heap. Then, free up a slot by
                     // removing that, and insert the new value in that empty location.
-                    string key = heapEntriesRef.Value;
-
-                    entryIndex = Remove(key);
+                    entryIndex = heapEntriesRef.MapIndex;
                     heapIndex = 0;
+
+                    ref MapEntry removedEntry = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex);
+
+                    // The removal logic can be extremely optimized in this case, as we
+                    // can retrieve the precomputed hashcode for the target entry by doing
+                    // a lookup on the target map node, and we can also skip all the comparisons
+                    // while traversing the target chain since we know in advance the index of
+                    // the target node which will contain the item to remove from the map.
+                    Remove(removedEntry.HashCode, entryIndex);
                 }
                 else
                 {
@@ -604,7 +606,6 @@ private unsafe void Insert(string value, int hashcode)
                 this.count++;
 
                 // Link the heap node with the current entry
-                targetHeapEntry.Value = value;
                 targetHeapEntry.MapIndex = entryIndex;
 
                 // Update the timestamp and balance the heap again
@@ -614,15 +615,14 @@ private unsafe void Insert(string value, int hashcode)
             /// <summary>
             /// Removes a specified <see cref="string"/> instance from the map to free up one slot.
             /// </summary>
-            /// <param name="key">The target <see cref="string"/> instance to remove.</param>
-            /// <returns>The index of the freed up slot within <see cref="mapEntries"/>.</returns>
+            /// <param name="hashcode">The precomputed hashcode of the instance to remove.</param>
+            /// <param name="mapIndex">The index of the target map node to remove.</param>
             /// <remarks>The input <see cref="string"/> instance needs to already exist in the map.</remarks>
             [MethodImpl(MethodImplOptions.NoInlining)]
-            private unsafe int Remove(string key)
+            private unsafe void Remove(int hashcode, int mapIndex)
             {
                 ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
                 int
-                    hashcode = StringPool.GetHashCode(key.AsSpan()),
                     bucketIndex = hashcode & (this.buckets.Length - 1),
                     entryIndex = this.buckets.DangerousGetReferenceAt(bucketIndex) - 1,
                     lastIndex = EndOfList;
@@ -634,8 +634,7 @@ private unsafe int Remove(string key)
                     ref MapEntry candidate = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex);
 
                     // Check the current value for a match
-                    if (candidate.HashCode == hashcode &&
-                        candidate.Value.Equals(key))
+                    if (entryIndex == mapIndex)
                     {
                         // If this was not the first list node, update the parent as well
                         if (lastIndex != EndOfList)
@@ -652,7 +651,7 @@ private unsafe int Remove(string key)
 
                         this.count--;
 
-                        return entryIndex;
+                        return;
                     }
 
                     // Move to the following node in the current list
@@ -677,7 +676,7 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                 // Assign a new timestamp to the target heap node. We use a
                 // local incremental timestamp instead of using the system timer
                 // as this greatly reduces the overhead and the time spent in system calls.
-                // The ulong type provides a massive range and it's unlikely users would ever
+                // The uint type provides a large enough range and it's unlikely users would ever
                 // exhaust it anyway (especially considering each map has a separate counter).
                 // Furthermore, even if this happened, the only consequence would be some newly
                 // used string instances potentially being discarded too early, but the map

From 3032cb1b4f92b3ffb9a839b7c4b7dbeeaae75699 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 15 Jul 2020 19:51:43 +0200
Subject: [PATCH 290/595] Renamed some APIs for consistency

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs |  2 +-
 .../Messaging/ISubscriber{TMessage}.cs                 |  2 +-
 .../Messaging/MessengerExtensions.cs                   | 10 +++++-----
 UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
index 49504b5c251..c70d01107f6 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
@@ -75,7 +75,7 @@ public bool IsActive
         /// </summary>
         /// <remarks>
         /// The base implementation registers all messages for this recipients that have been declared
-        /// explicitly through the <see cref="ISubscriber{TMessage}"/> interface, using the default channel.
+        /// explicitly through the <see cref="IRecipient{TMessage}"/> interface, using the default channel.
         /// For more details on how this works, see the <see cref="MessengerExtensions.Register"/> method.
         /// If you need more fine tuned control, want to register messages individually or just prefer
         /// the lambda-style syntax for message registration, override this method and register manually.
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs b/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
index 610fbc3e1ce..690ab09ff46 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// An interface for a recipient that declares a registration for a specific message type.
     /// </summary>
     /// <typeparam name="TMessage">The type of message to receive.</typeparam>
-    public interface ISubscriber<in TMessage>
+    public interface IRecipient<in TMessage>
         where TMessage : class
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 592510dd817..1f54d078e50 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -47,7 +47,7 @@ public static void Register(this IMessenger messenger, object recipient)
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="token">The token indicating what channel to use.</param>
         /// <remarks>
-        /// This method will register all messages corresponding to the <see cref="ISubscriber{TMessage}"/> interfaces
+        /// This method will register all messages corresponding to the <see cref="IRecipient{TMessage}"/> interfaces
         /// being implemented by <paramref name="recipient"/>. If none are present, this method will do nothing.
         /// Note that unlike all other extensions, this method will use reflection to find the handlers to register.
         /// Once the registration is complete though, the performance will be exactly the same as with handlers
@@ -59,7 +59,7 @@ public static void Register<TToken>(this IMessenger messenger, object recipient,
             foreach (Type subscriptionType in recipient.GetType().GetInterfaces())
             {
                 if (!subscriptionType.IsGenericType ||
-                    subscriptionType.GetGenericTypeDefinition() != typeof(ISubscriber<>))
+                    subscriptionType.GetGenericTypeDefinition() != typeof(IRecipient<>))
                 {
                     return;
                 }
@@ -69,7 +69,7 @@ public static void Register<TToken>(this IMessenger messenger, object recipient,
                     handlerType = typeof(Action<>).MakeGenericType(messageType);
 
                 MethodInfo
-                    receiveMethod = recipient.GetType().GetMethod(nameof(ISubscriber<object>.Receive), new[] { messageType }),
+                    receiveMethod = recipient.GetType().GetMethod(nameof(IRecipient<object>.Receive), new[] { messageType }),
                     registerMethod = messenger.GetType().GetMethod(nameof(IMessenger.Register)).MakeGenericMethod(messageType, typeof(TToken));
 
                 Delegate handler = receiveMethod.CreateDelegate(handlerType, recipient);
@@ -86,7 +86,7 @@ public static void Register<TToken>(this IMessenger messenger, object recipient,
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
-        public static void Register<TMessage>(this IMessenger messenger, ISubscriber<TMessage> recipient)
+        public static void Register<TMessage>(this IMessenger messenger, IRecipient<TMessage> recipient)
             where TMessage : class
         {
             messenger.Register<TMessage, Unit>(recipient, default, recipient.Receive);
@@ -102,7 +102,7 @@ public static void Register<TMessage>(this IMessenger messenger, ISubscriber<TMe
         /// <param name="token">The token indicating what channel to use.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
-        public static void Register<TMessage, TToken>(this IMessenger messenger, ISubscriber<TMessage> recipient, TToken token)
+        public static void Register<TMessage, TToken>(this IMessenger messenger, IRecipient<TMessage> recipient, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 04c6bf47252..25ab9b3e418 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -302,7 +302,7 @@ public sealed class RecipientWithNoMessages
         }
 
         public sealed class RecipientWithSomeMessages
-             : ISubscriber<MessageA>, ISubscriber<MessageB>
+             : IRecipient<MessageA>, IRecipient<MessageB>
         {
             public int As { get; private set; }
 

From 58805a77b8ba9928c370887f103c1caafb1f571f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Jul 2020 01:47:38 +0200
Subject: [PATCH 291/595] Added more comments to DictionarySlim<,> type

---
 .../DictionarySlim{TKey,TValue}.cs            | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index e566bd489a1..ad49ee0c2a6 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -37,17 +37,52 @@ internal class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
         where TKey : IEquatable<TKey>
         where TValue : class
     {
-        // See info in CoreFX labs for how this works
+        /// <summary>
+        /// A reusable array of <see cref="Entry"/> items with a single value.
+        /// This is used when a new <see cref="DictionarySlim{TKey,TValue}"/> instance is
+        /// created, or when one is cleared. The first item being added to this collection
+        /// will immediately cause the first resize (see <see cref="AddKey"/> for more info).
+        /// </summary>
         private static readonly Entry[] InitialEntries = new Entry[1];
+
+        /// <summary>
+        /// The current number of items stored in the map.
+        /// </summary>
         private int count;
+
+        /// <summary>
+        /// The 1-based index for the start of the free list within <see cref="entries"/>.
+        /// </summary>
         private int freeList = -1;
+
+        /// <summary>
+        /// The array of 1-based indices for the <see cref="Entry"/> items stored in <see cref="entries"/>.
+        /// </summary>
         private int[] buckets;
+
+        /// <summary>
+        /// The array of currently stored key-value pairs (ie. the lists for each hash group).
+        /// </summary>
         private Entry[] entries;
 
+        /// <summary>
+        /// A type representing a map entry, ie. a node in a given list.
+        /// </summary>
         private struct Entry
         {
+            /// <summary>
+            /// The key for the value in the current node.
+            /// </summary>
             public TKey Key;
+
+            /// <summary>
+            /// The value in the current node, if present.
+            /// </summary>
             public TValue? Value;
+
+            /// <summary>
+            /// The 0-based index for the next node in the current list.
+            /// </summary>
             public int Next;
         }
 

From e8016f46982dd75d32e43782ff1de58b068d94f8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Jul 2020 01:49:32 +0200
Subject: [PATCH 292/595] Fixed missing file rename for 3032cb1

---
 .../{ISubscriber{TMessage}.cs => IRecipient{TMessage}.cs}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ISubscriber{TMessage}.cs => IRecipient{TMessage}.cs} (100%)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs b/Microsoft.Toolkit.Mvvm/Messaging/IRecipient{TMessage}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/ISubscriber{TMessage}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/IRecipient{TMessage}.cs

From 49d2ea11c947621d8276a60cafcc8a2d1531afe7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Jul 2020 01:56:24 +0200
Subject: [PATCH 293/595] Renamed ViewModelBase to ObservableRecipient

---
 ...iewModelBase.cs => ObservableRecipient.cs} | 13 +++++-----
 UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs   | 10 +++----
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   |  8 +++---
 ...delBase.cs => Test_ObservableRecipient.cs} | 26 +++++++++----------
 .../UnitTests.Shared.projitems                |  2 +-
 5 files changed, 30 insertions(+), 29 deletions(-)
 rename Microsoft.Toolkit.Mvvm/ComponentModel/{ViewModelBase.cs => ObservableRecipient.cs} (93%)
 rename UnitTests/UnitTests.Shared/Mvvm/{Test_ViewModelBase.cs => Test_ObservableRecipient.cs} (77%)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
similarity index 93%
rename from Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
rename to Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index c70d01107f6..b0642675912 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ViewModelBase.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -15,27 +15,28 @@
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
     /// <summary>
-    /// A base class for viewmodels.
+    /// A base class for observable objects that also acts as recipients for messages. This class is an extension of
+    /// <see cref="ObservableObject"/> which also provides built-in support to use the <see cref="IMessenger"/> type.
     /// </summary>
-    public abstract class ViewModelBase : ObservableObject
+    public abstract class ObservableRecipient : ObservableObject
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// Initializes a new instance of the <see cref="ObservableRecipient"/> class.
         /// </summary>
         /// <remarks>
         /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/> instance
         /// to perform requested operations. It will also be available locally through the <see cref="Messenger"/> property.
         /// </remarks>
-        protected ViewModelBase()
+        protected ObservableRecipient()
             : this(Messaging.Messenger.Default)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// Initializes a new instance of the <see cref="ObservableRecipient"/> class.
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to send messages.</param>
-        protected ViewModelBase(IMessenger messenger)
+        protected ObservableRecipient(IMessenger messenger)
         {
             Messenger = messenger;
         }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
index 66d662b4f36..44fbf61301e 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
@@ -68,13 +68,13 @@ public void Test_Ioc_LambdaInitialization_ConstructorInjection()
             {
                 services.AddSingleton<INameService, AliceService>();
                 services.AddSingleton<IMessenger>(messenger);
-                services.AddTransient<MyViewModel>();
+                services.AddTransient<MyRecipient>();
             });
 
-            var service = ioc.GetRequiredService<MyViewModel>();
+            var service = ioc.GetRequiredService<MyRecipient>();
 
             Assert.IsNotNull(service);
-            Assert.IsInstanceOfType(service, typeof(MyViewModel));
+            Assert.IsInstanceOfType(service, typeof(MyRecipient));
             Assert.IsNotNull(service.NameService);
             Assert.IsInstanceOfType(service.NameService, typeof(AliceService));
             Assert.IsNotNull(service.MessengerService);
@@ -138,9 +138,9 @@ public class AliceService : INameService
             public string GetName() => "Alice";
         }
 
-        public class MyViewModel : ViewModelBase
+        public class MyRecipient : ObservableRecipient
         {
-            public MyViewModel(INameService nameService, IMessenger messengerService)
+            public MyRecipient(INameService nameService, IMessenger messengerService)
                 : base(messengerService)
             {
                 NameService = nameService;
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 25ab9b3e418..adb489a0464 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -220,7 +220,7 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_ISubscriber_NoMessages()
+        public void Test_Messenger_IRecipient_NoMessages()
         {
             var messenger = new Messenger();
             var recipient = new RecipientWithNoMessages();
@@ -233,7 +233,7 @@ public void Test_Messenger_ISubscriber_NoMessages()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_ISubscriber_SomeMessages_NoToken()
+        public void Test_Messenger_IRecipient_SomeMessages_NoToken()
         {
             var messenger = new Messenger();
             var recipient = new RecipientWithSomeMessages();
@@ -264,11 +264,11 @@ public void Test_Messenger_ISubscriber_SomeMessages_NoToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_ISubscriber_SomeMessages_WithToken()
+        public void Test_Messenger_IRecipient_SomeMessages_WithToken()
         {
             var messenger = new Messenger();
             var recipient = new RecipientWithSomeMessages();
-            var token = nameof(Test_Messenger_ISubscriber_SomeMessages_WithToken);
+            var token = nameof(Test_Messenger_IRecipient_SomeMessages_WithToken);
 
             messenger.Register(recipient, token);
 
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
similarity index 77%
rename from UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
rename to UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index a1eafa11adf..1edf939f7ca 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ViewModelBase.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -10,13 +10,13 @@
 namespace UnitTests.Mvvm
 {
     [TestClass]
-    public class Test_ViewModelBase
+    public class Test_ObservableRecipient
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ViewModelBase_Activation()
+        public void Test_ObservableRecipient_Activation()
         {
-            var viewmodel = new SomeViewModel<int>();
+            var viewmodel = new SomeRecipient<int>();
 
             Assert.IsFalse(viewmodel.IsActivatedCheck);
 
@@ -33,29 +33,29 @@ public void Test_ViewModelBase_Activation()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ViewModelBase_Defaults()
+        public void Test_ObservableRecipient_Defaults()
         {
-            var viewmodel = new SomeViewModel<int>();
+            var viewmodel = new SomeRecipient<int>();
 
             Assert.AreSame(viewmodel.CurrentMessenger, Messenger.Default);
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ViewModelBase_Injection()
+        public void Test_ObservableRecipient_Injection()
         {
             var messenger = new Messenger();
-            var viewmodel = new SomeViewModel<int>(messenger);
+            var viewmodel = new SomeRecipient<int>(messenger);
 
             Assert.AreSame(viewmodel.CurrentMessenger, messenger);
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ViewModelBase_Broadcast()
+        public void Test_ObservableRecipient_Broadcast()
         {
             var messenger = new Messenger();
-            var viewmodel = new SomeViewModel<int>(messenger);
+            var viewmodel = new SomeRecipient<int>(messenger);
 
             PropertyChangedMessage<int> message = null;
 
@@ -67,16 +67,16 @@ public void Test_ViewModelBase_Broadcast()
             Assert.AreSame(message.Sender, viewmodel);
             Assert.AreEqual(message.OldValue, 0);
             Assert.AreEqual(message.NewValue, 42);
-            Assert.AreEqual(message.PropertyName, nameof(SomeViewModel<int>.Data));
+            Assert.AreEqual(message.PropertyName, nameof(SomeRecipient<int>.Data));
         }
 
-        public class SomeViewModel<T> : ViewModelBase
+        public class SomeRecipient<T> : ObservableRecipient
         {
-            public SomeViewModel()
+            public SomeRecipient()
             {
             }
 
-            public SomeViewModel(IMessenger messenger)
+            public SomeRecipient(IMessenger messenger)
                 : base(messenger)
             {
             }
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index 2ab5258a795..ba35c1ad647 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -29,6 +29,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_AsyncRelayCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ViewModelBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableRecipient.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 53c68410139ec2ef7eb24e075ee83ffffb0b2ad2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Jul 2020 02:21:11 +0200
Subject: [PATCH 294/595] Code refactoring, moved attributes to root

---
 .../Attributes/DoesNotReturnAttribute.cs        |  0
 .../Attributes/DoesNotReturnIfAttribute.cs      |  0
 .../Attributes/NotNullAttribute.cs              |  0
 .../Diagnostics/ThrowHelper.ThrowExceptions.cs  | 17 -----------------
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs    | 17 +++++++++++++++++
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename Microsoft.Toolkit/{Diagnostics => }/Attributes/DoesNotReturnAttribute.cs (100%)
 rename Microsoft.Toolkit/{Diagnostics => }/Attributes/DoesNotReturnIfAttribute.cs (100%)
 rename Microsoft.Toolkit/{Diagnostics => }/Attributes/NotNullAttribute.cs (100%)

diff --git a/Microsoft.Toolkit/Diagnostics/Attributes/DoesNotReturnAttribute.cs b/Microsoft.Toolkit/Attributes/DoesNotReturnAttribute.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/Attributes/DoesNotReturnAttribute.cs
rename to Microsoft.Toolkit/Attributes/DoesNotReturnAttribute.cs
diff --git a/Microsoft.Toolkit/Diagnostics/Attributes/DoesNotReturnIfAttribute.cs b/Microsoft.Toolkit/Attributes/DoesNotReturnIfAttribute.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/Attributes/DoesNotReturnIfAttribute.cs
rename to Microsoft.Toolkit/Attributes/DoesNotReturnIfAttribute.cs
diff --git a/Microsoft.Toolkit/Diagnostics/Attributes/NotNullAttribute.cs b/Microsoft.Toolkit/Attributes/NotNullAttribute.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/Attributes/NotNullAttribute.cs
rename to Microsoft.Toolkit/Attributes/NotNullAttribute.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 9890e1bb9ea..d51c4362b19 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -682,21 +681,5 @@ public static void ThrowWin32Exception(string message, Exception innerException)
         {
             throw new Win32Exception(message, innerException);
         }
-
-        /// <summary>
-        /// Returns a formatted representation of the input value.
-        /// </summary>
-        /// <param name="obj">The input <see cref="object"/> to format.</param>
-        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
-        [Pure]
-        private static string ToAssertString(this object? obj)
-        {
-            return obj switch
-            {
-                string _ => $"\"{obj}\"",
-                null => "null",
-                _ => $"<{obj}>"
-            };
-        }
     }
 }
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index d95e2320274..d27fc8aba7b 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
 
@@ -16,6 +17,22 @@ namespace Microsoft.Toolkit.Diagnostics
     /// </summary>
     public static partial class ThrowHelper
     {
+        /// <summary>
+        /// Returns a formatted representation of the input value.
+        /// </summary>
+        /// <param name="obj">The input <see cref="object"/> to format.</param>
+        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
+        [Pure]
+        private static string ToAssertString(this object? obj)
+        {
+            return obj switch
+            {
+                string _ => $"\"{obj}\"",
+                null => "null",
+                _ => $"<{obj}>"
+            };
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="class"/>) fails.
         /// </summary>

From 8233d7cc94f4a1b46ff5e7a36fe90931b4723fe9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 16 Jul 2020 20:21:34 +0200
Subject: [PATCH 295/595] Reduced thread contention in
 Messenger.Unregister<TToken>

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 131 ++++++++++--------
 1 file changed, 76 insertions(+), 55 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 4416b37edfe..708d54565ce 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -6,6 +6,7 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using Microsoft.Collections.Extensions;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
@@ -220,8 +221,20 @@ public void Unregister(object recipient)
         public void Unregister<TToken>(object recipient, TToken token)
             where TToken : IEquatable<TToken>
         {
-            lock (this.recipientsMap)
+            bool lockTaken = false;
+            IDictionarySlim<Recipient, IDictionarySlim<TToken>>[]? maps = null;
+            int i = 0;
+
+            // We use an explicit try/finally block here instead of the lock syntax so that we can use a single
+            // one both to release the lock and to clear the rented buffer and return it to the pool. The reason
+            // why we're declaring the buffer here and clearing and returning it in this outer finally block is
+            // that doing so doesn't require the lock to be kept, and releasing it before performing this last
+            // step reduces the total time spent while the lock is acquired, which in turn reduces the lock
+            // contention in multi-threaded scenarios where this method is invoked concurrently.
+            try
             {
+                Monitor.Enter(this.recipientsMap, ref lockTaken);
+
                 // Get the shared set of mappings for the recipient, if present
                 var key = new Recipient(recipient);
 
@@ -234,71 +247,80 @@ public void Unregister<TToken>(object recipient, TToken token)
                 // array, as we can't modify the contents of the set while iterating it.
                 // The rented buffer is oversized and will also include mappings for
                 // handlers of messages that are registered through a different token.
-                var maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set!.Count);
-                int i = 0;
+                maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set!.Count);
 
-                try
+                foreach (IMapping item in set)
                 {
-                    foreach (IMapping item in set)
+                    // Select all mappings using the same token type
+                    if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> mapping)
                     {
-                        // Select all mappings using the same token type
-                        if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> mapping)
-                        {
-                            maps[i++] = mapping;
-                        }
+                        maps[i++] = mapping;
                     }
+                }
 
-                    // Iterate through all the local maps. These are all the currently
-                    // existing maps of handlers for messages of any given type, with a token
-                    // of the current type, for the target recipient. We heavily rely on
-                    // interfaces here to be able to iterate through all the available mappings
-                    // without having to know the concrete type in advance, and without having
-                    // to deal with reflection: we can just check if the type of the closed interface
-                    // matches with the token type currently in use, and operate on those instances.
-                    foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
+                // Iterate through all the local maps. These are all the currently
+                // existing maps of handlers for messages of any given type, with a token
+                // of the current type, for the target recipient. We heavily rely on
+                // interfaces here to be able to iterate through all the available mappings
+                // without having to know the concrete type in advance, and without having
+                // to deal with reflection: we can just check if the type of the closed interface
+                // matches with the token type currently in use, and operate on those instances.
+                foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
+                {
+                    // We don't need whether or not the map contains the recipient, as the
+                    // sequence of maps has already been copied from the set containing all
+                    // the mappings for the target recipiets: it is guaranteed to be here.
+                    IDictionarySlim<TToken> holder = map[key];
+
+                    // Try to remove the registered handler for the input token,
+                    // for the current message type (unknown from here).
+                    if (holder.Remove(token))
                     {
-                        // We don't need whether or not the map contains the recipient, as the
-                        // sequence of maps has already been copied from the set containing all
-                        // the mappings for the target recipiets: it is guaranteed to be here.
-                        IDictionarySlim<TToken> holder = map[key];
-
-                        // Try to remove the registered handler for the input token,
-                        // for the current message type (unknown from here).
-                        if (holder.Remove(token))
+                        // As above, we need to update the total number of registered handlers for the map.
+                        // In this case we also know that the current TToken type parameter is of interest
+                        // for the current method, as we're only unsubscribing handlers using that token.
+                        // This is because we're already working on the final <TToken, TMessage> mapping,
+                        // which associates a single handler with a given token, for a given recipient.
+                        // This means that we don't have to retrieve the count to subtract in this case,
+                        // we're just removing a single handler at a time. So, we just decrement the total.
+                        Unsafe.As<IMapping>(map).TotalHandlersCount--;
+
+                        if (holder.Count == 0)
                         {
-                            // As above, we need to update the total number of registered handlers for the map.
-                            // In this case we also know that the current TToken type parameter is of interest
-                            // for the current method, as we're only unsubscribing handlers using that token.
-                            // This is because we're already working on the final <TToken, TMessage> mapping,
-                            // which associates a single handler with a given token, for a given recipient.
-                            // This means that we don't have to retrieve the count to subtract in this case,
-                            // we're just removing a single handler at a time. So, we just decrement the total.
-                            Unsafe.As<IMapping>(map).TotalHandlersCount--;
-
-                            if (holder.Count == 0)
-                            {
-                                // If the map is empty, remove the recipient entirely from its container
-                                map.Remove(key);
+                            // If the map is empty, remove the recipient entirely from its container
+                            map.Remove(key);
 
-                                if (map.Count == 0)
+                            if (map.Count == 0)
+                            {
+                                // If no handlers are left at all for the recipient, across all
+                                // message types and token types, remove the set of mappings
+                                // entirely for the current recipient, and lost the strong
+                                // reference to it as well. This is the same situation that
+                                // would've been achieved by just calling Unregister(recipient).
+                                set.Remove(Unsafe.As<IMapping>(map));
+
+                                if (set.Count == 0)
                                 {
-                                    // If no handlers are left at all for the recipient, across all
-                                    // message types and token types, remove the set of mappings
-                                    // entirely for the current recipient, and lost the strong
-                                    // reference to it as well. This is the same situation that
-                                    // would've been achieved by just calling Unregister(recipient).
-                                    set.Remove(Unsafe.As<IMapping>(map));
-
-                                    if (set.Count == 0)
-                                    {
-                                        this.recipientsMap.Remove(key);
-                                    }
+                                    this.recipientsMap.Remove(key);
                                 }
                             }
                         }
                     }
                 }
-                finally
+            }
+            finally
+            {
+                // Release the lock, if we did acquire it
+                if (lockTaken)
+                {
+                    Monitor.Exit(this.recipientsMap);
+                }
+
+                // If we got to renting the array of maps, return it to the shared pool.
+                // Remove references to avoid leaks coming from the shared memory pool.
+                // We manually create a span and clear it as a small optimization, as
+                // arrays rented from the pool can be larger than the requested size.
+                if (!(maps is null))
                 {
                     maps.AsSpan(0, i).Clear();
 
@@ -414,9 +436,8 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             }
             finally
             {
-                // Remove references to avoid leaks coming from the shared memory pool.
-                // We manually create a span and clear it as a small optimization, as
-                // arrays rented from the pool can be larger than the requested size.
+                // As before, we also need to clear it first to avoid having potentially long
+                // lasting memory leaks due to leftover references being stored in the pool.
                 entries.AsSpan(0, i).Clear();
 
                 ArrayPool<Action<TMessage>>.Shared.Return(entries);

From a6719026276fbeb3200528ac0ba65a674c2d0bc5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Jul 2020 02:01:58 +0200
Subject: [PATCH 296/595] Fixed a bug in Messenger.Reset

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 708d54565ce..a4093db85d8 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -359,7 +359,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                     // registered handlers for the current <TMessage, TToken> combination, regardless,
                     // of the specific token value (ie. the channel used to receive messages of that type).
                     // We can remove the map entirely from this container, and remove the link to the map itself
-                    // to the static mapping between existing registered recipients.
+                    // to the current mapping between existing registered recipients (or entire recipients too).
                     if (dictionary.Count == 0)
                     {
                         mapping.Remove(key);
@@ -451,19 +451,8 @@ public void Reset()
         {
             lock (this.recipientsMap)
             {
-                var recipientsEnumerator = this.recipientsMap.GetEnumerator();
-
-                while (recipientsEnumerator.MoveNext())
-                {
-                    // Clear all the typed maps, as they're assigned to static fields
-                    foreach (var map in recipientsEnumerator.Value)
-                    {
-                        map.Clear();
-                    }
-                }
-
-                // Clear the shared map too
                 this.recipientsMap.Clear();
+                this.typesMap.Clear();
             }
         }
 

From 1123577a523ece34b680ea0704f174b65f1069d6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Jul 2020 02:04:04 +0200
Subject: [PATCH 297/595] Minor code refactoring

---
 .../ComponentModel/ObservableObject.cs        | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 5efe6f6ec5f..bd59a9b23b1 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -36,7 +36,7 @@ public abstract class ObservableObject : INotifyPropertyChanged, INotifyProperty
         /// <remarks>The base implementation only raises the <see cref="PropertyChanged"/> event.</remarks>
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null!)
         {
-            RaisePropertyChanged(propertyName);
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -46,24 +46,6 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <remarks>The base implementation only raises the <see cref="PropertyChanging"/> event.</remarks>
         protected virtual void OnPropertyChanging([CallerMemberName] string propertyName = null!)
-        {
-            RaisePropertyChanging(propertyName);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanging"/> event if needed.
-        /// </summary>
-        /// <param name="propertyName">The name of the property that changed.</param>
-        private void RaisePropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event if needed.
-        /// </summary>
-        /// <param name="propertyName">The name of the property that changed.</param>
-        private void RaisePropertyChanging(string propertyName)
         {
             PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }

From 44451f213f9bbddf9555cb8d2693e4d63ef71de3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 17 Jul 2020 16:40:03 +0200
Subject: [PATCH 298/595] Renamed some IMessenger APIs/extensions for clarity

---
 .../ComponentModel/ObservableRecipient.cs     |  8 ++++----
 .../Messaging/IMessenger.cs                   |  4 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  8 ++++----
 .../Messaging/MessengerExtensions.cs          |  8 ++++----
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 20 +++++++++----------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index b0642675912..b123a74c6d3 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -77,13 +77,13 @@ public bool IsActive
         /// <remarks>
         /// The base implementation registers all messages for this recipients that have been declared
         /// explicitly through the <see cref="IRecipient{TMessage}"/> interface, using the default channel.
-        /// For more details on how this works, see the <see cref="MessengerExtensions.Register"/> method.
+        /// For more details on how this works, see the <see cref="MessengerExtensions.RegisterAll"/> method.
         /// If you need more fine tuned control, want to register messages individually or just prefer
         /// the lambda-style syntax for message registration, override this method and register manually.
         /// </remarks>
         protected virtual void OnActivated()
         {
-            Messenger.Register(this);
+            Messenger.RegisterAll(this);
         }
 
         /// <summary>
@@ -92,13 +92,13 @@ protected virtual void OnActivated()
         /// </summary>
         /// <remarks>
         /// The base implementation unregisters all messages for this recipient. It does so by
-        /// invoking <see cref="IMessenger.Unregister(object)"/>, which removes all registered
+        /// invoking <see cref="IMessenger.UnregisterAll"/>, which removes all registered
         /// handlers for a given subscriber, regardless of what token was used to register them.
         /// That is, all registered handlers across all subscription channels will be removed.
         /// </remarks>
         protected virtual void OnDeactivated()
         {
-            Messenger.Unregister(this);
+            Messenger.UnregisterAll(this);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 9795d126a74..39e38d5af01 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -47,7 +47,7 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// Use this method as an easy way to lose all references to a target recipient.
         /// If the recipient has no registered handler, this method does nothing.
         /// </remarks>
-        void Unregister(object recipient);
+        void UnregisterAll(object recipient);
 
         /// <summary>
         /// Unregisters a recipient from all messages on a specific channel.
@@ -56,7 +56,7 @@ void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage>
         /// <param name="recipient">The recipient to unregister.</param>
         /// <param name="token">The token to use to identify which handlers to unregister.</param>
         /// <remarks>If the recipient has no registered handler, this method does nothing.</remarks>
-        void Unregister<TToken>(object recipient, TToken token)
+        void UnregisterAll<TToken>(object recipient, TToken token)
             where TToken : IEquatable<TToken>;
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index a4093db85d8..558497a2b9b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -92,7 +92,7 @@ public sealed class Messenger : IMessenger
         /// </summary>
         /// <remarks>
         /// This collection is used to allow reflection-free access to all the existing
-        /// registered recipients from <see cref="Unregister(object)"/> and other overloads,
+        /// registered recipients from <see cref="UnregisterAll"/> and other methods in this type,
         /// so that all the existing handlers can be removed without having to dynamically create
         /// the generic types for the containers of the various dictionaries mapping the handlers.
         /// </remarks>
@@ -168,7 +168,7 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
         }
 
         /// <inheritdoc/>
-        public void Unregister(object recipient)
+        public void UnregisterAll(object recipient)
         {
             lock (this.recipientsMap)
             {
@@ -218,7 +218,7 @@ public void Unregister(object recipient)
         }
 
         /// <inheritdoc/>
-        public void Unregister<TToken>(object recipient, TToken token)
+        public void UnregisterAll<TToken>(object recipient, TToken token)
             where TToken : IEquatable<TToken>
         {
             bool lockTaken = false;
@@ -296,7 +296,7 @@ public void Unregister<TToken>(object recipient, TToken token)
                                 // message types and token types, remove the set of mappings
                                 // entirely for the current recipient, and lost the strong
                                 // reference to it as well. This is the same situation that
-                                // would've been achieved by just calling Unregister(recipient).
+                                // would've been achieved by just calling UnregisterAll(recipient).
                                 set.Remove(Unsafe.As<IMapping>(map));
 
                                 if (set.Count == 0)
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 1f54d078e50..2b1ba6ec6ab 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -33,10 +33,10 @@ public static bool IsRegistered<TMessage>(this IMessenger messenger, object reci
         /// </summary>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
         /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <remarks>See notes for <see cref="Register{TToken}(IMessenger,object,TToken)"/> for more info.</remarks>
-        public static void Register(this IMessenger messenger, object recipient)
+        /// <remarks>See notes for <see cref="RegisterAll{TToken}(IMessenger,object,TToken)"/> for more info.</remarks>
+        public static void RegisterAll(this IMessenger messenger, object recipient)
         {
-            messenger.Register(recipient, default(Unit));
+            messenger.RegisterAll(recipient, default(Unit));
         }
 
         /// <summary>
@@ -53,7 +53,7 @@ public static void Register(this IMessenger messenger, object recipient)
         /// Once the registration is complete though, the performance will be exactly the same as with handlers
         /// registered directly through any of the other generic extensions for the <see cref="IMessenger"/> interface.
         /// </remarks>
-        public static void Register<TToken>(this IMessenger messenger, object recipient, TToken token)
+        public static void RegisterAll<TToken>(this IMessenger messenger, object recipient, TToken token)
             where TToken : IEquatable<TToken>
         {
             foreach (Type subscriptionType in recipient.GetType().GetInterfaces())
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index adb489a0464..7e257abba26 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -38,7 +38,7 @@ public void Test_Messenger_UnregisterRecipientWithToken()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Unregister(recipient, nameof(MessageA));
+            messenger.UnregisterAll(recipient, nameof(MessageA));
         }
 
         [TestCategory("Mvvm")]
@@ -48,7 +48,7 @@ public void Test_Messenger_UnregisterRecipientWithRecipient()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Unregister(recipient);
+            messenger.UnregisterAll(recipient);
         }
 
         [TestCategory("Mvvm")]
@@ -88,7 +88,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken()
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
 
-            messenger.Unregister(recipient, nameof(MessageA));
+            messenger.UnregisterAll(recipient, nameof(MessageA));
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
         }
@@ -102,7 +102,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient()
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
 
-            messenger.Unregister(recipient);
+            messenger.UnregisterAll(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
         }
@@ -151,7 +151,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Default.Unregister(a);
+            Messenger.Default.UnregisterAll(a);
 
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
@@ -225,7 +225,7 @@ public void Test_Messenger_IRecipient_NoMessages()
             var messenger = new Messenger();
             var recipient = new RecipientWithNoMessages();
 
-            messenger.Register(recipient);
+            messenger.RegisterAll(recipient);
 
             // We just need to verify we got here with no errors, this
             // recipient has no declared handlers so there's nothing to do
@@ -238,7 +238,7 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken()
             var messenger = new Messenger();
             var recipient = new RecipientWithSomeMessages();
 
-            messenger.Register(recipient);
+            messenger.RegisterAll(recipient);
 
             Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
             Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient));
@@ -256,7 +256,7 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken()
             Assert.AreEqual(recipient.As, 1);
             Assert.AreEqual(recipient.Bs, 1);
 
-            messenger.Unregister(recipient);
+            messenger.UnregisterAll(recipient);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
             Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
@@ -270,7 +270,7 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken()
             var recipient = new RecipientWithSomeMessages();
             var token = nameof(Test_Messenger_IRecipient_SomeMessages_WithToken);
 
-            messenger.Register(recipient, token);
+            messenger.RegisterAll(recipient, token);
 
             Assert.IsTrue(messenger.IsRegistered<MessageA, string>(recipient, token));
             Assert.IsTrue(messenger.IsRegistered<MessageB, string>(recipient, token));
@@ -291,7 +291,7 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken()
             Assert.AreEqual(recipient.As, 1);
             Assert.AreEqual(recipient.Bs, 1);
 
-            messenger.Unregister(recipient, token);
+            messenger.UnregisterAll(recipient, token);
 
             Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
             Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));

From 409415334e92cf4b9e381c1d99f6c938cab642fe Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Jul 2020 13:06:13 +0200
Subject: [PATCH 299/595] Fixed a bug in MessengerExtensions.RegisterAll

---
 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs | 2 +-
 UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 2b1ba6ec6ab..5a1e5855f6e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -61,7 +61,7 @@ public static void RegisterAll<TToken>(this IMessenger messenger, object recipie
                 if (!subscriptionType.IsGenericType ||
                     subscriptionType.GetGenericTypeDefinition() != typeof(IRecipient<>))
                 {
-                    return;
+                    continue;
                 }
 
                 Type
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 7e257abba26..33d6e8cd19b 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -302,7 +302,7 @@ public sealed class RecipientWithNoMessages
         }
 
         public sealed class RecipientWithSomeMessages
-             : IRecipient<MessageA>, IRecipient<MessageB>
+             : IRecipient<MessageA>, ICloneable, IRecipient<MessageB>
         {
             public int As { get; private set; }
 
@@ -317,6 +317,11 @@ public void Receive(MessageB message)
             {
                 Bs++;
             }
+
+            // We also add the ICloneable interface to test that the message
+            // interfaces are all handled correctly even when inteleaved
+            // by other unrelated interfaces in the type declaration.
+            public object Clone() => throw new NotImplementedException();
         }
 
         public sealed class MessageA

From a1ee70ef04f50ec7bdd1194f97f27985d72880c5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Jul 2020 13:25:39 +0200
Subject: [PATCH 300/595] Minor code style tweaks

---
 .../DictionarySlim{TKey,TValue}.cs                            | 4 ++--
 .../Messaging/Microsoft.Collections.Extensions/HashHelpers.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index ad49ee0c2a6..ab4706de5f7 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -106,8 +106,8 @@ public TValue this[TKey key]
                 Entry[] entries = this.entries;
 
                 for (int i = this.buckets[key.GetHashCode() & (this.buckets.Length - 1)] - 1;
-                    (uint)i < (uint)entries.Length;
-                    i = entries[i].Next)
+                     (uint)i < (uint)entries.Length;
+                     i = entries[i].Next)
                 {
                     if (key.Equals(entries[i].Key))
                     {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
index 14fb3abe766..48e66dad01b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
@@ -10,8 +10,8 @@ namespace Microsoft.Collections.Extensions
     internal static class HashHelpers
     {
         /// <summary>
-        /// Gets an array of type <see cref="int"/> of size 1.
+        /// An array of type <see cref="int"/> of size 1.
         /// </summary>
-        internal static readonly int[] SizeOneIntArray = new int[1];
+        public static readonly int[] SizeOneIntArray = new int[1];
     }
 }
\ No newline at end of file

From 053814eeb607e09e6457d14ae20a54425815d87c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Jul 2020 14:06:48 +0200
Subject: [PATCH 301/595] Added ObservableObject.Set IEqualityComparer<T>
 overloads

---
 .../ComponentModel/ObservableObject.cs        | 59 ++++++++++++++++++-
 .../ComponentModel/ObservableRecipient.cs     | 46 +++++++++++++--
 2 files changed, 98 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index bd59a9b23b1..608039b39c4 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -66,7 +66,24 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
         /// </remarks>
         protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null!)
         {
-            if (EqualityComparer<T>.Default.Equals(field, newValue))
+            return Set(ref field, newValue, EqualityComparer<T>.Default, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
+        /// value, then raises the <see cref="PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="Set{T}(ref T,T,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
+        {
+            if (comparer.Equals(field, newValue))
             {
                 return false;
             }
@@ -100,7 +117,25 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// </remarks>
         protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string propertyName = null!)
         {
-            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            return Set(oldValue, newValue, EqualityComparer<T>.Default, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
+        /// value, then raises the <see cref="PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="Set{T}(T,T,Action{T},string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        {
+            if (comparer.Equals(oldValue, newValue))
             {
                 return false;
             }
@@ -167,6 +202,24 @@ protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberN
         /// Additionally, this method can only be used if the wrapped item is a reference type.
         /// </remarks>
         protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
+        {
+            return Set(propertyExpression, newValue, EqualityComparer<T>.Default, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>,
+        /// with the difference being that this method is used to relay properties from a wrapped model in the
+        /// current instance. See additional notes about this overload in <see cref="Set{T}(Expression{Func{T}},T,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of property to set.</typeparam>
+        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
         {
             PropertyInfo? parentPropertyInfo;
             FieldInfo? parentFieldInfo = null;
@@ -191,7 +244,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
                 : parentPropertyInfo.GetValue(instance);
             T oldValue = (T)targetPropertyInfo.GetValue(parent);
 
-            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            if (comparer.Equals(oldValue, newValue))
             {
                 return false;
             }
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index b123a74c6d3..2da947247fb 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -8,6 +8,7 @@
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
@@ -138,15 +139,33 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
         protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            return Set(ref field, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="Set{T}(ref T,T,bool,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
             if (!broadcast)
             {
-                return Set(ref field, newValue, propertyName);
+                return Set(ref field, newValue, comparer, propertyName);
             }
 
             T oldValue = field;
 
-            if (Set(ref field, newValue, propertyName))
+            if (Set(ref field, newValue, comparer, propertyName))
             {
                 Broadcast(oldValue, newValue, propertyName);
 
@@ -177,13 +196,32 @@ protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
         protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        {
+            return Set(oldValue, newValue, EqualityComparer<T>.Default, callback, broadcast, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="Set{T}(T,T,Action{T},bool,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
             if (!broadcast)
             {
-                return Set(oldValue, newValue, callback, propertyName);
+                return Set(oldValue, newValue, comparer, callback, propertyName);
             }
 
-            if (Set(oldValue, newValue, callback, propertyName))
+            if (Set(oldValue, newValue, comparer, callback, propertyName))
             {
                 Broadcast(oldValue, newValue, propertyName);
 

From 2b4e66643614bfdb80fc3eea448b80b50a25e3eb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 18 Jul 2020 23:01:54 +0200
Subject: [PATCH 302/595] Major performance/memory boost in RegisterAll

~7x performance boost, ~2.6x memory reduction
---
 .../Messaging/MessengerExtensions.cs          | 85 ++++++++++++++++---
 1 file changed, 71 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 5a1e5855f6e..ae63ad23ac9 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -4,7 +4,9 @@
 
 using System;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -13,6 +15,45 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// </summary>
     public static partial class MessengerExtensions
     {
+        /// <summary>
+        /// The <see cref="MethodInfo"/> instance assocuated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
+        /// </summary>
+        private static readonly MethodInfo RegisterIRecipientMethodInfo;
+
+        /// <summary>
+        /// A class that acts as a static container to associate a <see cref="ConditionalWeakTable{TKey,TValue}"/> instance to each
+        /// <typeparamref name="TToken"/> type in use. This is done because we can only use a single type as key, but we need to track
+        /// associations of each recipient type also across different communication channels, each identified by a token.
+        /// Since the token is actually a compile-time parameter, we can use a wrapping class to let the runtime handle a different
+        /// instance for each generic type instantiation. This lets us only worry about the recipient type being inspected.
+        /// </summary>
+        /// <typeparam name="TToken">The token indicating what channel to use.</typeparam>
+        private static class DiscoveredRecipients<TToken>
+            where TToken : IEquatable<TToken>
+        {
+            /// <summary>
+            /// The <see cref="ConditionalWeakTable{TKey,TValue}"/> instance used to track the preloaded registration method for each recipient.
+            /// </summary>
+            public static readonly ConditionalWeakTable<Type, MethodInfo[]> RegistrationMethods = new ConditionalWeakTable<Type, MethodInfo[]>();
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="MessengerExtensions"/> class.
+        /// </summary>
+        static MessengerExtensions()
+        {
+            RegisterIRecipientMethodInfo = (
+                from methodInfo in typeof(MessengerExtensions).GetMethods()
+                where methodInfo.Name == nameof(Register) &&
+                      methodInfo.IsGenericMethod &&
+                      methodInfo.GetGenericArguments().Length == 2
+                let parameters = methodInfo.GetParameters()
+                where parameters.Length == 3 &&
+                      parameters[1].ParameterType.IsGenericType &&
+                      parameters[1].ParameterType.GetGenericTypeDefinition() == typeof(IRecipient<>)
+                select methodInfo).First();
+        }
+
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
         /// </summary>
@@ -56,25 +97,41 @@ public static void RegisterAll(this IMessenger messenger, object recipient)
         public static void RegisterAll<TToken>(this IMessenger messenger, object recipient, TToken token)
             where TToken : IEquatable<TToken>
         {
-            foreach (Type subscriptionType in recipient.GetType().GetInterfaces())
+            // We use this method as a callback for the conditional weak table, which will both
+            // handle thread-safety for us, as well as avoiding all the LINQ codegen bloat here.
+            // This method is only invoked once per recipient type and token type, so we're not
+            // worried about making it super efficient, and we can use the LINQ code for clarity.
+            static MethodInfo[] LoadRegistrationMethodsForType(Type type)
             {
-                if (!subscriptionType.IsGenericType ||
-                    subscriptionType.GetGenericTypeDefinition() != typeof(IRecipient<>))
-                {
-                    continue;
-                }
+                return (
+                    from interfaceType in type.GetInterfaces()
+                    where interfaceType.IsGenericType &&
+                          interfaceType.GetGenericTypeDefinition() == typeof(IRecipient<>)
+                    let messageType = interfaceType.GenericTypeArguments[0]
+                    let registrationMethod = RegisterIRecipientMethodInfo.MakeGenericMethod(messageType, typeof(TToken))
+                    select registrationMethod).ToArray();
+            }
 
-                Type
-                    messageType = subscriptionType.GenericTypeArguments[0],
-                    handlerType = typeof(Action<>).MakeGenericType(messageType);
+            // Get or compute the registration methods for the current recipient type.
+            // As in Microsoft.Toolkit.Extensions.TypeExtensions.ToTypeString, we use a lambda
+            // expression instead of a method group expression to leverage the statically initialized
+            // delegate and avoid repeated allocations for each invocation of this method.
+            // For more info on this, see the related issue at https://github.com/dotnet/roslyn/issues/5835.
+            MethodInfo[] registrationMethods = DiscoveredRecipients<TToken>.RegistrationMethods.GetValue(recipient.GetType(), t => LoadRegistrationMethodsForType(t));
 
-                MethodInfo
-                    receiveMethod = recipient.GetType().GetMethod(nameof(IRecipient<object>.Receive), new[] { messageType }),
-                    registerMethod = messenger.GetType().GetMethod(nameof(IMessenger.Register)).MakeGenericMethod(messageType, typeof(TToken));
+            if (registrationMethods.Length == 0)
+            {
+                return;
+            }
 
-                Delegate handler = receiveMethod.CreateDelegate(handlerType, recipient);
+            // Unfortunatly we can't rent a buffer from the pool, as the reflection
+            // types don't accept Span<T> sequences. We can at least reuse the same
+            // array for all iterations, to save some memory allocations.
+            object[] parameters = { messenger, recipient, token };
 
-                registerMethod.Invoke(messenger, new[] { recipient, token, handler });
+            foreach (MethodInfo registrationMethod in registrationMethods)
+            {
+                registrationMethod.Invoke(messenger, parameters);
             }
         }
 

From 21e971f28c0514411ca3d2d1350a69fd28992eb1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 19 Jul 2020 00:26:51 +0200
Subject: [PATCH 303/595] Another perf boost (with compiled LINQ expressions)

---
 .../Messaging/MessengerExtensions.cs          | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index ae63ad23ac9..427194be456 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
@@ -32,9 +33,10 @@ private static class DiscoveredRecipients<TToken>
             where TToken : IEquatable<TToken>
         {
             /// <summary>
-            /// The <see cref="ConditionalWeakTable{TKey,TValue}"/> instance used to track the preloaded registration method for each recipient.
+            /// The <see cref="ConditionalWeakTable{TKey,TValue}"/> instance used to track the preloaded registration actions for each recipient.
             /// </summary>
-            public static readonly ConditionalWeakTable<Type, MethodInfo[]> RegistrationMethods = new ConditionalWeakTable<Type, MethodInfo[]>();
+            public static readonly ConditionalWeakTable<Type, Action<IMessenger, object, TToken>[]> RegistrationMethods
+                = new ConditionalWeakTable<Type, Action<IMessenger, object, TToken>[]>();
         }
 
         /// <summary>
@@ -101,7 +103,7 @@ public static void RegisterAll<TToken>(this IMessenger messenger, object recipie
             // handle thread-safety for us, as well as avoiding all the LINQ codegen bloat here.
             // This method is only invoked once per recipient type and token type, so we're not
             // worried about making it super efficient, and we can use the LINQ code for clarity.
-            static MethodInfo[] LoadRegistrationMethodsForType(Type type)
+            static Action<IMessenger, object, TToken>[] LoadRegistrationMethodsForType(Type type)
             {
                 return (
                     from interfaceType in type.GetInterfaces()
@@ -109,7 +111,30 @@ where interfaceType.IsGenericType &&
                           interfaceType.GetGenericTypeDefinition() == typeof(IRecipient<>)
                     let messageType = interfaceType.GenericTypeArguments[0]
                     let registrationMethod = RegisterIRecipientMethodInfo.MakeGenericMethod(messageType, typeof(TToken))
-                    select registrationMethod).ToArray();
+                    let registrationAction = GetRegisterationAction(type, registrationMethod)
+                    select registrationAction).ToArray();
+            }
+
+            // Helper method to build and compile an expression tree to a message handler to use for the registration
+            // This is used to reduce the overhead of repeated calls to MethodInfo.Invoke (which is over 10 times slower).
+            static Action<IMessenger, object, TToken> GetRegisterationAction(Type type, MethodInfo methodInfo)
+            {
+                // Input parameters (IMessenger instance, non-generic recipient, token)
+                ParameterExpression
+                    arg0 = Expression.Parameter(typeof(IMessenger)),
+                    arg1 = Expression.Parameter(typeof(object)),
+                    arg2 = Expression.Parameter(typeof(TToken));
+
+                // Cast the recipient and invoke the registration method
+                MethodCallExpression body = Expression.Call(null, methodInfo, new Expression[]
+                {
+                    arg0,
+                    Expression.Convert(arg1, type),
+                    arg2
+                });
+
+                // Create the expression tree and compile to a target delegate
+                return Expression.Lambda<Action<IMessenger, object, TToken>>(body, arg0, arg1, arg2).Compile();
             }
 
             // Get or compute the registration methods for the current recipient type.
@@ -117,21 +142,13 @@ where interfaceType.IsGenericType &&
             // expression instead of a method group expression to leverage the statically initialized
             // delegate and avoid repeated allocations for each invocation of this method.
             // For more info on this, see the related issue at https://github.com/dotnet/roslyn/issues/5835.
-            MethodInfo[] registrationMethods = DiscoveredRecipients<TToken>.RegistrationMethods.GetValue(recipient.GetType(), t => LoadRegistrationMethodsForType(t));
-
-            if (registrationMethods.Length == 0)
-            {
-                return;
-            }
-
-            // Unfortunatly we can't rent a buffer from the pool, as the reflection
-            // types don't accept Span<T> sequences. We can at least reuse the same
-            // array for all iterations, to save some memory allocations.
-            object[] parameters = { messenger, recipient, token };
+            Action<IMessenger, object, TToken>[] registrationActions = DiscoveredRecipients<TToken>.RegistrationMethods.GetValue(
+                recipient.GetType(),
+                t => LoadRegistrationMethodsForType(t));
 
-            foreach (MethodInfo registrationMethod in registrationMethods)
+            foreach (Action<IMessenger, object, TToken> registrationAction in registrationActions)
             {
-                registrationMethod.Invoke(messenger, parameters);
+                registrationAction(messenger, recipient, token);
             }
         }
 

From 05b3bc8f84726232737fa3100bc88c2b8610b98e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 20 Jul 2020 13:36:23 +0200
Subject: [PATCH 304/595] Tweaked nullability attributes

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 2190d8795dd..8158cb61fd0 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -360,7 +360,7 @@ private struct MapEntry
                 /// <summary>
                 /// The <see cref="string"/> instance cached in this entry.
                 /// </summary>
-                public string Value;
+                public string? Value;
 
                 /// <summary>
                 /// The 0-based index for the next node in the current list.
@@ -532,11 +532,11 @@ public void Reset()
                     entry = ref Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)i);
 
                     if (entry.HashCode == hashcode &&
-                        entry.Value.AsSpan().SequenceEqual(span))
+                        entry.Value!.AsSpan().SequenceEqual(span))
                     {
                         UpdateTimestamp(ref entry.HeapIndex);
 
-                        return ref entry.Value!;
+                        return ref entry.Value;
                     }
                 }
 

From f31c2c7d87cb2acf68ab8a67019174c75e5c63ac Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 21 Jul 2020 13:25:28 +0200
Subject: [PATCH 305/595] Minor code style tweaks

---
 .../Buffers/MemoryBufferWriter{T}.cs                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
index b67b578e4ed..9a7d513fe33 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
@@ -106,7 +106,7 @@ public void Advance(int count)
         /// <inheritdoc/>
         public Memory<T> GetMemory(int sizeHint = 0)
         {
-            this.ValidateSizeHint(sizeHint);
+            ValidateSizeHint(sizeHint);
 
             return this.memory.Slice(this.index);
         }
@@ -114,7 +114,7 @@ public Memory<T> GetMemory(int sizeHint = 0)
         /// <inheritdoc/>
         public Span<T> GetSpan(int sizeHint = 0)
         {
-            this.ValidateSizeHint(sizeHint);
+            ValidateSizeHint(sizeHint);
 
             return this.memory.Slice(this.index).Span;
         }

From ae961dd760e715cb7f9991c6b395c990d4f69384 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 21 Jul 2020 13:27:20 +0200
Subject: [PATCH 306/595] Minor codegen improvements

---
 .../Extensions/IBufferWriterExtensions.cs                       | 1 -
 .../Extensions/ReadOnlySpanExtensions.cs                        | 2 +-
 Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs  | 1 -
 .../Extensions/StreamExtensions.cs                              | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs
index 09a8601e484..67c30579beb 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs
@@ -102,7 +102,6 @@ public static void Write<T>(this IBufferWriter<T> writer, ReadOnlySpan<T> span)
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when trying to write too many bytes to the target writer.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForEndOfBuffer()
         {
             throw new ArgumentException("The current buffer writer can't contain the requested input data.");
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index 4d3f2ad9c93..855da24a561 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -164,7 +164,7 @@ public static unsafe int IndexOf<T>(this ReadOnlySpan<T> span, in T value)
         /// <param name="value">The <typeparamref name="T"/> value to look for.</param>
         /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="span"/>.</returns>
         [Pure]
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int Count<T>(this ReadOnlySpan<T> span, T value)
             where T : IEquatable<T>
         {
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
index bb2550257ba..8ce1cca75a0 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
@@ -223,7 +223,6 @@ public static int GetDjb2HashCode<T>(this Span<T> span)
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the given reference is out of range.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         internal static void ThrowArgumentOutOfRangeExceptionForInvalidReference()
         {
             throw new ArgumentOutOfRangeException("value", "The input reference does not belong to an element of the input span");
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs
index 25de163cc51..331786d086d 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs
@@ -245,7 +245,6 @@ public static void Write<T>(this Stream stream, in T value)
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when <see cref="Read{T}"/> fails.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidOperationExceptionForEndOfStream()
         {
             throw new InvalidOperationException("The stream didn't contain enough data to read the requested item");

From 443947d452aa0dd250d555de6fbe2d13c5ba44a6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 21 Jul 2020 20:12:41 +0200
Subject: [PATCH 307/595] Improved XML summary for ThrowHelper class

---
 .../Diagnostics/Generated/ThrowHelper.Collection.g.cs           | 2 +-
 .../Diagnostics/Generated/ThrowHelper.Collection.tt             | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs                 | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs             | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs              | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs    | 2 +-
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs                    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
index 8c9026be221..1994b5fcc8c 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
@@ -16,7 +16,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
index c52adafacda..731065134fc 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
@@ -13,7 +13,7 @@ using Microsoft.Toolkit.Extensions;
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
index 64553be2387..9ef29cbd440 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
index aa45dc82702..030ede72c30 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
index fef5019e6e6..f249e812dc4 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
index b8cfebe6b6e..442ea37c063 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
index 8de060c0b1e..bfcbed6f835 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
index 2689a32cec2..09f8db9c14b 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index d51c4362b19..103c3ef12ad 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -14,7 +14,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index d27fc8aba7b..0ba836dc488 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Toolkit.Diagnostics
 {
     /// <summary>
-    /// Helper methods to throw exceptions
+    /// Helper methods to efficiently throw exceptions.
     /// </summary>
     public static partial class ThrowHelper
     {

From f70ae0cdb29055d0cf1637f9c43163af9900524d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 21 Jul 2020 22:59:56 +0200
Subject: [PATCH 308/595] Added [StackTraceHidden] attribute

---
 .../Attributes/StackTraceHiddenAttribute.cs   | 16 ++++
 .../Generated/ThrowHelper.Collection.g.cs     | 89 +++++++++++++++++++
 .../Generated/ThrowHelper.Collection.tt       | 12 +++
 .../ThrowHelper.Collection.Generic.cs         |  4 +
 .../ThrowHelper.Comparable.Generic.cs         | 15 ++++
 .../ThrowHelper.Comparable.Numeric.cs         |  9 ++
 .../Diagnostics/ThrowHelper.IO.cs             |  5 ++
 .../Diagnostics/ThrowHelper.String.cs         | 19 ++++
 .../Diagnostics/ThrowHelper.Tasks.cs          | 11 +++
 .../ThrowHelper.ThrowExceptions.cs            | 58 ++++++++++++
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs  | 19 ++++
 11 files changed, 257 insertions(+)
 create mode 100644 Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs

diff --git a/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs b/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs
new file mode 100644
index 00000000000..c176fb09741
--- /dev/null
+++ b/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs
@@ -0,0 +1,16 @@
+// 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 System.Diagnostics
+{
+    /// <summary>
+    /// Attribute to add to non-returning throw only methods, 
+    /// to restore the stack trace back to what it would be if the throw was in-place
+    /// </summary>
+    /// <remarks>Internal copy of the CoreCLR attribute.</remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Struct, Inherited = false)]
+    internal sealed class StackTraceHiddenAttribute : Attribute
+    {
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
index 1994b5fcc8c..34d0ea8ed3f 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
@@ -6,6 +6,7 @@
 // =====================
 
 using System;
+using System.Diagnostics;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -25,6 +26,7 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
@@ -35,6 +37,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -45,6 +48,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -55,6 +59,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
@@ -65,6 +70,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
@@ -75,6 +81,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Spa
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
@@ -85,6 +92,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -95,6 +103,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -105,6 +114,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -115,6 +125,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -125,6 +136,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -135,6 +147,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
@@ -145,6 +158,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -155,6 +169,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -165,6 +180,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
@@ -175,6 +191,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
@@ -185,6 +202,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Rea
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
@@ -195,6 +213,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -205,6 +224,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -215,6 +235,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -225,6 +246,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -235,6 +257,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -245,6 +268,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
@@ -255,6 +279,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -265,6 +290,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -275,6 +301,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> mem
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
@@ -285,6 +312,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> me
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
@@ -295,6 +323,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Mem
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
@@ -305,6 +334,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -315,6 +345,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -325,6 +356,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -335,6 +367,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -345,6 +378,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -355,6 +389,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
@@ -365,6 +400,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -375,6 +411,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -385,6 +422,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
@@ -395,6 +433,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemo
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
@@ -405,6 +444,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Rea
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
@@ -415,6 +455,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -425,6 +466,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -435,6 +477,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -445,6 +488,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -455,6 +499,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -465,6 +510,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must be empty, had a size of {array.Length.ToAssertString()}");
@@ -475,6 +521,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -485,6 +532,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size not equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -495,6 +543,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size over {size}, had a size of {array.Length.ToAssertString()}");
@@ -505,6 +554,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size of at least {size}, had a size of {array.Length.ToAssertString()}");
@@ -515,6 +565,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[]
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than {size}, had a size of {array.Length.ToAssertString()}");
@@ -525,6 +576,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -535,6 +587,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] ar
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -545,6 +598,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[]
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -555,6 +609,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] so
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {array.Length.ToAssertString()} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
@@ -565,6 +620,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {array.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
@@ -575,6 +631,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must be empty, had a size of {list.Count.ToAssertString()}");
@@ -585,6 +642,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -595,6 +653,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -605,6 +664,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size over {size}, had a size of {list.Count.ToAssertString()}");
@@ -615,6 +675,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size of at least {size}, had a size of {list.Count.ToAssertString()}");
@@ -625,6 +686,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Lis
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than {size}, had a size of {list.Count.ToAssertString()}");
@@ -635,6 +697,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -645,6 +708,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -655,6 +719,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -665,6 +730,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {list.Count.ToAssertString()} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -675,6 +741,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {list.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -685,6 +752,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
@@ -695,6 +763,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collecti
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -705,6 +774,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> c
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -715,6 +785,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
@@ -725,6 +796,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
@@ -735,6 +807,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICo
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
@@ -745,6 +818,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -755,6 +829,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IColle
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -765,6 +840,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -775,6 +851,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IColle
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -785,6 +862,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -795,6 +873,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
@@ -805,6 +884,7 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -815,6 +895,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -825,6 +906,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyColl
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
@@ -835,6 +917,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCol
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
@@ -845,6 +928,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IRe
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
@@ -855,6 +939,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollec
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -865,6 +950,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -875,6 +961,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -885,6 +972,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -895,6 +983,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
index 731065134fc..99c138d35be 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 <#@include file="TypeInfo.ttinclude" #>
 using System;
+using System.Diagnostics;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -26,6 +27,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must be empty, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -36,6 +38,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -46,6 +49,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size not equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -56,6 +60,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size over {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -66,6 +71,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size of at least {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -76,6 +82,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -86,6 +93,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -96,6 +104,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
@@ -106,6 +115,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
@@ -116,6 +126,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
@@ -126,6 +137,7 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
index 9ef29cbd440..5e0df16cc5f 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -23,6 +24,7 @@ public static partial class ThrowHelper
         /// <remarks>This method is needed because <see cref="Span{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must not be empty");
@@ -35,6 +37,7 @@ internal static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         /// <remarks>This method is needed because <see cref="ReadOnlySpan{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must not be empty");
@@ -46,6 +49,7 @@ internal static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(stri
         /// <typeparam name="T">The item of items in the input collection.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmpty<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be empty");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
index 030ede72c30..23d86f9319b 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -22,6 +23,7 @@ public static partial class ThrowHelper
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
             where T : struct
         {
@@ -34,6 +36,7 @@ internal static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
             where T : struct
         {
@@ -46,6 +49,7 @@ internal static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
@@ -57,6 +61,7 @@ internal static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, st
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
@@ -68,6 +73,7 @@ internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -79,6 +85,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than or equal to {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -90,6 +97,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than {minimum.ToAssertString()}, was {value.ToAssertString()}");
@@ -101,6 +109,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than or equal to {minimum.ToAssertString()}, was {value.ToAssertString()}");
@@ -112,6 +121,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -123,6 +133,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -134,6 +145,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -145,6 +157,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -156,6 +169,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -167,6 +181,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
index f249e812dc4..d3286382b1e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -21,6 +22,7 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
@@ -31,6 +33,7 @@ internal static void ThrowArgumentExceptionForIsCloseTo(int value, int target, u
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
@@ -41,6 +44,7 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
@@ -51,6 +55,7 @@ internal static void ThrowArgumentExceptionForIsCloseTo(long value, long target,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
@@ -61,6 +66,7 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(long value, long targ
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -71,6 +77,7 @@ internal static void ThrowArgumentExceptionForIsCloseTo(float value, float targe
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -81,6 +88,7 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(float value, float ta
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -91,6 +99,7 @@ internal static void ThrowArgumentExceptionForIsCloseTo(double value, double tar
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
index 442ea37c063..8e0655ed217 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -22,6 +23,7 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support reading");
@@ -32,6 +34,7 @@ internal static void ThrowArgumentExceptionForCanRead(Stream stream, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support writing");
@@ -42,6 +45,7 @@ internal static void ThrowArgumentExceptionForCanWrite(Stream stream, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support seeking");
@@ -52,6 +56,7 @@ internal static void ThrowArgumentExceptionForCanSeek(Stream stream, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAtStartPosition(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) must be at position {0.ToAssertString()}, was at {stream.Position.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
index bfcbed6f835..24d48bfeb36 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
@@ -20,6 +21,7 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or empty, was {text.ToAssertString()}");
@@ -30,6 +32,7 @@ internal static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or empty, was {(text is null ? "null" : "empty")}");
@@ -40,6 +43,7 @@ internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, str
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or whitespace, was {text.ToAssertString()}");
@@ -50,6 +54,7 @@ internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or whitespace, was {(text is null ? "null" : "whitespace")}");
@@ -60,6 +65,7 @@ internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be empty, was {text.ToAssertString()}");
@@ -70,6 +76,7 @@ internal static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be empty");
@@ -80,6 +87,7 @@ internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be whitespace, was {text.ToAssertString()}");
@@ -90,6 +98,7 @@ internal static void ThrowArgumentExceptionForIsWhitespace(string text, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be whitespace, was {text.ToAssertString()}");
@@ -100,6 +109,7 @@ internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -110,6 +120,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int si
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not have a size equal to {size}, was {text.ToAssertString()}");
@@ -120,6 +131,7 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size over {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -130,6 +142,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size of at least {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -140,6 +153,7 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -150,6 +164,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan(string text, int s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than or equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -160,6 +175,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string te
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -170,6 +186,7 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo(string source, stri
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -180,6 +197,7 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string so
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {text.Length.ToAssertString()} to be a valid index for the target string, was {index.ToAssertString()}");
@@ -190,6 +208,7 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {text.Length.ToAssertString()} to be an invalid index for the target string, was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
index 09f8db9c14b..69ee19403db 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -22,6 +23,7 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed, had status {task.Status.ToAssertString()}");
@@ -32,6 +34,7 @@ internal static void ThrowArgumentExceptionForIsCompleted(Task task, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed, had status {task.Status.ToAssertString()}");
@@ -42,6 +45,7 @@ internal static void ThrowArgumentExceptionForIsNotCompleted(Task task, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed successfully, had status {task.Status.ToAssertString()}");
@@ -52,6 +56,7 @@ internal static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed successfully, had status {task.Status.ToAssertString()}");
@@ -62,6 +67,7 @@ internal static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task ta
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be faulted, had status {task.Status.ToAssertString()}");
@@ -72,6 +78,7 @@ internal static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be faulted, had status {task.Status.ToAssertString()}");
@@ -82,6 +89,7 @@ internal static void ThrowArgumentExceptionForIsNotFaulted(Task task, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be canceled, had status {task.Status.ToAssertString()}");
@@ -92,6 +100,7 @@ internal static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be canceled, had status {task.Status.ToAssertString()}");
@@ -102,6 +111,7 @@ internal static void ThrowArgumentExceptionForIsNotCanceled(Task task, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must have status {status}, had status {task.Status.ToAssertString()}");
@@ -112,6 +122,7 @@ internal static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskSt
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasStatusNotEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not have status {status.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 103c3ef12ad..2b03427f10e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -24,6 +25,7 @@ public static partial class ThrowHelper
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArrayTypeMismatchException(string message)
         {
             throw new ArrayTypeMismatchException(message);
@@ -36,6 +38,7 @@ public static void ThrowArrayTypeMismatchException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArrayTypeMismatchException(string message, Exception innerException)
         {
             throw new ArrayTypeMismatchException(message, innerException);
@@ -47,6 +50,7 @@ public static void ThrowArrayTypeMismatchException(string message, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentException(string message)
         {
             throw new ArgumentException(message);
@@ -59,6 +63,7 @@ public static void ThrowArgumentException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentException(string message, Exception innerException)
         {
             throw new ArgumentException(message, innerException);
@@ -71,6 +76,7 @@ public static void ThrowArgumentException(string message, Exception innerExcepti
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentException(string name, string message)
         {
             throw new ArgumentException(message, name);
@@ -84,6 +90,7 @@ public static void ThrowArgumentException(string name, string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentException(string name, string message, Exception innerException)
         {
             throw new ArgumentException(message, name, innerException);
@@ -95,6 +102,7 @@ public static void ThrowArgumentException(string name, string message, Exception
         /// <param name="name">The argument name.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name)
         {
             throw new ArgumentNullException(name);
@@ -107,6 +115,7 @@ public static void ThrowArgumentNullException(string name)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name, Exception innerException)
         {
             throw new ArgumentNullException(name, innerException);
@@ -119,6 +128,7 @@ public static void ThrowArgumentNullException(string name, Exception innerExcept
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name, string message)
         {
             throw new ArgumentNullException(name, message);
@@ -130,6 +140,7 @@ public static void ThrowArgumentNullException(string name, string message)
         /// <param name="name">The argument name.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name)
         {
             throw new ArgumentOutOfRangeException(name);
@@ -142,6 +153,7 @@ public static void ThrowArgumentOutOfRangeException(string name)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, Exception innerException)
         {
             throw new ArgumentOutOfRangeException(name, innerException);
@@ -154,6 +166,7 @@ public static void ThrowArgumentOutOfRangeException(string name, Exception inner
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, string message)
         {
             throw new ArgumentOutOfRangeException(name, message);
@@ -167,6 +180,7 @@ public static void ThrowArgumentOutOfRangeException(string name, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
         {
             throw new ArgumentOutOfRangeException(name, value, message);
@@ -178,6 +192,7 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowExternalException(string message)
         {
             throw new ExternalException(message);
@@ -190,6 +205,7 @@ public static void ThrowExternalException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowExternalException(string message, Exception innerException)
         {
             throw new ExternalException(message, innerException);
@@ -202,6 +218,7 @@ public static void ThrowExternalException(string message, Exception innerExcepti
         /// <param name="error">The HRESULT of the errror to include.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowExternalException(string message, int error)
         {
             throw new ExternalException(message, error);
@@ -213,6 +230,7 @@ public static void ThrowExternalException(string message, int error)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowFormatException(string message)
         {
             throw new FormatException(message);
@@ -225,6 +243,7 @@ public static void ThrowFormatException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowFormatException(string message, Exception innerException)
         {
             throw new FormatException(message, innerException);
@@ -236,6 +255,7 @@ public static void ThrowFormatException(string message, Exception innerException
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInsufficientMemoryException(string message)
         {
             throw new InsufficientMemoryException(message);
@@ -248,6 +268,7 @@ public static void ThrowInsufficientMemoryException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInsufficientMemoryException(string message, Exception innerException)
         {
             throw new InsufficientMemoryException(message, innerException);
@@ -259,6 +280,7 @@ public static void ThrowInsufficientMemoryException(string message, Exception in
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInvalidDataException(string message)
         {
             throw new InvalidDataException(message);
@@ -271,6 +293,7 @@ public static void ThrowInvalidDataException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInvalidDataException(string message, Exception innerException)
         {
             throw new InvalidDataException(message, innerException);
@@ -282,6 +305,7 @@ public static void ThrowInvalidDataException(string message, Exception innerExce
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInvalidOperationException(string message)
         {
             throw new InvalidOperationException(message);
@@ -294,6 +318,7 @@ public static void ThrowInvalidOperationException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowInvalidOperationException(string message, Exception innerException)
         {
             throw new InvalidOperationException(message, innerException);
@@ -305,6 +330,7 @@ public static void ThrowInvalidOperationException(string message, Exception inne
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowLockRecursionException(string message)
         {
             throw new LockRecursionException(message);
@@ -317,6 +343,7 @@ public static void ThrowLockRecursionException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowLockRecursionException(string message, Exception innerException)
         {
             throw new LockRecursionException(message, innerException);
@@ -328,6 +355,7 @@ public static void ThrowLockRecursionException(string message, Exception innerEx
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingFieldException(string message)
         {
             throw new MissingFieldException(message);
@@ -340,6 +368,7 @@ public static void ThrowMissingFieldException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingFieldException(string message, Exception innerException)
         {
             throw new MissingFieldException(message, innerException);
@@ -352,6 +381,7 @@ public static void ThrowMissingFieldException(string message, Exception innerExc
         /// <param name="fieldName">The target field being retrieved.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingFieldException(string className, string fieldName)
         {
             throw new MissingFieldException(className, fieldName);
@@ -363,6 +393,7 @@ public static void ThrowMissingFieldException(string className, string fieldName
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMemberException(string message)
         {
             throw new MissingMemberException(message);
@@ -375,6 +406,7 @@ public static void ThrowMissingMemberException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMemberException(string message, Exception innerException)
         {
             throw new MissingMemberException(message, innerException);
@@ -387,6 +419,7 @@ public static void ThrowMissingMemberException(string message, Exception innerEx
         /// <param name="memberName">The target member being retrieved.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMemberException(string className, string memberName)
         {
             throw new MissingMemberException(className, memberName);
@@ -398,6 +431,7 @@ public static void ThrowMissingMemberException(string className, string memberNa
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMethodException(string message)
         {
             throw new MissingMethodException(message);
@@ -410,6 +444,7 @@ public static void ThrowMissingMethodException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMethodException(string message, Exception innerException)
         {
             throw new MissingMethodException(message, innerException);
@@ -422,6 +457,7 @@ public static void ThrowMissingMethodException(string message, Exception innerEx
         /// <param name="methodName">The target method being retrieved.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowMissingMethodException(string className, string methodName)
         {
             throw new MissingMethodException(className, methodName);
@@ -433,6 +469,7 @@ public static void ThrowMissingMethodException(string className, string methodNa
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowNotSupportedException(string message)
         {
             throw new NotSupportedException(message);
@@ -445,6 +482,7 @@ public static void ThrowNotSupportedException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowNotSupportedException(string message, Exception innerException)
         {
             throw new NotSupportedException(message, innerException);
@@ -456,6 +494,7 @@ public static void ThrowNotSupportedException(string message, Exception innerExc
         /// <param name="objectName">The name of the disposed object.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName)
         {
             throw new ObjectDisposedException(objectName);
@@ -468,6 +507,7 @@ public static void ThrowObjectDisposedException(string objectName)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName, Exception innerException)
         {
             throw new ObjectDisposedException(objectName, innerException);
@@ -480,6 +520,7 @@ public static void ThrowObjectDisposedException(string objectName, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName, string message)
         {
             throw new ObjectDisposedException(objectName, message);
@@ -491,6 +532,7 @@ public static void ThrowObjectDisposedException(string objectName, string messag
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message)
         {
             throw new OperationCanceledException(message);
@@ -503,6 +545,7 @@ public static void ThrowOperationCanceledException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, Exception innerException)
         {
             throw new OperationCanceledException(message, innerException);
@@ -514,6 +557,7 @@ public static void ThrowOperationCanceledException(string message, Exception inn
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowOperationCanceledException(CancellationToken token)
         {
             throw new OperationCanceledException(token);
@@ -526,6 +570,7 @@ public static void ThrowOperationCanceledException(CancellationToken token)
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, CancellationToken token)
         {
             throw new OperationCanceledException(message, token);
@@ -539,6 +584,7 @@ public static void ThrowOperationCanceledException(string message, CancellationT
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
         {
             throw new OperationCanceledException(message, innerException, token);
@@ -550,6 +596,7 @@ public static void ThrowOperationCanceledException(string message, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowPlatformNotSupportedException(string message)
         {
             throw new PlatformNotSupportedException(message);
@@ -562,6 +609,7 @@ public static void ThrowPlatformNotSupportedException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowPlatformNotSupportedException(string message, Exception innerException)
         {
             throw new PlatformNotSupportedException(message, innerException);
@@ -573,6 +621,7 @@ public static void ThrowPlatformNotSupportedException(string message, Exception
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowSynchronizationLockException(string message)
         {
             throw new SynchronizationLockException(message);
@@ -585,6 +634,7 @@ public static void ThrowSynchronizationLockException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowSynchronizationLockException(string message, Exception innerException)
         {
             throw new SynchronizationLockException(message, innerException);
@@ -596,6 +646,7 @@ public static void ThrowSynchronizationLockException(string message, Exception i
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowTimeoutException(string message)
         {
             throw new TimeoutException(message);
@@ -608,6 +659,7 @@ public static void ThrowTimeoutException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowTimeoutException(string message, Exception innerException)
         {
             throw new TimeoutException(message, innerException);
@@ -619,6 +671,7 @@ public static void ThrowTimeoutException(string message, Exception innerExceptio
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowUnauthorizedAccessException(string message)
         {
             throw new UnauthorizedAccessException(message);
@@ -631,6 +684,7 @@ public static void ThrowUnauthorizedAccessException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowUnauthorizedAccessException(string message, Exception innerException)
         {
             throw new UnauthorizedAccessException(message, innerException);
@@ -642,6 +696,7 @@ public static void ThrowUnauthorizedAccessException(string message, Exception in
         /// <param name="error">The Win32 error code associated with this exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowWin32Exception(int error)
         {
             throw new Win32Exception(error);
@@ -654,6 +709,7 @@ public static void ThrowWin32Exception(int error)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowWin32Exception(int error, string message)
         {
             throw new Win32Exception(error, message);
@@ -665,6 +721,7 @@ public static void ThrowWin32Exception(int error, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowWin32Exception(string message)
         {
             throw new Win32Exception(message);
@@ -677,6 +734,7 @@ public static void ThrowWin32Exception(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
+        [StackTraceHidden]
         public static void ThrowWin32Exception(string message, Exception innerException)
         {
             throw new Win32Exception(message, innerException);
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index 0ba836dc488..0907a10335e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
@@ -39,6 +40,7 @@ private static string ToAssertString(this object? obj)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
             where T : class
         {
@@ -51,6 +53,7 @@ internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
             where T : struct
         {
@@ -63,6 +66,7 @@ internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         {
             ThrowArgumentNullException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be not null)");
@@ -74,6 +78,7 @@ internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -85,6 +90,7 @@ internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string n
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -95,6 +101,7 @@ internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -105,6 +112,7 @@ internal static void ThrowArgumentExceptionForIsOfType(object value, Type type,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -116,6 +124,7 @@ internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type typ
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -127,6 +136,7 @@ internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -137,6 +147,7 @@ internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object va
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -147,6 +158,7 @@ internal static void ThrowArgumentExceptionForIsAssignableToType(object value, T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -158,6 +170,7 @@ internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value
         /// <typeparam name="T">The type of input values being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
             where T : unmanaged
         {
@@ -170,6 +183,7 @@ internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T targ
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
             where T : class
         {
@@ -182,6 +196,7 @@ internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
             where T : class
         {
@@ -193,6 +208,7 @@ internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsTrue(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false");
@@ -203,6 +219,7 @@ internal static void ThrowArgumentExceptionForIsTrue(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsTrue(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false: {message.ToAssertString()}");
@@ -213,6 +230,7 @@ internal static void ThrowArgumentExceptionForIsTrue(string name, string message
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFalse(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true");
@@ -223,6 +241,7 @@ internal static void ThrowArgumentExceptionForIsFalse(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
+        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFalse(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true: {message.ToAssertString()}");

From ae8ea9022ad9e02eb562999c28dc00a2abc871e9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 21 Jul 2020 23:06:30 +0200
Subject: [PATCH 309/595] Revert "Added [StackTraceHidden] attribute"

This reverts commit f70ae0cdb29055d0cf1637f9c43163af9900524d.
Unfortunately the attribute is actually matched by type and not just by name like the others. We should reintroduce this once either https://github.com/dotnet/runtime/issues/29681 is done, or when the runtime switches to a name matching for the internal attribute, so we can just use a local copy here.
---
 .../Attributes/StackTraceHiddenAttribute.cs   | 16 ----
 .../Generated/ThrowHelper.Collection.g.cs     | 89 -------------------
 .../Generated/ThrowHelper.Collection.tt       | 12 ---
 .../ThrowHelper.Collection.Generic.cs         |  4 -
 .../ThrowHelper.Comparable.Generic.cs         | 15 ----
 .../ThrowHelper.Comparable.Numeric.cs         |  9 --
 .../Diagnostics/ThrowHelper.IO.cs             |  5 --
 .../Diagnostics/ThrowHelper.String.cs         | 19 ----
 .../Diagnostics/ThrowHelper.Tasks.cs          | 11 ---
 .../ThrowHelper.ThrowExceptions.cs            | 58 ------------
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs  | 19 ----
 11 files changed, 257 deletions(-)
 delete mode 100644 Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs

diff --git a/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs b/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs
deleted file mode 100644
index c176fb09741..00000000000
--- a/Microsoft.Toolkit/Attributes/StackTraceHiddenAttribute.cs
+++ /dev/null
@@ -1,16 +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 System.Diagnostics
-{
-    /// <summary>
-    /// Attribute to add to non-returning throw only methods, 
-    /// to restore the stack trace back to what it would be if the throw was in-place
-    /// </summary>
-    /// <remarks>Internal copy of the CoreCLR attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Struct, Inherited = false)]
-    internal sealed class StackTraceHiddenAttribute : Attribute
-    {
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
index 34d0ea8ed3f..1994b5fcc8c 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.g.cs
@@ -6,7 +6,6 @@
 // =====================
 
 using System;
-using System.Diagnostics;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -26,7 +25,6 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
@@ -37,7 +35,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -48,7 +45,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -59,7 +55,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
@@ -70,7 +65,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
@@ -81,7 +75,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Spa
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
@@ -92,7 +85,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -103,7 +95,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -114,7 +105,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -125,7 +115,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -136,7 +125,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -147,7 +135,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must be empty, had a size of {span.Length.ToAssertString()}");
@@ -158,7 +145,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -169,7 +155,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -180,7 +165,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size over {size}, had a size of {span.Length.ToAssertString()}");
@@ -191,7 +175,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size of at least {size}, had a size of {span.Length.ToAssertString()}");
@@ -202,7 +185,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Rea
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than {size}, had a size of {span.Length.ToAssertString()}");
@@ -213,7 +195,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {span.Length.ToAssertString()}");
@@ -224,7 +205,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -235,7 +215,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -246,7 +225,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {span.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -257,7 +235,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {span.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -268,7 +245,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
@@ -279,7 +255,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -290,7 +265,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -301,7 +275,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> mem
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
@@ -312,7 +285,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> me
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
@@ -323,7 +295,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Mem
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
@@ -334,7 +305,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -345,7 +315,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -356,7 +325,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -367,7 +335,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -378,7 +345,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -389,7 +355,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must be empty, had a size of {memory.Length.ToAssertString()}");
@@ -400,7 +365,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -411,7 +375,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -422,7 +385,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemor
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size over {size}, had a size of {memory.Length.ToAssertString()}");
@@ -433,7 +395,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemo
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {memory.Length.ToAssertString()}");
@@ -444,7 +405,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Rea
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than {size}, had a size of {memory.Length.ToAssertString()}");
@@ -455,7 +415,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {memory.Length.ToAssertString()}");
@@ -466,7 +425,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -477,7 +435,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -488,7 +445,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOn
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {memory.Length.ToAssertString()} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -499,7 +455,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {memory.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -510,7 +465,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must be empty, had a size of {array.Length.ToAssertString()}");
@@ -521,7 +475,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -532,7 +485,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size not equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -543,7 +495,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size over {size}, had a size of {array.Length.ToAssertString()}");
@@ -554,7 +505,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size of at least {size}, had a size of {array.Length.ToAssertString()}");
@@ -565,7 +515,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[]
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than {size}, had a size of {array.Length.ToAssertString()}");
@@ -576,7 +525,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {size}, had a size of {array.Length.ToAssertString()}");
@@ -587,7 +535,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] ar
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -598,7 +545,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[]
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -609,7 +555,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] so
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {array.Length.ToAssertString()} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
@@ -620,7 +565,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {array.Length.ToAssertString()} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {index.ToAssertString()}");
@@ -631,7 +575,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must be empty, had a size of {list.Count.ToAssertString()}");
@@ -642,7 +585,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -653,7 +595,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -664,7 +605,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size over {size}, had a size of {list.Count.ToAssertString()}");
@@ -675,7 +615,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size of at least {size}, had a size of {list.Count.ToAssertString()}");
@@ -686,7 +625,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Lis
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than {size}, had a size of {list.Count.ToAssertString()}");
@@ -697,7 +635,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {list.Count.ToAssertString()}");
@@ -708,7 +645,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -719,7 +655,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -730,7 +665,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {list.Count.ToAssertString()} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -741,7 +675,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {list.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -752,7 +685,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
@@ -763,7 +695,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collecti
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -774,7 +705,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> c
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -785,7 +715,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
@@ -796,7 +725,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
@@ -807,7 +735,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICo
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
@@ -818,7 +745,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -829,7 +755,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IColle
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -840,7 +765,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -851,7 +775,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IColle
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -862,7 +785,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -873,7 +795,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int i
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must be empty, had a size of {collection.Count.ToAssertString()}");
@@ -884,7 +805,6 @@ internal static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -895,7 +815,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -906,7 +825,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyColl
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size over {size}, had a size of {collection.Count.ToAssertString()}");
@@ -917,7 +835,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCol
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {collection.Count.ToAssertString()}");
@@ -928,7 +845,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IRe
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {collection.Count.ToAssertString()}");
@@ -939,7 +855,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollec
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {collection.Count.ToAssertString()}");
@@ -950,7 +865,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -961,7 +875,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollect
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {destination.Count.ToAssertString()} (the destination), had a size of {source.Count.ToAssertString()}");
@@ -972,7 +885,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadO
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {collection.Count.ToAssertString()} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
@@ -983,7 +895,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int inde
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {collection.Count.ToAssertString()} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
index 99c138d35be..731065134fc 100644
--- a/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
+++ b/Microsoft.Toolkit/Diagnostics/Generated/ThrowHelper.Collection.tt
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 <#@include file="TypeInfo.ttinclude" #>
 using System;
-using System.Diagnostics;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -27,7 +26,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must be empty, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -38,7 +36,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -49,7 +46,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size not equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -60,7 +56,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size over {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -71,7 +66,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size of at least {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -82,7 +76,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -93,7 +86,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {<#=item.Name#>.<#=item.Size#>.ToAssertString()}");
@@ -104,7 +96,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
@@ -115,7 +106,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {destination.<#=item.Size#>.ToAssertString()} (the destination), had a size of {source.<#=item.Size#>.ToAssertString()}");
@@ -126,7 +116,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
@@ -137,7 +126,6 @@ GenerateTextForItems(EnumerableTypes, item =>
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {<#=item.Name#>.<#=item.Size#>.ToAssertString()} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
index 5e0df16cc5f..9ef29cbd440 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -24,7 +23,6 @@ public static partial class ThrowHelper
         /// <remarks>This method is needed because <see cref="Span{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(Span<T>).ToTypeString()}) must not be empty");
@@ -37,7 +35,6 @@ internal static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
         /// <remarks>This method is needed because <see cref="ReadOnlySpan{T}"/> can't be used as a generic type parameter.</remarks>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must not be empty");
@@ -49,7 +46,6 @@ internal static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(stri
         /// <typeparam name="T">The item of items in the input collection.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmpty<T>(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be empty");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
index 23d86f9319b..030ede72c30 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -23,7 +22,6 @@ public static partial class ThrowHelper
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
             where T : struct
         {
@@ -36,7 +34,6 @@ internal static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
         /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
             where T : struct
         {
@@ -49,7 +46,6 @@ internal static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
@@ -61,7 +57,6 @@ internal static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, st
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
@@ -73,7 +68,6 @@ internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -85,7 +79,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be less than or equal to {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -97,7 +90,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than {minimum.ToAssertString()}, was {value.ToAssertString()}");
@@ -109,7 +101,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be greater than or equal to {minimum.ToAssertString()}, was {value.ToAssertString()}");
@@ -121,7 +112,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -133,7 +123,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be in the range given by {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -145,7 +134,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -157,7 +145,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -169,7 +156,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value,
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
@@ -181,7 +167,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T
         /// <typeparam name="T">The type of values being tested.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
         {
             ThrowArgumentOutOfRangeException(name, value!, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be between or equal to {minimum.ToAssertString()} and {maximum.ToAssertString()}, was {value.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
index d3286382b1e..f249e812dc4 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Extensions;
@@ -22,7 +21,6 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
@@ -33,7 +31,6 @@ internal static void ThrowArgumentExceptionForIsCloseTo(int value, int target, u
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target, uint delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(int).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((double)((long)value - target)).ToAssertString()}");
@@ -44,7 +41,6 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
@@ -55,7 +51,6 @@ internal static void ThrowArgumentExceptionForIsCloseTo(long value, long target,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target, ulong delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(long).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs((decimal)value - target).ToAssertString()}");
@@ -66,7 +61,6 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(long value, long targ
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -77,7 +71,6 @@ internal static void ThrowArgumentExceptionForIsCloseTo(float value, float targe
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(float value, float target, float delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(float).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -88,7 +81,6 @@ internal static void ThrowArgumentExceptionForIsNotCloseTo(float value, float ta
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
@@ -99,7 +91,6 @@ internal static void ThrowArgumentExceptionForIsCloseTo(double value, double tar
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCloseTo(double value, double target, double delta, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(double).ToTypeString()}) must not be within a distance of {delta.ToAssertString()} from {target.ToAssertString()}, was {value.ToAssertString()} and had a distance of {Math.Abs(value - target).ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
index 8e0655ed217..442ea37c063 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -23,7 +22,6 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support reading");
@@ -34,7 +32,6 @@ internal static void ThrowArgumentExceptionForCanRead(Stream stream, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support writing");
@@ -45,7 +42,6 @@ internal static void ThrowArgumentExceptionForCanWrite(Stream stream, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) doesn't support seeking");
@@ -56,7 +52,6 @@ internal static void ThrowArgumentExceptionForCanSeek(Stream stream, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAtStartPosition(Stream stream, string name)
         {
             ThrowArgumentException(name, $"Stream {name.ToAssertString()} ({stream.GetType().ToTypeString()}) must be at position {0.ToAssertString()}, was at {stream.Position.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
index 24d48bfeb36..bfcbed6f835 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
@@ -21,7 +20,6 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or empty, was {text.ToAssertString()}");
@@ -32,7 +30,6 @@ internal static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or empty, was {(text is null ? "null" : "empty")}");
@@ -43,7 +40,6 @@ internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, str
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or whitespace, was {text.ToAssertString()}");
@@ -54,7 +50,6 @@ internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or whitespace, was {(text is null ? "null" : "whitespace")}");
@@ -65,7 +60,6 @@ internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be empty, was {text.ToAssertString()}");
@@ -76,7 +70,6 @@ internal static void ThrowArgumentExceptionForIsEmpty(string text, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be empty");
@@ -87,7 +80,6 @@ internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be whitespace, was {text.ToAssertString()}");
@@ -98,7 +90,6 @@ internal static void ThrowArgumentExceptionForIsWhitespace(string text, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be whitespace, was {text.ToAssertString()}");
@@ -109,7 +100,6 @@ internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -120,7 +110,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int si
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not have a size equal to {size}, was {text.ToAssertString()}");
@@ -131,7 +120,6 @@ internal static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size over {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -142,7 +130,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, in
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size of at least {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -153,7 +140,6 @@ internal static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThan(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -164,7 +150,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThan(string text, int s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text, int size, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must have a size less than or equal to {size}, had a size of {text.Length} and was {text.ToAssertString()}");
@@ -175,7 +160,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string te
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -186,7 +170,6 @@ internal static void ThrowArgumentExceptionForHasSizeEqualTo(string source, stri
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string source, string destination, string name)
         {
             ThrowArgumentException(name, $"The source {name.ToAssertString()} (string) must have a size less than or equal to {destination.Length.ToAssertString()} (the destination), had a size of {source.Length.ToAssertString()}");
@@ -197,7 +180,6 @@ internal static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string so
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must be in the range given by <0> and {text.Length.ToAssertString()} to be a valid index for the target string, was {index.ToAssertString()}");
@@ -208,7 +190,6 @@ internal static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
         {
             ThrowArgumentOutOfRangeException(name, index, $"Parameter {name.ToAssertString()} (int) must not be in the range given by <0> and {text.Length.ToAssertString()} to be an invalid index for the target string, was {index.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
index 69ee19403db..09f8db9c14b 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -23,7 +22,6 @@ public static partial class ThrowHelper
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed, had status {task.Status.ToAssertString()}");
@@ -34,7 +32,6 @@ internal static void ThrowArgumentExceptionForIsCompleted(Task task, string name
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCompleted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed, had status {task.Status.ToAssertString()}");
@@ -45,7 +42,6 @@ internal static void ThrowArgumentExceptionForIsNotCompleted(Task task, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be completed successfully, had status {task.Status.ToAssertString()}");
@@ -56,7 +52,6 @@ internal static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be completed successfully, had status {task.Status.ToAssertString()}");
@@ -67,7 +62,6 @@ internal static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task ta
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be faulted, had status {task.Status.ToAssertString()}");
@@ -78,7 +72,6 @@ internal static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be faulted, had status {task.Status.ToAssertString()}");
@@ -89,7 +82,6 @@ internal static void ThrowArgumentExceptionForIsNotFaulted(Task task, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must be canceled, had status {task.Status.ToAssertString()}");
@@ -100,7 +92,6 @@ internal static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not be canceled, had status {task.Status.ToAssertString()}");
@@ -111,7 +102,6 @@ internal static void ThrowArgumentExceptionForIsNotCanceled(Task task, string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must have status {status}, had status {task.Status.ToAssertString()}");
@@ -122,7 +112,6 @@ internal static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskSt
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForHasStatusNotEqualTo(Task task, TaskStatus status, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({task.GetType().ToTypeString()}) must not have status {status.ToAssertString()}");
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
index 2b03427f10e..103c3ef12ad 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -25,7 +24,6 @@ public static partial class ThrowHelper
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArrayTypeMismatchException(string message)
         {
             throw new ArrayTypeMismatchException(message);
@@ -38,7 +36,6 @@ public static void ThrowArrayTypeMismatchException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArrayTypeMismatchException(string message, Exception innerException)
         {
             throw new ArrayTypeMismatchException(message, innerException);
@@ -50,7 +47,6 @@ public static void ThrowArrayTypeMismatchException(string message, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentException(string message)
         {
             throw new ArgumentException(message);
@@ -63,7 +59,6 @@ public static void ThrowArgumentException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentException(string message, Exception innerException)
         {
             throw new ArgumentException(message, innerException);
@@ -76,7 +71,6 @@ public static void ThrowArgumentException(string message, Exception innerExcepti
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentException(string name, string message)
         {
             throw new ArgumentException(message, name);
@@ -90,7 +84,6 @@ public static void ThrowArgumentException(string name, string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentException(string name, string message, Exception innerException)
         {
             throw new ArgumentException(message, name, innerException);
@@ -102,7 +95,6 @@ public static void ThrowArgumentException(string name, string message, Exception
         /// <param name="name">The argument name.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name)
         {
             throw new ArgumentNullException(name);
@@ -115,7 +107,6 @@ public static void ThrowArgumentNullException(string name)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name, Exception innerException)
         {
             throw new ArgumentNullException(name, innerException);
@@ -128,7 +119,6 @@ public static void ThrowArgumentNullException(string name, Exception innerExcept
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentNullException(string name, string message)
         {
             throw new ArgumentNullException(name, message);
@@ -140,7 +130,6 @@ public static void ThrowArgumentNullException(string name, string message)
         /// <param name="name">The argument name.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name)
         {
             throw new ArgumentOutOfRangeException(name);
@@ -153,7 +142,6 @@ public static void ThrowArgumentOutOfRangeException(string name)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, Exception innerException)
         {
             throw new ArgumentOutOfRangeException(name, innerException);
@@ -166,7 +154,6 @@ public static void ThrowArgumentOutOfRangeException(string name, Exception inner
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, string message)
         {
             throw new ArgumentOutOfRangeException(name, message);
@@ -180,7 +167,6 @@ public static void ThrowArgumentOutOfRangeException(string name, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
         {
             throw new ArgumentOutOfRangeException(name, value, message);
@@ -192,7 +178,6 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowExternalException(string message)
         {
             throw new ExternalException(message);
@@ -205,7 +190,6 @@ public static void ThrowExternalException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowExternalException(string message, Exception innerException)
         {
             throw new ExternalException(message, innerException);
@@ -218,7 +202,6 @@ public static void ThrowExternalException(string message, Exception innerExcepti
         /// <param name="error">The HRESULT of the errror to include.</param>
         /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowExternalException(string message, int error)
         {
             throw new ExternalException(message, error);
@@ -230,7 +213,6 @@ public static void ThrowExternalException(string message, int error)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowFormatException(string message)
         {
             throw new FormatException(message);
@@ -243,7 +225,6 @@ public static void ThrowFormatException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowFormatException(string message, Exception innerException)
         {
             throw new FormatException(message, innerException);
@@ -255,7 +236,6 @@ public static void ThrowFormatException(string message, Exception innerException
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInsufficientMemoryException(string message)
         {
             throw new InsufficientMemoryException(message);
@@ -268,7 +248,6 @@ public static void ThrowInsufficientMemoryException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInsufficientMemoryException(string message, Exception innerException)
         {
             throw new InsufficientMemoryException(message, innerException);
@@ -280,7 +259,6 @@ public static void ThrowInsufficientMemoryException(string message, Exception in
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInvalidDataException(string message)
         {
             throw new InvalidDataException(message);
@@ -293,7 +271,6 @@ public static void ThrowInvalidDataException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInvalidDataException(string message, Exception innerException)
         {
             throw new InvalidDataException(message, innerException);
@@ -305,7 +282,6 @@ public static void ThrowInvalidDataException(string message, Exception innerExce
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInvalidOperationException(string message)
         {
             throw new InvalidOperationException(message);
@@ -318,7 +294,6 @@ public static void ThrowInvalidOperationException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowInvalidOperationException(string message, Exception innerException)
         {
             throw new InvalidOperationException(message, innerException);
@@ -330,7 +305,6 @@ public static void ThrowInvalidOperationException(string message, Exception inne
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowLockRecursionException(string message)
         {
             throw new LockRecursionException(message);
@@ -343,7 +317,6 @@ public static void ThrowLockRecursionException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowLockRecursionException(string message, Exception innerException)
         {
             throw new LockRecursionException(message, innerException);
@@ -355,7 +328,6 @@ public static void ThrowLockRecursionException(string message, Exception innerEx
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingFieldException(string message)
         {
             throw new MissingFieldException(message);
@@ -368,7 +340,6 @@ public static void ThrowMissingFieldException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingFieldException(string message, Exception innerException)
         {
             throw new MissingFieldException(message, innerException);
@@ -381,7 +352,6 @@ public static void ThrowMissingFieldException(string message, Exception innerExc
         /// <param name="fieldName">The target field being retrieved.</param>
         /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingFieldException(string className, string fieldName)
         {
             throw new MissingFieldException(className, fieldName);
@@ -393,7 +363,6 @@ public static void ThrowMissingFieldException(string className, string fieldName
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMemberException(string message)
         {
             throw new MissingMemberException(message);
@@ -406,7 +375,6 @@ public static void ThrowMissingMemberException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMemberException(string message, Exception innerException)
         {
             throw new MissingMemberException(message, innerException);
@@ -419,7 +387,6 @@ public static void ThrowMissingMemberException(string message, Exception innerEx
         /// <param name="memberName">The target member being retrieved.</param>
         /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMemberException(string className, string memberName)
         {
             throw new MissingMemberException(className, memberName);
@@ -431,7 +398,6 @@ public static void ThrowMissingMemberException(string className, string memberNa
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMethodException(string message)
         {
             throw new MissingMethodException(message);
@@ -444,7 +410,6 @@ public static void ThrowMissingMethodException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMethodException(string message, Exception innerException)
         {
             throw new MissingMethodException(message, innerException);
@@ -457,7 +422,6 @@ public static void ThrowMissingMethodException(string message, Exception innerEx
         /// <param name="methodName">The target method being retrieved.</param>
         /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowMissingMethodException(string className, string methodName)
         {
             throw new MissingMethodException(className, methodName);
@@ -469,7 +433,6 @@ public static void ThrowMissingMethodException(string className, string methodNa
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowNotSupportedException(string message)
         {
             throw new NotSupportedException(message);
@@ -482,7 +445,6 @@ public static void ThrowNotSupportedException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowNotSupportedException(string message, Exception innerException)
         {
             throw new NotSupportedException(message, innerException);
@@ -494,7 +456,6 @@ public static void ThrowNotSupportedException(string message, Exception innerExc
         /// <param name="objectName">The name of the disposed object.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName)
         {
             throw new ObjectDisposedException(objectName);
@@ -507,7 +468,6 @@ public static void ThrowObjectDisposedException(string objectName)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName, Exception innerException)
         {
             throw new ObjectDisposedException(objectName, innerException);
@@ -520,7 +480,6 @@ public static void ThrowObjectDisposedException(string objectName, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowObjectDisposedException(string objectName, string message)
         {
             throw new ObjectDisposedException(objectName, message);
@@ -532,7 +491,6 @@ public static void ThrowObjectDisposedException(string objectName, string messag
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message)
         {
             throw new OperationCanceledException(message);
@@ -545,7 +503,6 @@ public static void ThrowOperationCanceledException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, Exception innerException)
         {
             throw new OperationCanceledException(message, innerException);
@@ -557,7 +514,6 @@ public static void ThrowOperationCanceledException(string message, Exception inn
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowOperationCanceledException(CancellationToken token)
         {
             throw new OperationCanceledException(token);
@@ -570,7 +526,6 @@ public static void ThrowOperationCanceledException(CancellationToken token)
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, CancellationToken token)
         {
             throw new OperationCanceledException(message, token);
@@ -584,7 +539,6 @@ public static void ThrowOperationCanceledException(string message, CancellationT
         /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
         /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
         {
             throw new OperationCanceledException(message, innerException, token);
@@ -596,7 +550,6 @@ public static void ThrowOperationCanceledException(string message, Exception inn
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowPlatformNotSupportedException(string message)
         {
             throw new PlatformNotSupportedException(message);
@@ -609,7 +562,6 @@ public static void ThrowPlatformNotSupportedException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowPlatformNotSupportedException(string message, Exception innerException)
         {
             throw new PlatformNotSupportedException(message, innerException);
@@ -621,7 +573,6 @@ public static void ThrowPlatformNotSupportedException(string message, Exception
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowSynchronizationLockException(string message)
         {
             throw new SynchronizationLockException(message);
@@ -634,7 +585,6 @@ public static void ThrowSynchronizationLockException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowSynchronizationLockException(string message, Exception innerException)
         {
             throw new SynchronizationLockException(message, innerException);
@@ -646,7 +596,6 @@ public static void ThrowSynchronizationLockException(string message, Exception i
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowTimeoutException(string message)
         {
             throw new TimeoutException(message);
@@ -659,7 +608,6 @@ public static void ThrowTimeoutException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowTimeoutException(string message, Exception innerException)
         {
             throw new TimeoutException(message, innerException);
@@ -671,7 +619,6 @@ public static void ThrowTimeoutException(string message, Exception innerExceptio
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowUnauthorizedAccessException(string message)
         {
             throw new UnauthorizedAccessException(message);
@@ -684,7 +631,6 @@ public static void ThrowUnauthorizedAccessException(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowUnauthorizedAccessException(string message, Exception innerException)
         {
             throw new UnauthorizedAccessException(message, innerException);
@@ -696,7 +642,6 @@ public static void ThrowUnauthorizedAccessException(string message, Exception in
         /// <param name="error">The Win32 error code associated with this exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowWin32Exception(int error)
         {
             throw new Win32Exception(error);
@@ -709,7 +654,6 @@ public static void ThrowWin32Exception(int error)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowWin32Exception(int error, string message)
         {
             throw new Win32Exception(error, message);
@@ -721,7 +665,6 @@ public static void ThrowWin32Exception(int error, string message)
         /// <param name="message">The message to include in the exception.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowWin32Exception(string message)
         {
             throw new Win32Exception(message);
@@ -734,7 +677,6 @@ public static void ThrowWin32Exception(string message)
         /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
         /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        [StackTraceHidden]
         public static void ThrowWin32Exception(string message, Exception innerException)
         {
             throw new Win32Exception(message, innerException);
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index 0907a10335e..0ba836dc488 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
@@ -40,7 +39,6 @@ private static string ToAssertString(this object? obj)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
             where T : class
         {
@@ -53,7 +51,6 @@ internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
             where T : struct
         {
@@ -66,7 +63,6 @@ internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         {
             ThrowArgumentNullException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be not null)");
@@ -78,7 +74,6 @@ internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -90,7 +85,6 @@ internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string n
         /// <typeparam name="T">The type of the input value.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -101,7 +95,6 @@ internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, strin
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -112,7 +105,6 @@ internal static void ThrowArgumentExceptionForIsOfType(object value, Type type,
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -124,7 +116,6 @@ internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type typ
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -136,7 +127,6 @@ internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value
         /// <typeparam name="T">The type being checked against.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -147,7 +137,6 @@ internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object va
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -158,7 +147,6 @@ internal static void ThrowArgumentExceptionForIsAssignableToType(object value, T
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
@@ -170,7 +158,6 @@ internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value
         /// <typeparam name="T">The type of input values being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
             where T : unmanaged
         {
@@ -183,7 +170,6 @@ internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T targ
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
             where T : class
         {
@@ -196,7 +182,6 @@ internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
         /// <typeparam name="T">The type of input value being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
             where T : class
         {
@@ -208,7 +193,6 @@ internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string na
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsTrue(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false");
@@ -219,7 +203,6 @@ internal static void ThrowArgumentExceptionForIsTrue(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsTrue(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false: {message.ToAssertString()}");
@@ -230,7 +213,6 @@ internal static void ThrowArgumentExceptionForIsTrue(string name, string message
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFalse(string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true");
@@ -241,7 +223,6 @@ internal static void ThrowArgumentExceptionForIsFalse(string name)
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        [StackTraceHidden]
         internal static void ThrowArgumentExceptionForIsFalse(string name, string message)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true: {message.ToAssertString()}");

From 418c2461ddf68f3101385143677e37cb29926482 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 22 Jul 2020 00:07:02 +0200
Subject: [PATCH 310/595] Added unit tests for new ThrowHelper APIs

---
 .../Diagnostics/Test_ThrowHelper.cs           | 82 +++++++++++++++++++
 .../UnitTests.Shared.projitems                |  1 +
 2 files changed, 83 insertions(+)
 create mode 100644 UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs

diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
new file mode 100644
index 00000000000..c9ac6ec63cc
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
@@ -0,0 +1,82 @@
+// 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.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.Toolkit.Diagnostics;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Diagnostics
+{
+    [TestClass]
+    public class Test_ThrowHelper
+    {
+        /// <summary>
+        /// Default values to be used from tests in <see cref="Test_ThrowHelper_Throw"/>.
+        /// </summary>
+        private static readonly IReadOnlyDictionary<Type, object> DefaultValues = new Dictionary<Type, object>
+        {
+            [typeof(string)] = "Hello world",
+            [typeof(Exception)] = new Exception("Test"),
+            [typeof(object)] = new object(),
+            [typeof(int)] = 42,
+            [typeof(CancellationToken)] = default(CancellationToken)
+        };
+
+        [TestCategory("Guard")]
+        [TestMethod]
+        [DataRow(typeof(ArrayTypeMismatchException))]
+        [DataRow(typeof(ArgumentException))]
+        [DataRow(typeof(ArgumentNullException))]
+        [DataRow(typeof(ArgumentOutOfRangeException))]
+        [DataRow(typeof(ExternalException))]
+        [DataRow(typeof(FormatException))]
+        [DataRow(typeof(InsufficientMemoryException))]
+        [DataRow(typeof(InvalidDataException))]
+        [DataRow(typeof(InvalidOperationException))]
+        [DataRow(typeof(LockRecursionException))]
+        [DataRow(typeof(MissingFieldException))]
+        [DataRow(typeof(MissingMemberException))]
+        [DataRow(typeof(MissingMethodException))]
+        [DataRow(typeof(NotSupportedException))]
+        [DataRow(typeof(ObjectDisposedException))]
+        [DataRow(typeof(OperationCanceledException))]
+        [DataRow(typeof(PlatformNotSupportedException))]
+        [DataRow(typeof(SynchronizationLockException))]
+        [DataRow(typeof(TimeoutException))]
+        [DataRow(typeof(UnauthorizedAccessException))]
+        [DataRow(typeof(Win32Exception))]
+        public void Test_ThrowHelper_Throw(Type exceptionType)
+        {
+            var methods = (
+                from method in typeof(ThrowHelper).GetMethods(BindingFlags.Public | BindingFlags.Static)
+                where method.Name == $"Throw{exceptionType.Name}"
+                select method).ToArray();
+
+            foreach (var method in methods)
+            {
+                // Prepare the parameters with the default value
+                var parameters = (
+                    from parameter in method.GetParameters()
+                    select DefaultValues[parameter.ParameterType]).ToArray();
+
+                // Invoke the throw method
+                try
+                {
+                    method.Invoke(null, parameters);
+                }
+                catch (TargetInvocationException e)
+                {
+                    Assert.IsInstanceOfType(e.InnerException, exceptionType);
+                }
+            }
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index c281bd27bdf..fd3d2006ef1 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -15,6 +15,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Collections\ObservableGroupTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\ReadOnlyObservableGroupedCollectionTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\ReadOnlyObservableGroupTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_ThrowHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Array.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.Comparable.Numeric.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\Test_Guard.cs" />

From cd70d0dbfa80ea987a3bea4b0a0e676390bd6ed6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 22 Jul 2020 00:11:28 +0200
Subject: [PATCH 311/595] Reverted HighPerformance changes

Moved to related HighPerformance PR
---
 .../Enumerables/ReadOnlySpanEnumerable{T}.cs                | 6 ++----
 .../Enumerables/ReadOnlySpanTokenizer{T}.cs                 | 6 ++----
 .../Enumerables/SpanEnumerable{T}.cs                        | 6 ++----
 .../Enumerables/SpanTokenizer{T}.cs                         | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
index c732861d670..29d42924536 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -43,9 +42,8 @@ public ReadOnlySpanEnumerable(ReadOnlySpan<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanEnumerable{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
-        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly ReadOnlySpanEnumerable<T> GetEnumerator() => this;
+        public ReadOnlySpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -69,7 +67,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public readonly Item Current
+        public Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
index 37bc6168f10..3977f5829f8 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -55,9 +54,8 @@ public ReadOnlySpanTokenizer(ReadOnlySpan<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanTokenizer{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
-        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly ReadOnlySpanTokenizer<T> GetEnumerator() => this;
+        public ReadOnlySpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -96,7 +94,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public readonly ReadOnlySpan<T> Current
+        public ReadOnlySpan<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
index 3648a5e5140..791f509339d 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -43,9 +42,8 @@ public SpanEnumerable(Span<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanEnumerable{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
-        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly SpanEnumerable<T> GetEnumerator() => this;
+        public SpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -69,7 +67,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public readonly Item Current
+        public Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
index da8a9dce040..953eb535f0b 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -55,9 +54,8 @@ public SpanTokenizer(Span<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanTokenizer{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
-        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly SpanTokenizer<T> GetEnumerator() => this;
+        public SpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -96,7 +94,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public readonly Span<T> Current
+        public Span<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);

From 1438e3983291e009b845919a5c947b5b8c96c918 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 22 Jul 2020 00:16:20 +0200
Subject: [PATCH 312/595] Added more readonly modifiers to enumerators

---
 .../Enumerables/ReadOnlySpanEnumerable{T}.cs                | 6 ++++--
 .../Enumerables/ReadOnlySpanTokenizer{T}.cs                 | 6 ++++--
 .../Enumerables/SpanEnumerable{T}.cs                        | 6 ++++--
 .../Enumerables/SpanTokenizer{T}.cs                         | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
index 29d42924536..c732861d670 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -42,8 +43,9 @@ public ReadOnlySpanEnumerable(ReadOnlySpan<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanEnumerable{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanEnumerable<T> GetEnumerator() => this;
+        public readonly ReadOnlySpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -67,7 +69,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Item Current
+        public readonly Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
index 3977f5829f8..37bc6168f10 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -54,8 +55,9 @@ public ReadOnlySpanTokenizer(ReadOnlySpan<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="ReadOnlySpanTokenizer{T}"/> instance targeting the current <see cref="ReadOnlySpan{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanTokenizer<T> GetEnumerator() => this;
+        public readonly ReadOnlySpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -94,7 +96,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public ReadOnlySpan<T> Current
+        public readonly ReadOnlySpan<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
index 791f509339d..3648a5e5140 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -42,8 +43,9 @@ public SpanEnumerable(Span<T> span)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanEnumerable{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanEnumerable<T> GetEnumerator() => this;
+        public readonly SpanEnumerable<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -67,7 +69,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Item Current
+        public readonly Item Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
index 953eb535f0b..da8a9dce040 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Enumerables
@@ -54,8 +55,9 @@ public SpanTokenizer(Span<T> span, T separator)
         /// Implements the duck-typed <see cref="IEnumerable{T}.GetEnumerator"/> method.
         /// </summary>
         /// <returns>An <see cref="SpanTokenizer{T}"/> instance targeting the current <see cref="Span{T}"/> value.</returns>
+        [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanTokenizer<T> GetEnumerator() => this;
+        public readonly SpanTokenizer<T> GetEnumerator() => this;
 
         /// <summary>
         /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
@@ -94,7 +96,7 @@ public bool MoveNext()
         /// <summary>
         /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
         /// </summary>
-        public Span<T> Current
+        public readonly Span<T> Current
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => this.span.Slice(this.start, this.end - this.start);

From 64bd150df14489becaa26c9ef2c81917ecb1d6e4 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 22 Jul 2020 10:13:34 +0200
Subject: [PATCH 313/595] live region event will now also be sent when
 replacing the content

---
 .../InAppNotification/InAppNotification.Events.cs      |  1 -
 .../InAppNotification/InAppNotification.cs             | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
index 2c5939ea5ba..9f4451fc4a1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
@@ -59,7 +59,6 @@ private void OnCurrentStateChanged(object sender, VisualStateChangedEventArgs e)
         private void OnNotificationVisible()
         {
             Opened?.Invoke(this, EventArgs.Empty);
-            RaiseAutomationNotification();
         }
 
         private void OnNotificationCollapsed()
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 6eafded868e..c59c4ff8848 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Toolkit.Uwp.Extensions;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;
@@ -246,6 +246,8 @@ private void UpdateContent(NotificationOptions notificationOptions)
                     _contentProvider.Content = content;
                     break;
             }
+
+            RaiseAutomationNotification();
         }
 
         /// <summary>
@@ -282,11 +284,11 @@ private void Show(NotificationOptions notificationOptions)
 
             if (shouldDisplayImmediately)
             {
-                UpdateContent(notificationOptions);
-
                 Visibility = Visibility.Visible;
                 VisualStateManager.GoToState(this, StateContentVisible, true);
 
+                UpdateContent(notificationOptions);
+
                 if (notificationOptions.Duration > 0)
                 {
                     _dismissTimer.Interval = TimeSpan.FromMilliseconds(notificationOptions.Duration);

From 426b9f5966f20d87ae31d51f0d691a48234f7773 Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:10:53 -0700
Subject: [PATCH 314/595] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fabe5ecc109..6e535dcad28 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,5 @@
-## Fixes #<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged. -->
+## Fixes #
+<!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. -->
 
 <!-- Add a brief overview here of the feature/bug & fix. -->
 

From 4c2ed0ce15c37daf09d5152b2bbe60309400d410 Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Wed, 22 Jul 2020 14:43:59 -0700
Subject: [PATCH 315/595] Update bug_report.md

Update May 2020 Update (19041)
---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6442a92ccc0..c3f1654249d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -42,6 +42,7 @@ Windows 10 Build Number:
 - [ ] April 2018 Update (17134)
 - [ ] October 2018 Update (17763)
 - [ ] May 2019 Update (18362)
+- [ ] May 2020 Update (19041)
 - [ ] Insider Build (build number: )
 
 App min and target version:
@@ -49,6 +50,7 @@ App min and target version:
 - [ ] April 2018 Update (17134)
 - [ ] October 2018 Update (17763)
 - [ ] May 2019 Update (18362)
+- [ ] May 2020 Update (19041)
 - [ ] Insider Build (xxxxx)
 
 Device form factor:

From bc3e66d50b588d2066a67f40d05fad7585eae1a6 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 22 Jul 2020 14:58:00 -0700
Subject: [PATCH 316/595] Update
 Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
 using order

---
 .../InAppNotification/InAppNotification.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index c59c4ff8848..fb987188fa2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.Extensions;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;

From ea0b85a01eed63cbcc31649946ffca81ffc6f963 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 23 Jul 2020 00:47:38 +0200
Subject: [PATCH 317/595] Renamed Set -> SetProperty for consistency with other
 libs

---
 .../ComponentModel/ObservableObject.cs        | 42 +++++++++----------
 .../ComponentModel/ObservableRecipient.cs     | 34 +++++++--------
 .../Input/AsyncRelayCommand.cs                |  2 +-
 .../Input/AsyncRelayCommand{T}.cs             |  2 +-
 .../Mvvm/Test_ObservableObject.cs             |  8 ++--
 .../Mvvm/Test_ObservableRecipient.cs          |  2 +-
 6 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 608039b39c4..ed947566d6a 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -64,16 +64,16 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null!)
         {
-            return Set(ref field, newValue, EqualityComparer<T>.Default, propertyName);
+            return SetProperty(ref field, newValue, EqualityComparer<T>.Default, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
         /// value, then raises the <see cref="PropertyChanged"/> event.
-        /// See additional notes about this overload in <see cref="Set{T}(ref T,T,string)"/>.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(ref T,T,string)"/>.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
@@ -81,7 +81,7 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string propert
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
         {
             if (comparer.Equals(field, newValue))
             {
@@ -101,7 +101,7 @@ protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [C
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
         /// value, then raises the <see cref="PropertyChanged"/> event.
-        /// This overload is much less efficient than <see cref="Set{T}(ref T,T,string)"/> and it
+        /// This overload is much less efficient than <see cref="SetProperty{T}(ref T,T,string)"/> and it
         /// should only be used when the former is not viable (eg. when the target property being
         /// updated does not directly expose a backing field that can be passed by reference).
         /// </summary>
@@ -115,16 +115,16 @@ protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [C
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string propertyName = null!)
         {
-            return Set(oldValue, newValue, EqualityComparer<T>.Default, callback, propertyName);
+            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property with the new
         /// value, then raises the <see cref="PropertyChanged"/> event.
-        /// See additional notes about this overload in <see cref="Set{T}(T,T,Action{T},string)"/>.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(T,T,Action{T},string)"/>.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="oldValue">The current property value.</param>
@@ -133,7 +133,7 @@ protected bool Set<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberN
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string propertyName = null!)
         {
             if (comparer.Equals(oldValue, newValue))
             {
@@ -152,7 +152,7 @@ protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Act
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
-        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>,
+        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>,
         /// with the difference being that this method is used to relay properties from a wrapped model in the
         /// current instance. This type is useful when creating wrapping, bindable objects that operate over
         /// models that lack support for notification (eg. for CRUD operations).
@@ -184,7 +184,7 @@ protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Act
         /// </code>
         /// This way we can then use the wrapping object in our application, and all those "proxy" properties will
         /// also raise notifications when changed. Note that this method is not meant to be a replacement for
-        /// <see cref="Set{T}(ref T,T,string)"/>, which offers better performance and less memory usage. Only use this
+        /// <see cref="SetProperty{T}(ref T,T,string)"/>, which offers better performance and less memory usage. Only use this
         /// overload when relaying properties to a model that doesn't support notifications, and only if you can't
         /// implement notifications to that model directly (eg. by having it inherit from <see cref="ObservableObject"/>).
         /// </summary>
@@ -201,17 +201,17 @@ protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Act
         /// be used to access properties of a model that is directly stored as a property of the current instance.
         /// Additionally, this method can only be used if the wrapped item is a reference type.
         /// </remarks>
-        protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
         {
-            return Set(propertyExpression, newValue, EqualityComparer<T>.Default, propertyName);
+            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
-        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>,
+        /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>,
         /// with the difference being that this method is used to relay properties from a wrapped model in the
-        /// current instance. See additional notes about this overload in <see cref="Set{T}(Expression{Func{T}},T,string)"/>.
+        /// current instance. See additional notes about this overload in <see cref="SetProperty{T}(Expression{Func{T}},T,string)"/>.
         /// </summary>
         /// <typeparam name="T">The type of property to set.</typeparam>
         /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
@@ -219,7 +219,7 @@ protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, [Calle
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool Set<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
         {
             PropertyInfo? parentPropertyInfo;
             FieldInfo? parentFieldInfo = null;
@@ -262,7 +262,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// The behavior mirrors that of <see cref="Set{T}(ref T,T,string)"/>, with the difference being that this method
+        /// The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>, with the difference being that this method
         /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
         /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
         /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
@@ -292,7 +292,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
@@ -301,14 +301,14 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
             // instance. This will result in no further allocations after the first time this method is called for a given
             // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
             // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
-            return SetAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
+            return SetPropertyAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
         /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
         /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
         /// </summary>
@@ -324,7 +324,7 @@ protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
             where TTask : Task
         {
             if (ReferenceEquals(field, newValue))
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 2da947247fb..c997e0188bc 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -57,7 +57,7 @@ public bool IsActive
             get => this.isActive;
             set
             {
-                if (Set(ref this.isActive, value, true))
+                if (SetProperty(ref this.isActive, value, true))
                 {
                     if (value)
                     {
@@ -133,21 +133,21 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// This method is just like <see cref="ObservableObject.Set{T}(ref T,T,string)"/>, just with the addition
+        /// This method is just like <see cref="ObservableObject.SetProperty{T}(ref T,T,string)"/>, just with the addition
         /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
         /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
-            return Set(ref field, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
+            return SetProperty(ref field, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
         /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
-        /// See additional notes about this overload in <see cref="Set{T}(ref T,T,bool,string)"/>.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(ref T,T,bool,string)"/>.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="field">The field storing the property's value.</param>
@@ -156,16 +156,16 @@ protected bool Set<T>(ref T field, T newValue, bool broadcast, [CallerMemberName
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
             if (!broadcast)
             {
-                return Set(ref field, newValue, comparer, propertyName);
+                return SetProperty(ref field, newValue, comparer, propertyName);
             }
 
             T oldValue = field;
 
-            if (Set(ref field, newValue, comparer, propertyName))
+            if (SetProperty(ref field, newValue, comparer, propertyName))
             {
                 Broadcast(oldValue, newValue, propertyName);
 
@@ -179,8 +179,8 @@ protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bo
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
         /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event. Similarly to
-        /// the <see cref="ObservableObject.Set{T}(T,T,Action{T},string)"/> method, this overload should only be
-        /// used when <see cref="ObservableObject.Set{T}(ref T,T,string)"/> can't be used directly.
+        /// the <see cref="ObservableObject.SetProperty{T}(T,T,Action{T},string)"/> method, this overload should only be
+        /// used when <see cref="ObservableObject.SetProperty{T}(ref T,T,string)"/> can't be used directly.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="oldValue">The current property value.</param>
@@ -190,21 +190,21 @@ protected bool Set<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bo
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// This method is just like <see cref="ObservableObject.Set{T}(T,T,Action{T},string)"/>, just with the addition
+        /// This method is just like <see cref="ObservableObject.SetProperty{T}(T,T,Action{T},string)"/>, just with the addition
         /// of the <paramref name="broadcast"/> parameter. As such, following the behavior of the base method,
         /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
-            return Set(oldValue, newValue, EqualityComparer<T>.Default, callback, broadcast, propertyName);
+            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, broadcast, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
         /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
         /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
-        /// See additional notes about this overload in <see cref="Set{T}(T,T,Action{T},bool,string)"/>.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(T,T,Action{T},bool,string)"/>.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="oldValue">The current property value.</param>
@@ -214,14 +214,14 @@ protected bool Set<T>(T oldValue, T newValue, Action<T> callback, bool broadcast
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool Set<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
         {
             if (!broadcast)
             {
-                return Set(oldValue, newValue, comparer, callback, propertyName);
+                return SetProperty(oldValue, newValue, comparer, callback, propertyName);
             }
 
-            if (Set(oldValue, newValue, comparer, callback, propertyName))
+            if (SetProperty(oldValue, newValue, comparer, callback, propertyName))
             {
                 Broadcast(oldValue, newValue, propertyName);
 
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index dfd5c883550..ee03b23a1f0 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -58,7 +58,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 471808f09ce..14d2c65d4b7 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -58,7 +58,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 8a03daeaa71..89e70171139 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -59,7 +59,7 @@ public class SampleModel<T> : ObservableObject
             public T Data
             {
                 get => data;
-                set => Set(ref data, value);
+                set => SetProperty(ref data, value);
             }
         }
 
@@ -114,7 +114,7 @@ public WrappingModelWithProperty(Person person)
             public string Name
             {
                 get => Person.Name;
-                set => Set(() => Person.Name, value);
+                set => SetProperty(() => Person.Name, value);
             }
         }
 
@@ -164,7 +164,7 @@ public WrappingModelWithField(Person person)
             public string Name
             {
                 get => this.person.Name;
-                set => Set(() => this.person.Name, value);
+                set => SetProperty(() => this.person.Name, value);
             }
         }
 
@@ -226,7 +226,7 @@ public class SampleModelWithTask<T> : ObservableObject
             public Task<T> Data
             {
                 get => data;
-                set => SetAndNotifyOnCompletion(ref data, () => data, value);
+                set => SetPropertyAndNotifyOnCompletion(ref data, () => data, value);
             }
         }
     }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index 1edf939f7ca..d5e330e1e53 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -88,7 +88,7 @@ public SomeRecipient(IMessenger messenger)
             public T Data
             {
                 get => data;
-                set => Set(ref data, value, true);
+                set => SetProperty(ref data, value, true);
             }
 
             public bool IsActivatedCheck { get; private set; }

From 658c1a43ab14ab31536d85b58fb87c1497094333 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 23 Jul 2020 19:38:41 +0200
Subject: [PATCH 318/595] Minor code tweaks

---
 .../Buffers/StringPool.cs                           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 8158cb61fd0..d7ead9e3612 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -522,8 +522,8 @@ public void Reset()
                 ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
                 ref MapEntry entry = ref Unsafe.AsRef<MapEntry>(null);
                 int
-                    bucketIndex = hashcode & (this.buckets.Length - 1),
-                    length = this.buckets.Length;
+                    length = this.buckets.Length,
+                    bucketIndex = hashcode & (length - 1);
 
                 for (int i = this.buckets.DangerousGetReferenceAt(bucketIndex) - 1;
                      (uint)i < (uint)length;
@@ -667,8 +667,9 @@ private unsafe void Remove(int hashcode, int mapIndex)
             [MethodImpl(MethodImplOptions.NoInlining)]
             private unsafe void UpdateTimestamp(ref int heapIndex)
             {
-                int currentIndex = heapIndex;
-
+                int
+                    currentIndex = heapIndex,
+                    count = this.count;
                 ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
                 ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
                 ref HeapEntry root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
@@ -701,7 +702,7 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                         targetIndex = currentIndex;
 
                     // Check and update the left child, if necessary
-                    if (left < this.count)
+                    if (left < count)
                     {
                         ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)left);
 
@@ -713,7 +714,7 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                     }
 
                     // Same check as above for the right child
-                    if (right < this.count)
+                    if (right < count)
                     {
                         ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)right);
 

From 1542c0e7c271de5d34d7d5132efc4d9f4d886d74 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 23 Jul 2020 20:01:15 +0200
Subject: [PATCH 319/595] Removed unnecessary overhead in request messages

---
 .../AsyncCollectionRequestMessage{T}.cs       |  3 +-
 .../Messages/AsyncRequestMessage{T}.cs        | 30 +++++++------------
 .../Messages/CollectionRequestMessage{T}.cs   |  3 +-
 .../Messaging/Messages/RequestMessage{T}.cs   | 30 +++++++------------
 4 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
index 6d34f512162..da7cb85f25d 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.Contracts;
@@ -23,7 +22,7 @@ public class AsyncCollectionRequestMessage<T> : IAsyncEnumerable<T>
         /// operations that can be executed in parallel, or <see cref="Func{T,TResult}"/> instances, which can be used so that multiple
         /// asynchronous operations are only started sequentially from <see cref="GetAsyncEnumerator"/> and do not overlap in time.
         /// </summary>
-        private readonly ConcurrentBag<(Task<T>?, Func<CancellationToken, Task<T>>?)> responses = new ConcurrentBag<(Task<T>?, Func<CancellationToken, Task<T>>?)>();
+        private readonly List<(Task<T>?, Func<CancellationToken, Task<T>>?)> responses = new List<(Task<T>?, Func<CancellationToken, Task<T>>?)>();
 
         /// <summary>
         /// The <see cref="CancellationTokenSource"/> instance used to link the token passed to
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
index bf43b65fef5..76d5c4cd047 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
@@ -16,11 +16,6 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     /// <typeparam name="T">The type of request to make.</typeparam>
     public class AsyncRequestMessage<T>
     {
-        /// <summary>
-        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply(T)"/> and <see cref="Reply(Task{T})"/>.
-        /// </summary>
-        private readonly object dummy = new object();
-
         private Task<T>? response;
 
         /// <summary>
@@ -31,15 +26,12 @@ public Task<T> Response
         {
             get
             {
-                lock (this.dummy)
+                if (!HasReceivedResponse)
                 {
-                    if (!this.HasReceivedResponse)
-                    {
-                        ThrowInvalidOperationExceptionForNoResponseReceived();
-                    }
-
-                    return this.response!;
+                    ThrowInvalidOperationExceptionForNoResponseReceived();
                 }
+
+                return this.response!;
             }
         }
 
@@ -65,16 +57,14 @@ public void Reply(T response)
         /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
         public void Reply(Task<T> response)
         {
-            lock (this.dummy)
+            if (HasReceivedResponse)
             {
-                if (this.HasReceivedResponse)
-                {
-                    ThrowInvalidOperationExceptionForDuplicateReply();
-                }
-
-                this.HasReceivedResponse = true;
-                this.response = response;
+                ThrowInvalidOperationExceptionForDuplicateReply();
             }
+
+            HasReceivedResponse = true;
+
+            this.response = response;
         }
 
         /// <inheritdoc cref="Task{T}.GetAwaiter"/>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
index b4ffa5f12f6..e1acd67143e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.Contracts;
@@ -17,7 +16,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     /// <typeparam name="T">The type of request to make.</typeparam>
     public class CollectionRequestMessage<T> : IEnumerable<T>
     {
-        private readonly ConcurrentBag<T> responses = new ConcurrentBag<T>();
+        private readonly List<T> responses = new List<T>();
 
         /// <summary>
         /// Gets the message responses.
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
index 2de848fdf10..fdc86870c6a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
@@ -14,11 +14,6 @@ namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
     /// <typeparam name="T">The type of request to make.</typeparam>
     public class RequestMessage<T>
     {
-        /// <summary>
-        /// An <see cref="object"/> used to synchronize access to <see cref="Response"/> and <see cref="Reply"/>.
-        /// </summary>
-        private readonly object dummy = new object();
-
         private T response;
 
         /// <summary>
@@ -29,15 +24,12 @@ public T Response
         {
             get
             {
-                lock (this.dummy)
+                if (!HasReceivedResponse)
                 {
-                    if (!this.HasReceivedResponse)
-                    {
-                        ThrowInvalidOperationExceptionForNoResponseReceived();
-                    }
-
-                    return this.response;
+                    ThrowInvalidOperationExceptionForNoResponseReceived();
                 }
+
+                return this.response;
             }
         }
 
@@ -53,16 +45,14 @@ public T Response
         /// <exception cref="InvalidOperationException">Thrown if <see cref="Response"/> has already been set.</exception>
         public void Reply(T response)
         {
-            lock (this.dummy)
+            if (HasReceivedResponse)
             {
-                if (this.HasReceivedResponse)
-                {
-                    ThrowInvalidOperationExceptionForDuplicateReply();
-                }
-
-                this.HasReceivedResponse = true;
-                this.response = response;
+                ThrowInvalidOperationExceptionForDuplicateReply();
             }
+
+            HasReceivedResponse = true;
+
+            this.response = response;
         }
 
         /// <summary>

From 7c7098ada9d7e3f06c59f3afd2b722311556e236 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 26 Jul 2020 14:01:28 +0200
Subject: [PATCH 320/595] Code refactoring and restructuring

---
 .../ThrowHelper.Guard.Collection.Generic.cs}  |   0
 .../ThrowHelper.Guard.Comparable.Generic.cs}  |   0
 .../ThrowHelper.Guard.Comparable.Numeric.cs}  |   0
 .../ThrowHelper.Guard.IO.cs}                  |   0
 .../ThrowHelper.Guard.String.cs}              |   0
 .../ThrowHelper.Guard.Tasks.cs}               |   0
 .../Internals/ThrowHelper.Guard.cs            | 231 ++++++
 .../ThrowHelper.ThrowExceptions.cs            | 685 ------------------
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs  | 656 ++++++++++++++---
 9 files changed, 786 insertions(+), 786 deletions(-)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.Collection.Generic.cs => Internals/ThrowHelper.Guard.Collection.Generic.cs} (100%)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.Comparable.Generic.cs => Internals/ThrowHelper.Guard.Comparable.Generic.cs} (100%)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.Comparable.Numeric.cs => Internals/ThrowHelper.Guard.Comparable.Numeric.cs} (100%)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.IO.cs => Internals/ThrowHelper.Guard.IO.cs} (100%)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.String.cs => Internals/ThrowHelper.Guard.String.cs} (100%)
 rename Microsoft.Toolkit/Diagnostics/{ThrowHelper.Tasks.cs => Internals/ThrowHelper.Guard.Tasks.cs} (100%)
 create mode 100644 Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
 delete mode 100644 Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Collection.Generic.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.Collection.Generic.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Collection.Generic.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Generic.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Numeric.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.Comparable.Numeric.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Numeric.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.IO.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.IO.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.IO.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.String.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Tasks.cs
similarity index 100%
rename from Microsoft.Toolkit/Diagnostics/ThrowHelper.Tasks.cs
rename to Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Tasks.cs
diff --git a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
new file mode 100644
index 00000000000..0ba836dc488
--- /dev/null
+++ b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
@@ -0,0 +1,231 @@
+// 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.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using Microsoft.Toolkit.Extensions;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Diagnostics
+{
+    /// <summary>
+    /// Helper methods to efficiently throw exceptions.
+    /// </summary>
+    public static partial class ThrowHelper
+    {
+        /// <summary>
+        /// Returns a formatted representation of the input value.
+        /// </summary>
+        /// <param name="obj">The input <see cref="object"/> to format.</param>
+        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
+        [Pure]
+        private static string ToAssertString(this object? obj)
+        {
+            return obj switch
+            {
+                string _ => $"\"{obj}\"",
+                null => "null",
+                _ => $"<{obj}>"
+            };
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="class"/>) fails.
+        /// </summary>
+        /// <typeparam name="T">The type of the input value.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
+            where T : class
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be null, was {value.ToAssertString()} ({value.GetType().ToTypeString()})");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="struct"/>) fails.
+        /// </summary>
+        /// <typeparam name="T">The type of the input value.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
+            where T : struct
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T?).ToTypeString()}) must be null, was {value.ToAssertString()} ({typeof(T).ToTypeString()})");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentNullException"/> when <see cref="Guard.IsNotNull{T}(T,string)"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of the input value.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
+        {
+            ThrowArgumentNullException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be not null)");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsOfType{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of the input value.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of the input value.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsOfType"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type being checked against.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotAssignableToType{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type being checked against.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsBitwiseEqualTo{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of input values being compared.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
+            where T : unmanaged
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsReferenceEqualTo{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of input value being compared.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
+            where T : class
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be the same instance as the target object");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsReferenceNotEqualTo{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of input value being compared.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
+            where T : class
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be the same instance as the target object");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string)"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsTrue(string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string,string)"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsTrue(string name, string message)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false: {message.ToAssertString()}");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string)"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsFalse(string name)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string,string)"/> fails.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForIsFalse(string name, string message)
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true: {message.ToAssertString()}");
+        }
+    }
+}
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
deleted file mode 100644
index 103c3ef12ad..00000000000
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.ThrowExceptions.cs
+++ /dev/null
@@ -1,685 +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 System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-#nullable enable
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to efficiently throw exceptions.
-    /// </summary>
-    public static partial class ThrowHelper
-    {
-        /// <summary>
-        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowArrayTypeMismatchException(string message)
-        {
-            throw new ArrayTypeMismatchException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArrayTypeMismatchException(string message, Exception innerException)
-        {
-            throw new ArrayTypeMismatchException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentException(string message)
-        {
-            throw new ArgumentException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentException(string message, Exception innerException)
-        {
-            throw new ArgumentException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentException(string name, string message)
-        {
-            throw new ArgumentException(message, name);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentException(string name, string message, Exception innerException)
-        {
-            throw new ArgumentException(message, name, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentNullException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentNullException(string name)
-        {
-            throw new ArgumentNullException(name);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentNullException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentNullException(string name, Exception innerException)
-        {
-            throw new ArgumentNullException(name, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentNullException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentNullException(string name, string message)
-        {
-            throw new ArgumentNullException(name, message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeException(string name)
-        {
-            throw new ArgumentOutOfRangeException(name);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeException(string name, Exception innerException)
-        {
-            throw new ArgumentOutOfRangeException(name, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeException(string name, string message)
-        {
-            throw new ArgumentOutOfRangeException(name, message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
-        /// </summary>
-        /// <param name="name">The argument name.</param>
-        /// <param name="value">The current argument value.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
-        {
-            throw new ArgumentOutOfRangeException(name, value, message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ExternalException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowExternalException(string message)
-        {
-            throw new ExternalException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ExternalException"/>.
-        /// </summary>
-        /// <param name="message">The argument name.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowExternalException(string message, Exception innerException)
-        {
-            throw new ExternalException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ExternalException"/>.
-        /// </summary>
-        /// <param name="message">The argument name.</param>
-        /// <param name="error">The HRESULT of the errror to include.</param>
-        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowExternalException(string message, int error)
-        {
-            throw new ExternalException(message, error);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="FormatException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowFormatException(string message)
-        {
-            throw new FormatException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="FormatException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowFormatException(string message, Exception innerException)
-        {
-            throw new FormatException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InsufficientMemoryException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInsufficientMemoryException(string message)
-        {
-            throw new InsufficientMemoryException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InsufficientMemoryException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInsufficientMemoryException(string message, Exception innerException)
-        {
-            throw new InsufficientMemoryException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InvalidDataException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidDataException(string message)
-        {
-            throw new InvalidDataException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InvalidDataException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidDataException(string message, Exception innerException)
-        {
-            throw new InvalidDataException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InvalidOperationException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidOperationException(string message)
-        {
-            throw new InvalidOperationException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="InvalidOperationException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidOperationException(string message, Exception innerException)
-        {
-            throw new InvalidOperationException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="LockRecursionException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowLockRecursionException(string message)
-        {
-            throw new LockRecursionException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="LockRecursionException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowLockRecursionException(string message, Exception innerException)
-        {
-            throw new LockRecursionException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingFieldException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingFieldException(string message)
-        {
-            throw new MissingFieldException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingFieldException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingFieldException(string message, Exception innerException)
-        {
-            throw new MissingFieldException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingFieldException"/>.
-        /// </summary>
-        /// <param name="className">The target class being inspected.</param>
-        /// <param name="fieldName">The target field being retrieved.</param>
-        /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingFieldException(string className, string fieldName)
-        {
-            throw new MissingFieldException(className, fieldName);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMemberException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMemberException(string message)
-        {
-            throw new MissingMemberException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMemberException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMemberException(string message, Exception innerException)
-        {
-            throw new MissingMemberException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMemberException"/>.
-        /// </summary>
-        /// <param name="className">The target class being inspected.</param>
-        /// <param name="memberName">The target member being retrieved.</param>
-        /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMemberException(string className, string memberName)
-        {
-            throw new MissingMemberException(className, memberName);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMethodException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMethodException(string message)
-        {
-            throw new MissingMethodException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMethodException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMethodException(string message, Exception innerException)
-        {
-            throw new MissingMethodException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMethodException"/>.
-        /// </summary>
-        /// <param name="className">The target class being inspected.</param>
-        /// <param name="methodName">The target method being retrieved.</param>
-        /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMethodException(string className, string methodName)
-        {
-            throw new MissingMethodException(className, methodName);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="NotSupportedException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowNotSupportedException(string message)
-        {
-            throw new NotSupportedException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="NotSupportedException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowNotSupportedException(string message, Exception innerException)
-        {
-            throw new NotSupportedException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ObjectDisposedException"/>.
-        /// </summary>
-        /// <param name="objectName">The name of the disposed object.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowObjectDisposedException(string objectName)
-        {
-            throw new ObjectDisposedException(objectName);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ObjectDisposedException"/>.
-        /// </summary>
-        /// <param name="objectName">The name of the disposed object.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowObjectDisposedException(string objectName, Exception innerException)
-        {
-            throw new ObjectDisposedException(objectName, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="ObjectDisposedException"/>.
-        /// </summary>
-        /// <param name="objectName">The name of the disposed object.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowObjectDisposedException(string objectName, string message)
-        {
-            throw new ObjectDisposedException(objectName, message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="OperationCanceledException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException(string message)
-        {
-            throw new OperationCanceledException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="OperationCanceledException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException(string message, Exception innerException)
-        {
-            throw new OperationCanceledException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="OperationCanceledException"/>.
-        /// </summary>
-        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
-        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException(CancellationToken token)
-        {
-            throw new OperationCanceledException(token);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="OperationCanceledException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
-        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException(string message, CancellationToken token)
-        {
-            throw new OperationCanceledException(message, token);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="OperationCanceledException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
-        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
-        {
-            throw new OperationCanceledException(message, innerException, token);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="PlatformNotSupportedException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowPlatformNotSupportedException(string message)
-        {
-            throw new PlatformNotSupportedException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="PlatformNotSupportedException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowPlatformNotSupportedException(string message, Exception innerException)
-        {
-            throw new PlatformNotSupportedException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="SynchronizationLockException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowSynchronizationLockException(string message)
-        {
-            throw new SynchronizationLockException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="SynchronizationLockException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowSynchronizationLockException(string message, Exception innerException)
-        {
-            throw new SynchronizationLockException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="TimeoutException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowTimeoutException(string message)
-        {
-            throw new TimeoutException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="TimeoutException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowTimeoutException(string message, Exception innerException)
-        {
-            throw new TimeoutException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="UnauthorizedAccessException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowUnauthorizedAccessException(string message)
-        {
-            throw new UnauthorizedAccessException(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="UnauthorizedAccessException"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowUnauthorizedAccessException(string message, Exception innerException)
-        {
-            throw new UnauthorizedAccessException(message, innerException);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="Win32Exception"/>.
-        /// </summary>
-        /// <param name="error">The Win32 error code associated with this exception.</param>
-        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowWin32Exception(int error)
-        {
-            throw new Win32Exception(error);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="Win32Exception"/>.
-        /// </summary>
-        /// <param name="error">The Win32 error code associated with this exception.</param>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowWin32Exception(int error, string message)
-        {
-            throw new Win32Exception(error, message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="Win32Exception"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowWin32Exception(string message)
-        {
-            throw new Win32Exception(message);
-        }
-
-        /// <summary>
-        /// Throws a new <see cref="Win32Exception"/>.
-        /// </summary>
-        /// <param name="message">The message to include in the exception.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
-        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
-        [DoesNotReturn]
-        public static void ThrowWin32Exception(string message, Exception innerException)
-        {
-            throw new Win32Exception(message, innerException);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index 0ba836dc488..103c3ef12ad 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -3,10 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Extensions;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
 
 #nullable enable
 
@@ -18,214 +19,667 @@ namespace Microsoft.Toolkit.Diagnostics
     public static partial class ThrowHelper
     {
         /// <summary>
-        /// Returns a formatted representation of the input value.
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
         /// </summary>
-        /// <param name="obj">The input <see cref="object"/> to format.</param>
-        /// <returns>A formatted representation of <paramref name="obj"/> to display in error messages.</returns>
-        [Pure]
-        private static string ToAssertString(this object? obj)
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArrayTypeMismatchException(string message)
+        {
+            throw new ArrayTypeMismatchException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArrayTypeMismatchException(string message, Exception innerException)
+        {
+            throw new ArrayTypeMismatchException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string message)
+        {
+            throw new ArgumentException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string message, Exception innerException)
+        {
+            throw new ArgumentException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string name, string message)
+        {
+            throw new ArgumentException(message, name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentException(string name, string message, Exception innerException)
+        {
+            throw new ArgumentException(message, name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentNullException(string name)
+        {
+            throw new ArgumentNullException(name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentNullException(string name, Exception innerException)
+        {
+            throw new ArgumentNullException(name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentNullException(string name, string message)
+        {
+            throw new ArgumentNullException(name, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name)
+        {
+            throw new ArgumentOutOfRangeException(name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name, Exception innerException)
+        {
+            throw new ArgumentOutOfRangeException(name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name, string message)
+        {
+            throw new ArgumentOutOfRangeException(name, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <param name="name">The argument name.</param>
+        /// <param name="value">The current argument value.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowArgumentOutOfRangeException(string name, object value, string message)
+        {
+            throw new ArgumentOutOfRangeException(name, value, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message)
+        {
+            throw new ExternalException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message, Exception innerException)
+        {
+            throw new ExternalException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="error">The HRESULT of the errror to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowExternalException(string message, int error)
+        {
+            throw new ExternalException(message, error);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowFormatException(string message)
+        {
+            throw new FormatException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowFormatException(string message, Exception innerException)
+        {
+            throw new FormatException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInsufficientMemoryException(string message)
+        {
+            throw new InsufficientMemoryException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInsufficientMemoryException(string message, Exception innerException)
+        {
+            throw new InsufficientMemoryException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidDataException(string message)
+        {
+            throw new InvalidDataException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidDataException(string message, Exception innerException)
+        {
+            throw new InvalidDataException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidOperationException(string message)
+        {
+            throw new InvalidOperationException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowInvalidOperationException(string message, Exception innerException)
+        {
+            throw new InvalidOperationException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowLockRecursionException(string message)
+        {
+            throw new LockRecursionException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowLockRecursionException(string message, Exception innerException)
+        {
+            throw new LockRecursionException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string message)
+        {
+            throw new MissingFieldException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string message, Exception innerException)
+        {
+            throw new MissingFieldException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="fieldName">The target field being retrieved.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingFieldException(string className, string fieldName)
+        {
+            throw new MissingFieldException(className, fieldName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string message)
+        {
+            throw new MissingMemberException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string message, Exception innerException)
+        {
+            throw new MissingMemberException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="memberName">The target member being retrieved.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMemberException(string className, string memberName)
+        {
+            throw new MissingMemberException(className, memberName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string message)
+        {
+            throw new MissingMethodException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string message, Exception innerException)
+        {
+            throw new MissingMethodException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="methodName">The target method being retrieved.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowMissingMethodException(string className, string methodName)
+        {
+            throw new MissingMethodException(className, methodName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowNotSupportedException(string message)
+        {
+            throw new NotSupportedException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowNotSupportedException(string message, Exception innerException)
+        {
+            throw new NotSupportedException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowObjectDisposedException(string objectName)
+        {
+            throw new ObjectDisposedException(objectName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowObjectDisposedException(string objectName, Exception innerException)
         {
-            return obj switch
-            {
-                string _ => $"\"{obj}\"",
-                null => "null",
-                _ => $"<{obj}>"
-            };
+            throw new ObjectDisposedException(objectName, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="class"/>) fails.
+        /// Throws a new <see cref="ObjectDisposedException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
-            where T : class
+        public static void ThrowObjectDisposedException(string objectName, string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be null, was {value.ToAssertString()} ({value.GetType().ToTypeString()})");
+            throw new ObjectDisposedException(objectName, message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNull{T}(T,string)"/> (where <typeparamref name="T"/> is <see langword="struct"/>) fails.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
-            where T : struct
+        public static void ThrowOperationCanceledException(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T?).ToTypeString()}) must be null, was {value.ToAssertString()} ({typeof(T).ToTypeString()})");
+            throw new OperationCanceledException(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> when <see cref="Guard.IsNotNull{T}(T,string)"/> fails.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
+        public static void ThrowOperationCanceledException(string message, Exception innerException)
         {
-            ThrowArgumentNullException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be not null)");
+            throw new OperationCanceledException(message, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsOfType{T}"/> fails.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
+        public static void ThrowOperationCanceledException(CancellationToken token)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new OperationCanceledException(token);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType{T}"/> fails.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
+        public static void ThrowOperationCanceledException(string message, CancellationToken token)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new OperationCanceledException(message, token);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsOfType"/> fails.
+        /// Throws a new <see cref="OperationCanceledException"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
+        public static void ThrowOperationCanceledException(string message, Exception innerException, CancellationToken token)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new OperationCanceledException(message, innerException, token);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType"/> fails.
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
+        public static void ThrowPlatformNotSupportedException(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new PlatformNotSupportedException(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType{T}"/> fails.
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
         /// </summary>
-        /// <typeparam name="T">The type being checked against.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
+        public static void ThrowPlatformNotSupportedException(string message, Exception innerException)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new PlatformNotSupportedException(message, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotAssignableToType{T}"/> fails.
+        /// Throws a new <see cref="SynchronizationLockException"/>.
         /// </summary>
-        /// <typeparam name="T">The type being checked against.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
+        public static void ThrowSynchronizationLockException(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new SynchronizationLockException(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
+        /// Throws a new <see cref="SynchronizationLockException"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
+        public static void ThrowSynchronizationLockException(string message, Exception innerException)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new SynchronizationLockException(message, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
+        /// Throws a new <see cref="TimeoutException"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
+        public static void ThrowTimeoutException(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
+            throw new TimeoutException(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsBitwiseEqualTo{T}"/> fails.
+        /// Throws a new <see cref="TimeoutException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of input values being compared.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
-            where T : unmanaged
+        public static void ThrowTimeoutException(string message, Exception innerException)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");
+            throw new TimeoutException(message, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsReferenceEqualTo{T}"/> fails.
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of input value being compared.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
-            where T : class
+        public static void ThrowUnauthorizedAccessException(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must be the same instance as the target object");
+            throw new UnauthorizedAccessException(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsReferenceNotEqualTo{T}"/> fails.
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
         /// </summary>
-        /// <typeparam name="T">The type of input value being compared.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
-            where T : class
+        public static void ThrowUnauthorizedAccessException(string message, Exception innerException)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be the same instance as the target object");
+            throw new UnauthorizedAccessException(message, innerException);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string)"/> fails.
+        /// Throws a new <see cref="Win32Exception"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsTrue(string name)
+        public static void ThrowWin32Exception(int error)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false");
+            throw new Win32Exception(error);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string,string)"/> fails.
+        /// Throws a new <see cref="Win32Exception"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsTrue(string name, string message)
+        public static void ThrowWin32Exception(int error, string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be true, was false: {message.ToAssertString()}");
+            throw new Win32Exception(error, message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string)"/> fails.
+        /// Throws a new <see cref="Win32Exception"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsFalse(string name)
+        public static void ThrowWin32Exception(string message)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true");
+            throw new Win32Exception(message);
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string,string)"/> fails.
+        /// Throws a new <see cref="Win32Exception"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsFalse(string name, string message)
+        public static void ThrowWin32Exception(string message, Exception innerException)
         {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must be false, was true: {message.ToAssertString()}");
+            throw new Win32Exception(message, innerException);
         }
     }
 }

From 73e5adbf4292ec99ff456c263cbc617304f45e27 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 27 Jul 2020 01:50:34 +0200
Subject: [PATCH 321/595] Minor codegen improvements

---
 .../Buffers/StringPool.cs                     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index d7ead9e3612..ad9e024af25 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -420,9 +420,9 @@ public object SyncRoot
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public unsafe void Add(string value, int hashcode)
             {
-                ref string? target = ref TryGet(value.AsSpan(), hashcode);
+                ref string target = ref TryGet(value.AsSpan(), hashcode);
 
-                if (Unsafe.AreSame(ref target!, ref Unsafe.AsRef<string>(null)))
+                if (Unsafe.AreSame(ref target, ref Unsafe.AsRef<string>(null)))
                 {
                     Insert(value, hashcode);
                 }
@@ -439,9 +439,11 @@ public unsafe void Add(string value, int hashcode)
             /// <param name="hashcode">The precomputed hashcode for <paramref name="value"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="value"/>.</returns>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public string GetOrAdd(string value, int hashcode)
+            public unsafe string GetOrAdd(string value, int hashcode)
             {
-                if (TryGet(value.AsSpan(), hashcode, out string? result))
+                ref string result = ref TryGet(value.AsSpan(), hashcode);
+
+                if (!Unsafe.AreSame(ref result, ref Unsafe.AsRef<string>(null)))
                 {
                     return result;
                 }
@@ -458,11 +460,13 @@ public string GetOrAdd(string value, int hashcode)
             /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
             /// <returns>A <see cref="string"/> instance with the contents of <paramref name="span"/>, cached if possible.</returns>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
+            public unsafe string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
             {
-                if (TryGet(span, hashcode, out string? result))
+                ref string result = ref TryGet(span, hashcode);
+
+                if (!Unsafe.AreSame(ref result, ref Unsafe.AsRef<string>(null)))
                 {
-                    return result!;
+                    return result;
                 }
 
                 string value = span.ToString();
@@ -482,9 +486,9 @@ public string GetOrAdd(ReadOnlySpan<char> span, int hashcode)
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public unsafe bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] out string? value)
             {
-                ref string? result = ref TryGet(span, hashcode);
+                ref string result = ref TryGet(span, hashcode);
 
-                if (!Unsafe.AreSame(ref result!, ref Unsafe.AsRef<string>(null)))
+                if (!Unsafe.AreSame(ref result, ref Unsafe.AsRef<string>(null)))
                 {
                     value = result;
 
@@ -517,7 +521,7 @@ public void Reset()
             /// <param name="hashcode">The precomputed hashcode for <paramref name="span"/>.</param>
             /// <returns>A reference to the slot where the target <see cref="string"/> instance could be.</returns>
             [MethodImpl(MethodImplOptions.NoInlining)]
-            private unsafe ref string? TryGet(ReadOnlySpan<char> span, int hashcode)
+            private unsafe ref string TryGet(ReadOnlySpan<char> span, int hashcode)
             {
                 ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
                 ref MapEntry entry = ref Unsafe.AsRef<MapEntry>(null);
@@ -536,11 +540,11 @@ public void Reset()
                     {
                         UpdateTimestamp(ref entry.HeapIndex);
 
-                        return ref entry.Value;
+                        return ref entry.Value!;
                     }
                 }
 
-                return ref Unsafe.AsRef<string?>(null);
+                return ref Unsafe.AsRef<string>(null);
             }
 
             /// <summary>

From 4238e6e5b09d88a25c42616d0871f3f234165313 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 28 Jul 2020 01:47:08 +0200
Subject: [PATCH 322/595] Code tweaks to support #3293

---
 Microsoft.Toolkit/Extensions/TaskExtensions.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index a24c4855ae2..2f593099df5 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -44,11 +44,21 @@ public static class TaskExtensions
                 Type taskType = task.GetType();
 
                 // Check if the task is actually some Task<T>
-                if (taskType.IsGenericType &&
+                if (
+#if NETSTANDARD1_4
+                    taskType.GetTypeInfo().IsGenericType &&
+#else
+                    taskType.IsGenericType &&
+#endif
                     taskType.GetGenericTypeDefinition() == typeof(Task<>))
                 {
                     // Get the Task<T>.Result property
-                    PropertyInfo propertyInfo = taskType.GetProperty(nameof(Task<object>.Result));
+                    PropertyInfo propertyInfo =
+#if NETSTANDARD1_4
+                        taskType.GetRuntimeProperty(nameof(Task<object>.Result));
+#else
+                        taskType.GetProperty(nameof(Task<object>.Result));
+#endif
 
                     // Finally retrieve the result
                     return propertyInfo!.GetValue(task);

From 670c8338e7040acade36f87b80c6e0a1f2c55596 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 28 Jul 2020 01:53:30 +0200
Subject: [PATCH 323/595] Code tweaks to support #3293

---
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index 103c3ef12ad..2338f17a31d 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -6,7 +6,9 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+#if !NETSTANDARD1_4
 using System.Runtime.InteropServices;
+#endif
 using System.Threading;
 
 #nullable enable
@@ -172,6 +174,7 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
             throw new ArgumentOutOfRangeException(name, value, message);
         }
 
+#if !NETSTANDARD1_4
         /// <summary>
         /// Throws a new <see cref="ExternalException"/>.
         /// </summary>
@@ -206,6 +209,7 @@ public static void ThrowExternalException(string message, int error)
         {
             throw new ExternalException(message, error);
         }
+#endif
 
         /// <summary>
         /// Throws a new <see cref="FormatException"/>.
@@ -230,6 +234,7 @@ public static void ThrowFormatException(string message, Exception innerException
             throw new FormatException(message, innerException);
         }
 
+#if !NETSTANDARD1_4
         /// <summary>
         /// Throws a new <see cref="InsufficientMemoryException"/>.
         /// </summary>
@@ -252,6 +257,7 @@ public static void ThrowInsufficientMemoryException(string message, Exception in
         {
             throw new InsufficientMemoryException(message, innerException);
         }
+#endif
 
         /// <summary>
         /// Throws a new <see cref="InvalidDataException"/>.
@@ -345,6 +351,7 @@ public static void ThrowMissingFieldException(string message, Exception innerExc
             throw new MissingFieldException(message, innerException);
         }
 
+#if !NETSTANDARD1_4
         /// <summary>
         /// Throws a new <see cref="MissingFieldException"/>.
         /// </summary>
@@ -356,6 +363,7 @@ public static void ThrowMissingFieldException(string className, string fieldName
         {
             throw new MissingFieldException(className, fieldName);
         }
+#endif
 
         /// <summary>
         /// Throws a new <see cref="MissingMemberException"/>.
@@ -380,6 +388,7 @@ public static void ThrowMissingMemberException(string message, Exception innerEx
             throw new MissingMemberException(message, innerException);
         }
 
+#if !NETSTANDARD1_4
         /// <summary>
         /// Throws a new <see cref="MissingMemberException"/>.
         /// </summary>
@@ -391,6 +400,7 @@ public static void ThrowMissingMemberException(string className, string memberNa
         {
             throw new MissingMemberException(className, memberName);
         }
+#endif
 
         /// <summary>
         /// Throws a new <see cref="MissingMethodException"/>.
@@ -415,6 +425,7 @@ public static void ThrowMissingMethodException(string message, Exception innerEx
             throw new MissingMethodException(message, innerException);
         }
 
+#if !NETSTANDARD1_4
         /// <summary>
         /// Throws a new <see cref="MissingMethodException"/>.
         /// </summary>
@@ -426,6 +437,7 @@ public static void ThrowMissingMethodException(string className, string methodNa
         {
             throw new MissingMethodException(className, methodName);
         }
+#endif
 
         /// <summary>
         /// Throws a new <see cref="NotSupportedException"/>.

From 59ac91e24dab09d40f24fbcd97b05c7ef55aecab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 29 Jul 2020 18:43:17 +0200
Subject: [PATCH 324/595] Fixed min-heap violation on timestamp overflow

---
 .../Buffers/StringPool.cs                     | 60 +++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index ad9e024af25..bafaf79665f 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -677,16 +677,38 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                 ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
                 ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
                 ref HeapEntry root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
+                uint timestamp = this.timestamp;
+
+                // Check if incrementing the current timestamp for the heap node to update
+                // would result in an overflow. If that happened, we could end up violating
+                // the min-heap property (the value of each node has to always be <= than that
+                // of its child nodes), eg. if we were updating a node that was not the root.
+                // In that scenario, we could end up with a node somewhere along the heap with
+                // a value lower than that of its parent node (as the timestamp would be 0).
+                // To guard against this, we just check the current timestamp value, and if
+                // the maximum value has been reached, we reinitialize the entire heap. This
+                // is done in a non-inlined call, so we don't increase the codegen size in this
+                // method. The reinitialization simply traverses the heap in breadth-first order
+                // (ie. level by level), and assigns incrementing timestamp to all nodes starting
+                // from 0. The value of the current timestamp is then just set to the current size.
+                if (timestamp == uint.MaxValue)
+                {
+                    // We use a goto here as this path is very rarely taken. Doing so
+                    // causes the generated asm to contain a forward jump to the fallback
+                    // path if this branch is taken, whereas the normal execution path will
+                    // not need to execute any jumps at all. This is done to reduce the overhead
+                    // introduced by this check in all the invocations where this point is not reached.
+                    goto Fallback;
+                }
+
+                Downheap:
 
                 // Assign a new timestamp to the target heap node. We use a
                 // local incremental timestamp instead of using the system timer
                 // as this greatly reduces the overhead and the time spent in system calls.
                 // The uint type provides a large enough range and it's unlikely users would ever
                 // exhaust it anyway (especially considering each map has a separate counter).
-                // Furthermore, even if this happened, the only consequence would be some newly
-                // used string instances potentially being discarded too early, but the map
-                // itself would still continue to work fine (the heap would remain balanced).
-                root.Timestamp = ++this.timestamp;
+                root.Timestamp = this.timestamp = timestamp + 1;
 
                 // Once the timestamp is updated (which will cause the heap to become
                 // unbalanced), start a sift down loop to balance the heap again.
@@ -750,6 +772,36 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                     root = minimum;
                     minimum = temp;
                 }
+
+                Fallback:
+
+                UpdateAllTimestamps();
+
+                // After having updated all the timestamps, if the heap contains N items, the
+                // node in the bottom right corner will have a value of N - 1. Since the timestamp
+                // is incremented by 1 before starting the downheap execution, here we simply
+                // update the local timestamp to be N - 1, so that the code above will set the
+                // timestamp of the node currently being updated to exactly N.
+                timestamp = (uint)(count - 1);
+
+                goto Downheap;
+            }
+
+            /// <summary>
+            /// Updates the timestamp of all the current heap nodes in incrementing order.
+            /// The heap is always guaranteed to be complete binary tree, so when it contains
+            /// a given number of nodes, those are all contiguous from the start of the array.
+            /// </summary>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private unsafe void UpdateAllTimestamps()
+            {
+                int count = this.count;
+                ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
+
+                for (int i = 0; i < count; i++)
+                {
+                    Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)i).Timestamp = (uint)i;
+                }
             }
         }
 

From 1754186b8ca3d4351029cb96d91ef6c781da2ca1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 29 Jul 2020 19:05:21 +0200
Subject: [PATCH 325/595] Improved unit test for failed constructor

---
 .../Buffers/Test_StringPool.cs                   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 8afa8b87d9c..ea314abc9ba 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -52,12 +52,20 @@ public void Test_StringPool_Cctor_Ok(int minimumSize, int x, int y, int size)
         [DataRow(0)]
         [DataRow(-3248234)]
         [DataRow(int.MinValue)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
         public void Test_StringPool_Cctor_Fail(int size)
         {
-            var pool = new StringPool(size);
-
-            Assert.Fail();
+            try
+            {
+                var pool = new StringPool(size);
+
+                Assert.Fail();
+            }
+            catch (ArgumentOutOfRangeException e)
+            {
+                var cctor = typeof(StringPool).GetConstructor(new[] { typeof(int) });
+
+                Assert.AreEqual(cctor.GetParameters()[0].Name, e.ParamName);
+            }
         }
 
         [TestCategory("StringPool")]

From 533973c9eaa6f022b75308c3ab198addff0971ab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 29 Jul 2020 19:13:26 +0200
Subject: [PATCH 326/595] Minor optimization (removed duplicate ref
 computation)

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index bafaf79665f..4a7e31d44dd 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -714,8 +714,6 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                 // unbalanced), start a sift down loop to balance the heap again.
                 while (true)
                 {
-                    root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
-
                     // The heap is 0-based (so that the array length can remain the same
                     // as the power of 2 value used for the other arrays in this type).
                     // This means that children of each node are at positions:
@@ -771,6 +769,9 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
 
                     root = minimum;
                     minimum = temp;
+
+                    // Update the reference to the root node
+                    root = ref Unsafe.Add(ref heapEntriesRef, (IntPtr)(void*)(uint)currentIndex);
                 }
 
                 Fallback:

From 1941370b0a0c673a2d874c207bac70909c99cbbe Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 29 Jul 2020 21:02:34 +0200
Subject: [PATCH 327/595] Added unit test for overflow fix

---
 .../Buffers/Test_StringPool.cs                | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index ea314abc9ba..43f08350847 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using Microsoft.Toolkit.HighPerformance.Buffers;
@@ -235,5 +236,66 @@ public void Test_StringPool_GetOrAdd_Encoding_Misc()
 
             Assert.AreSame(windowsCommunityToolkit2, windowsCommunityToolkit3);
         }
+
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_GetOrAdd_Overflow()
+        {
+            var pool = new StringPool(32);
+
+            // Fill the pool
+            for (int i = 0; i < 4096; i++)
+            {
+                _ = pool.GetOrAdd(i.ToString());
+            }
+
+            // Force an overflow
+            string text = "Hello world";
+
+            for (uint i = 0; i < uint.MaxValue; i++)
+            {
+                _ = pool.GetOrAdd(text);
+            }
+
+            // Get the buckets
+            Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
+
+            Type
+                bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, Microsoft.Toolkit.HighPerformance"),
+                heapEntryType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap+HeapEntry, Microsoft.Toolkit.HighPerformance");
+
+            foreach (var map in maps)
+            {
+                // Get the heap for each bucket
+                Array heapEntries = (Array)bucketType.GetField("heapEntries", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(map);
+                FieldInfo fieldInfo = heapEntryType.GetField("Timestamp");
+
+                // Extract the array with the timestamps in the heap nodes
+                uint[] array = heapEntries.Cast<object>().Select(entry => (uint)fieldInfo.GetValue(entry)).ToArray();
+
+                static bool IsMinHeap(uint[] array)
+                {
+                    for (int i = 0; i < array.Length; i++)
+                    {
+                        int
+                            left = (i * 2) + 1,
+                            right = (i * 2) + 2;
+
+                        if ((left < array.Length &&
+                             array[left] <= array[i]) ||
+                            (right < array.Length &&
+                             array[right] <= array[i]))
+                        {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                }
+
+                // Verify that the current heap is indeed valid after the overflow
+                Assert.IsTrue(IsMinHeap(array));
+            }
+        }
     }
 }

From 92ed638165360738e9c3f891504df97a87bdaf91 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 01:49:11 +0200
Subject: [PATCH 328/595] Reduced runtime of overflow unit test

---
 .../Buffers/Test_StringPool.cs                | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 43f08350847..d8ea7f6b2cf 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -249,20 +249,28 @@ public void Test_StringPool_GetOrAdd_Overflow()
                 _ = pool.GetOrAdd(i.ToString());
             }
 
-            // Force an overflow
-            string text = "Hello world";
+            // Get the buckets
+            Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
 
-            for (uint i = 0; i < uint.MaxValue; i++)
+            Type bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, Microsoft.Toolkit.HighPerformance");
+            FieldInfo timestampInfo = bucketType.GetField("timestamp", BindingFlags.Instance | BindingFlags.NonPublic);
+
+            // Force the timestamp to be the maximum value, or the test would take too long
+            for (int i = 0; i < maps.LongLength; i++)
             {
-                _ = pool.GetOrAdd(text);
+                object map = maps.GetValue(i);
+
+                timestampInfo.SetValue(map, uint.MaxValue);
+
+                maps.SetValue(map, i);
             }
 
-            // Get the buckets
-            Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(pool);
+            // Force an overflow
+            string text = "Hello world";
+
+            _ = pool.GetOrAdd(text);
 
-            Type
-                bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, Microsoft.Toolkit.HighPerformance"),
-                heapEntryType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap+HeapEntry, Microsoft.Toolkit.HighPerformance");
+            Type heapEntryType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap+HeapEntry, Microsoft.Toolkit.HighPerformance");
 
             foreach (var map in maps)
             {

From 5def54982936433dfdd3c5e29ce953beaf000877 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 13:30:43 +0200
Subject: [PATCH 329/595] Fixed a typo

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 4a7e31d44dd..c1374077452 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -689,7 +689,7 @@ private unsafe void UpdateTimestamp(ref int heapIndex)
                 // the maximum value has been reached, we reinitialize the entire heap. This
                 // is done in a non-inlined call, so we don't increase the codegen size in this
                 // method. The reinitialization simply traverses the heap in breadth-first order
-                // (ie. level by level), and assigns incrementing timestamp to all nodes starting
+                // (ie. level by level), and assigns incrementing timestamps to all nodes starting
                 // from 0. The value of the current timestamp is then just set to the current size.
                 if (timestamp == uint.MaxValue)
                 {

From cd7a9815d970773926c3450f93ddbcd5ec3b4464 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 20:36:53 +0200
Subject: [PATCH 330/595] Switched property name args to string?

---
 .../ComponentModel/ObservableObject.cs        | 20 +++++++++----------
 .../ComponentModel/ObservableRecipient.cs     | 10 +++++-----
 .../Messages/PropertyChangedMessage{T}.cs     |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index ed947566d6a..564e90b8bc3 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -34,7 +34,7 @@ public abstract class ObservableObject : INotifyPropertyChanged, INotifyProperty
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <remarks>The base implementation only raises the <see cref="PropertyChanged"/> event.</remarks>
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null!)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -45,7 +45,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         /// </summary>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <remarks>The base implementation only raises the <see cref="PropertyChanging"/> event.</remarks>
-        protected virtual void OnPropertyChanging([CallerMemberName] string propertyName = null!)
+        protected virtual void OnPropertyChanging([CallerMemberName] string? propertyName = null)
         {
             PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
         }
@@ -64,7 +64,7 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(ref field, newValue, EqualityComparer<T>.Default, propertyName);
         }
@@ -81,7 +81,7 @@ protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
         {
             if (comparer.Equals(field, newValue))
             {
@@ -115,7 +115,7 @@ protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comp
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, propertyName);
         }
@@ -133,7 +133,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, [Calle
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string? propertyName = null)
         {
             if (comparer.Equals(oldValue, newValue))
             {
@@ -201,7 +201,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// be used to access properties of a model that is directly stored as a property of the current instance.
         /// Additionally, this method can only be used if the wrapped item is a reference type.
         /// </remarks>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, propertyName);
         }
@@ -219,7 +219,7 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
         {
             PropertyInfo? parentPropertyInfo;
             FieldInfo? parentFieldInfo = null;
@@ -292,7 +292,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string propertyName = null!)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
@@ -324,7 +324,7 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string propertyName = null!)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
             if (ReferenceEquals(field, newValue))
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index c997e0188bc..6b4bdd401e9 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -114,7 +114,7 @@ protected virtual void OnDeactivated()
         /// You should override this method if you wish to customize the channel being
         /// used to send the message (eg. if you need to use a specific token for the channel).
         /// </remarks>
-        protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
+        protected virtual void Broadcast<T>(T oldValue, T newValue, string? propertyName)
         {
             var message = new PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
@@ -138,7 +138,7 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string propertyName)
         /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(ref field, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
         }
@@ -156,7 +156,7 @@ protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMe
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             if (!broadcast)
             {
@@ -195,7 +195,7 @@ protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comp
         /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
         /// are not raised if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, broadcast, propertyName);
         }
@@ -214,7 +214,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool b
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string propertyName = null!)
+        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             if (!broadcast)
             {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index bab5e4b6364..71ac0ebac67 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -24,7 +24,7 @@ public class PropertyChangedMessage<T>
         /// <param name="propertyName">The name of the property that changed.</param>
         /// <param name="oldValue">The value that the property had before the change.</param>
         /// <param name="newValue">The value that the property has after the change.</param>
-        public PropertyChangedMessage(ObservableObject sender, string propertyName, T oldValue, T newValue)
+        public PropertyChangedMessage(ObservableObject sender, string? propertyName, T oldValue, T newValue)
         {
             Sender = sender;
             PropertyName = propertyName;
@@ -40,7 +40,7 @@ public PropertyChangedMessage(ObservableObject sender, string propertyName, T ol
         /// <summary>
         /// Gets the name of the property that changed.
         /// </summary>
-        public string PropertyName { get; }
+        public string? PropertyName { get; }
 
         /// <summary>
         /// Gets the value that the property had before the change.

From 6c8ddde521a295e233f3faf8a301aabbd572ac5b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 20:38:23 +0200
Subject: [PATCH 331/595] Renamed IServiceCollection arg to services

---
 .../DependencyInjection/Ioc.cs                   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index e02e121ec48..e63e7811bda 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -30,9 +30,9 @@ namespace Microsoft.Toolkit.Mvvm.DependencyInjection
     /// Then the services configuration should then be done at startup, by calling one of
     /// the available <see cref="ConfigureServices(IServiceCollection)"/> overloads, like so:
     /// <code>
-    /// Ioc.Default.ConfigureServices(collection =>
+    /// Ioc.Default.ConfigureServices(services =>
     /// {
-    ///     collection.AddSingleton&lt;ILogger, Logger&gt;();
+    ///     services.AddSingleton&lt;ILogger, Logger&gt;();
     /// });
     /// </code>
     /// Finally, you can use the <see cref="Ioc"/> instance (which implements <see cref="IServiceProvider"/>)
@@ -103,20 +103,20 @@ public void ConfigureServices(Action<IServiceCollection> setup, ServiceProviderO
         /// <summary>
         /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
-        /// <param name="collection">The input <see cref="IServiceCollection"/> instance to use.</param>
-        public void ConfigureServices(IServiceCollection collection)
+        /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
+        public void ConfigureServices(IServiceCollection services)
         {
-            ConfigureServices(collection, new ServiceProviderOptions());
+            ConfigureServices(services, new ServiceProviderOptions());
         }
 
         /// <summary>
         /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
-        /// <param name="collection">The input <see cref="IServiceCollection"/> instance to use.</param>
+        /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
         /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
-        public void ConfigureServices(IServiceCollection collection, ServiceProviderOptions options)
+        public void ConfigureServices(IServiceCollection services, ServiceProviderOptions options)
         {
-            ServiceProvider newServices = collection.BuildServiceProvider(options);
+            ServiceProvider newServices = services.BuildServiceProvider(options);
 
             ServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, newServices, null);
 

From 445d7a55c4f9167e07b617533cffe9efc4449b77 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 20:40:46 +0200
Subject: [PATCH 332/595] Changed sender type to object in notification message

---
 .../Messaging/Messages/PropertyChangedMessage{T}.cs         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index 71ac0ebac67..27ae2496668 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
 #pragma warning disable SA1512
 
 // This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
@@ -24,7 +22,7 @@ public class PropertyChangedMessage<T>
         /// <param name="propertyName">The name of the property that changed.</param>
         /// <param name="oldValue">The value that the property had before the change.</param>
         /// <param name="newValue">The value that the property has after the change.</param>
-        public PropertyChangedMessage(ObservableObject sender, string? propertyName, T oldValue, T newValue)
+        public PropertyChangedMessage(object sender, string? propertyName, T oldValue, T newValue)
         {
             Sender = sender;
             PropertyName = propertyName;
@@ -35,7 +33,7 @@ public PropertyChangedMessage(ObservableObject sender, string? propertyName, T o
         /// <summary>
         /// Gets the original sender of the broadcast message.
         /// </summary>
-        public ObservableObject Sender { get; }
+        public object Sender { get; }
 
         /// <summary>
         /// Gets the name of the property that changed.

From ffefa5572440d4d436464f64517e4fa0089207ce Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 20:42:24 +0200
Subject: [PATCH 333/595] Renamed Task.ResultOrDefault extensions

---
 .../Converters/TaskResultConverter.cs         |  2 +-
 .../Extensions/TaskExtensions.cs              |  4 ++--
 .../Extensions/Test_TaskExtensions.cs         | 24 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
index c8944ed824c..c54f4fe18e3 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
@@ -24,7 +24,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is Task task)
             {
-                return task.ResultOrDefault();
+                return task.GetResultOrDefault();
             }
 
             return null;
diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index 2f593099df5..9254f3c6290 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -30,7 +30,7 @@ public static class TaskExtensions
         /// </remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static object? ResultOrDefault(this Task task)
+        public static object? GetResultOrDefault(this Task task)
         {
             // Check if the instance is a completed Task
             if (
@@ -78,7 +78,7 @@ public static class TaskExtensions
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [return: MaybeNull]
-        public static T ResultOrDefault<T>(this Task<T> task)
+        public static T GetResultOrDefault<T>(this Task<T> task)
         {
 #if NETSTANDARD2_1
             return task.IsCompletedSuccessfully ? task.Result : default;
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
index 173e2f3e99b..6754f5214a6 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
@@ -18,23 +18,23 @@ public void Test_TaskExtensions_ResultOrDefault()
         {
             TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
 
-            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
 
             tcs.SetCanceled();
 
-            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
 
             tcs = new TaskCompletionSource<int>();
 
             tcs.SetException(new InvalidOperationException("Test"));
 
-            Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
+            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
 
             tcs = new TaskCompletionSource<int>();
 
             tcs.SetResult(42);
 
-            Assert.AreEqual(42, ((Task)tcs.Task).ResultOrDefault());
+            Assert.AreEqual(42, ((Task)tcs.Task).GetResultOrDefault());
         }
 
         [TestCategory("TaskExtensions")]
@@ -43,23 +43,23 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_Int32()
         {
             TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
 
-            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
 
             tcs.SetCanceled();
 
-            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
 
             tcs = new TaskCompletionSource<int>();
 
             tcs.SetException(new InvalidOperationException("Test"));
 
-            Assert.AreEqual(0, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
 
             tcs = new TaskCompletionSource<int>();
 
             tcs.SetResult(42);
 
-            Assert.AreEqual(42, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(42, tcs.Task.GetResultOrDefault());
         }
 
         [TestCategory("TaskExtensions")]
@@ -68,23 +68,23 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_String()
         {
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
 
-            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
 
             tcs.SetCanceled();
 
-            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
 
             tcs = new TaskCompletionSource<string>();
 
             tcs.SetException(new InvalidOperationException("Test"));
 
-            Assert.AreEqual(null, tcs.Task.ResultOrDefault());
+            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
 
             tcs = new TaskCompletionSource<string>();
 
             tcs.SetResult("Hello world");
 
-            Assert.AreEqual("Hello world", tcs.Task.ResultOrDefault());
+            Assert.AreEqual("Hello world", tcs.Task.GetResultOrDefault());
         }
     }
 }

From ffcc807eec942aa868f61264e3aaf794543af3c5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 30 Jul 2020 20:43:48 +0200
Subject: [PATCH 334/595] Updated package description for ViewModelBase

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

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 43ad4d1a6fe..c76cef22f3e 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -8,7 +8,7 @@
     <Description>
       This package includes Mvvm .NET Standard code only helpers such as:
       - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface.
-      - ViewModelBase: a base class for view-models with built-in minimal dependency injection support.
+      - ObservableRecipient: a base class for observable objects with support for the IMessenger service.
       - RelayCommand: a simple delegate command implementing the ICommand interface.
       - Messenger: a messaging system to exchange messages through different loosely-coupled objects.
       - Ioc: a helper class to configure dependency injection service containers.

From 4a9f9710398e6ef8d36f588cc57b9d9c30a32733 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 1 Aug 2020 00:38:58 +0200
Subject: [PATCH 335/595] Renamed StringPool.Default -> Shared

Done to keep the naming consistent with ArrayPool<T>.Shared
---
 .../Buffers/StringPool.cs                            | 12 +++++++++---
 .../Buffers/Test_StringPool.cs                       | 10 +++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index c1374077452..988e1f44a94 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -31,7 +31,7 @@ namespace Microsoft.Toolkit.HighPerformance.Buffers
     public sealed class StringPool
     {
         /// <summary>
-        /// The size for the <see cref="Default"/> instance.
+        /// The size used by default by the parameterless constructor.
         /// </summary>
         private const int DefaultSize = 2048;
 
@@ -155,9 +155,15 @@ private static int RoundUpPowerOfTwo(int x)
         }
 
         /// <summary>
-        /// Gets the default <see cref="StringPool"/> instance.
+        /// Gets the shared <see cref="StringPool"/> instance.
         /// </summary>
-        public static StringPool Default { get; } = new StringPool();
+        /// <remarks>
+        /// The shared pool provides a singleton, reusable <see cref="StringPool"/> instance that
+        /// can be accessed directly, and that pools <see cref="string"/> instances for the entire
+        /// process. Since <see cref="StringPool"/> is thread-safe, the shared instance can be used
+        /// concurrently by multiple threads without the need for manual synchronization.
+        /// </remarks>
+        public static StringPool Shared { get; } = new StringPool();
 
         /// <summary>
         /// Gets the total number of <see cref="string"/> that can be stored in the current instance.
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index d8ea7f6b2cf..8c1ff9a7436 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -73,9 +73,9 @@ public void Test_StringPool_Cctor_Fail(int size)
         [TestMethod]
         public void Test_StringPool_Add_Empty()
         {
-            StringPool.Default.Add(string.Empty);
+            StringPool.Shared.Add(string.Empty);
 
-            bool found = StringPool.Default.TryGet(ReadOnlySpan<char>.Empty, out string? text);
+            bool found = StringPool.Shared.TryGet(ReadOnlySpan<char>.Empty, out string? text);
 
             Assert.IsTrue(found);
             Assert.AreSame(string.Empty, text);
@@ -130,7 +130,7 @@ public void Test_StringPool_Add_Misc()
         [TestMethod]
         public void Test_StringPool_GetOrAdd_String_Empty()
         {
-            string empty = StringPool.Default.GetOrAdd(string.Empty);
+            string empty = StringPool.Shared.GetOrAdd(string.Empty);
 
             Assert.AreSame(string.Empty, empty);
         }
@@ -166,7 +166,7 @@ public void Test_StringPool_GetOrAdd_String_Misc()
         [TestMethod]
         public void Test_StringPool_GetOrAdd_ReadOnlySpan_Empty()
         {
-            string empty = StringPool.Default.GetOrAdd(ReadOnlySpan<char>.Empty);
+            string empty = StringPool.Shared.GetOrAdd(ReadOnlySpan<char>.Empty);
 
             Assert.AreSame(string.Empty, empty);
         }
@@ -205,7 +205,7 @@ public void Test_StringPool_GetOrAdd_ReadOnlySpan_Misc()
         [TestMethod]
         public void Test_StringPool_GetOrAdd_Encoding_Empty()
         {
-            string empty = StringPool.Default.GetOrAdd(ReadOnlySpan<byte>.Empty, Encoding.ASCII);
+            string empty = StringPool.Shared.GetOrAdd(ReadOnlySpan<byte>.Empty, Encoding.ASCII);
 
             Assert.AreSame(string.Empty, empty);
         }

From 73c52f9a8cee3f77d55d05e780edfd32fd565d6b Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 2 Aug 2020 19:18:48 +1000
Subject: [PATCH 336/595] fix some spelling

---
 Microsoft.Toolkit.HighPerformance/Box{T}.cs   |  2 +-
 .../Extensions/ArrayExtensions.2D.cs          |  4 +--
 .../Extensions/MemoryExtensions.cs            |  2 +-
 .../Extensions/ObjectExtensions.cs            |  4 +--
 .../Extensions/ReadOnlyMemoryExtensions.cs    |  2 +-
 .../Extensions/ReadOnlySpanExtensions.cs      |  2 +-
 .../ReadOnlyRef{T}.cs                         |  4 +--
 Microsoft.Toolkit.HighPerformance/Ref{T}.cs   |  2 +-
 .../ComponentModel/ObservableObject.cs        |  4 +--
 .../ComponentModel/ObservableRecipient.cs     |  2 +-
 .../DependencyInjection/Ioc.cs                |  2 +-
 .../Input/Interfaces/IAsyncRelayCommand{T}.cs |  2 +-
 Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs  |  2 +-
 .../Input/RelayCommand{T}.cs                  |  2 +-
 .../Messages/PropertyChangedMessage{T}.cs     |  2 +-
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  2 +-
 .../Messaging/MessengerExtensions.cs          |  6 ++--
 .../Markdown/Blocks/ListBlock.cs              | 10 +++----
 .../Markdown/Blocks/TableBlock.cs             |  2 +-
 .../Markdown/Blocks/YamlHeaderBlock.cs        |  2 +-
 .../Markdown/Helpers/Common.cs                |  4 +--
 .../PlatformSpecificAnalyzerCS.cs             |  4 +--
 .../PlatformSpecificAnalyzerVB.cs             |  2 +-
 .../PlatformSpecificFixerCS.cs                |  2 +-
 .../PlatformSpecificFixerVB.cs                |  2 +-
 .../Controls/SampleAppMarkdownRenderer.cs     | 30 +++++++++----------
 .../Data/DataGridDataItem.cs                  |  2 +-
 .../Models/Sample.cs                          | 22 +++++++-------
 .../Helpers/NotifyTaskCompletion.cs           |  2 +-
 .../IIncrementalSource.cs                     |  2 +-
 30 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Box{T}.cs b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
index d6c72753453..52aaccf498d 100644
--- a/Microsoft.Toolkit.HighPerformance/Box{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
@@ -87,7 +87,7 @@ public static Box<T> GetFrom(object obj)
         /// <param name="obj">The input <see cref="object"/> instance, representing a boxed <typeparamref name="T"/> value.</param>
         /// <returns>A <see cref="Box{T}"/> reference pointing to <paramref name="obj"/>.</returns>
         /// <remarks>
-        /// This method doesn't check the actual type of <paramref name="obj"/>, so it is responsability of the caller
+        /// This method doesn't check the actual type of <paramref name="obj"/>, so it is responsibility of the caller
         /// to ensure it actually represents a boxed <typeparamref name="T"/> value and not some other instance.
         /// </remarks>
         [Pure]
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
index 965c54b4aea..157f36d61c1 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
@@ -61,7 +61,7 @@ public static ref T DangerousGetReference<T>(this T[,] array)
         /// <remarks>
         /// This method doesn't do any bounds checks, therefore it is responsibility of the caller to ensure the <paramref name="i"/>
         /// and <paramref name="j"/> parameters are valid. Furthermore, this extension will ignore the lower bounds for the input
-        /// array, and will just assume that the input index is 0-based. It is responsability of the caller to adjust the input
+        /// array, and will just assume that the input index is 0-based. It is responsibility of the caller to adjust the input
         /// indices to account for the actual lower bounds, if the input array has either axis not starting at 0.
         /// </remarks>
         [Pure]
@@ -234,7 +234,7 @@ public static Array2DColumnEnumerable<T> GetColumn<T>(this T[,] array, int colum
 
 #if SPAN_RUNTIME_SUPPORT
         /// <summary>
-        /// Cretes a new <see cref="Span{T}"/> over an input 2D <typeparamref name="T"/> array.
+        /// Creates a new <see cref="Span{T}"/> over an input 2D <typeparamref name="T"/> array.
         /// </summary>
         /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
         /// <param name="array">The input 2D <typeparamref name="T"/> array instance.</param>
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
index bd7acf00442..8c1e053a186 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
@@ -22,7 +22,7 @@ public static class MemoryExtensions
         /// <returns>A <see cref="Stream"/> wrapping the data within <paramref name="memory"/>.</returns>
         /// <remarks>
         /// Since this method only receives a <see cref="Memory{T}"/> instance, which does not track
-        /// the lifetime of its underlying buffer, it is responsability of the caller to manage that.
+        /// the lifetime of its underlying buffer, it is responsibility of the caller to manage that.
         /// In particular, the caller must ensure that the target buffer is not disposed as long
         /// as the returned <see cref="Stream"/> is in use, to avoid unexpected issues.
         /// </remarks>
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ObjectExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ObjectExtensions.cs
index 79cd388376e..c94675ecdee 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ObjectExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ObjectExtensions.cs
@@ -24,7 +24,7 @@ public static class ObjectExtensions
         /// The <see cref="IntPtr"/> value representing the offset to the target field from the start of the object data
         /// for the parameter <paramref name="obj"/>. The offset is in relation to the first usable byte after the method table.
         /// </returns>
-        /// <remarks>The input parameters are not validated, and it's responsability of the caller to ensure that
+        /// <remarks>The input parameters are not validated, and it's responsibility of the caller to ensure that
         /// the <paramref name="data"/> reference is actually pointing to a memory location within <paramref name="obj"/>.
         /// </remarks>
         [Pure]
@@ -46,7 +46,7 @@ public static IntPtr DangerousGetObjectDataByteOffset<T>(this object obj, ref T
         /// <param name="offset">The input byte offset for the <typeparamref name="T"/> reference to retrieve.</param>
         /// <returns>A <typeparamref name="T"/> reference at a specified offset within <paramref name="obj"/>.</returns>
         /// <remarks>
-        /// None of the input arguments is validated, and it is responsability of the caller to ensure they are valid.
+        /// None of the input arguments is validated, and it is responsibility of the caller to ensure they are valid.
         /// In particular, using an invalid offset might cause the retrieved reference to be misaligned with the
         /// desired data, which would break the type system. Or, if the offset causes the retrieved reference to point
         /// to a memory location outside of the input <see cref="object"/> instance, that might lead to runtime crashes.
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
index de5f7fd5eac..46101e3db89 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
@@ -22,7 +22,7 @@ public static class ReadOnlyMemoryExtensions
         /// <returns>A <see cref="Stream"/> wrapping the data within <paramref name="memory"/>.</returns>
         /// <remarks>
         /// Since this method only receives a <see cref="Memory{T}"/> instance, which does not track
-        /// the lifetime of its underlying buffer, it is responsability of the caller to manage that.
+        /// the lifetime of its underlying buffer, it is responsibility of the caller to manage that.
         /// In particular, the caller must ensure that the target buffer is not disposed as long
         /// as the returned <see cref="Stream"/> is in use, to avoid unexpected issues.
         /// </remarks>
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index 4d3f2ad9c93..cf2be137c38 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -279,7 +279,7 @@ public static ReadOnlySpanTokenizer<T> Tokenize<T>(this ReadOnlySpan<T> span, T
         /// even long sequences of values. For the reference implementation, see: <see href="http://www.cse.yorku.ca/~oz/hash.html"/>.
         /// For details on the used constants, see the details provided in this StackOverflow answer (as well as the accepted one):
         /// <see href="https://stackoverflow.com/questions/10696223/reason-for-5381-number-in-djb-hash-function/13809282#13809282"/>.
-        /// Additionally, a comparison between some common hashing algoriths can be found in the reply to this StackExchange question:
+        /// Additionally, a comparison between some common hashing algorithms can be found in the reply to this StackExchange question:
         /// <see href="https://softwareengineering.stackexchange.com/questions/49550/which-hashing-algorithm-is-best-for-uniqueness-and-speed"/>.
         /// Note that the exact implementation is slightly different in this method when it is not called on a sequence of <see cref="byte"/>
         /// values: in this case the <see cref="object.GetHashCode"/> method will be invoked for each <typeparamref name="T"/> value in
diff --git a/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs b/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs
index 18d7d986f01..c7156dbc63b 100644
--- a/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs
@@ -70,7 +70,7 @@ public static implicit operator ReadOnlyRef<T>(Ref<T> reference)
         /// </summary>
         /// <param name="owner">The owner <see cref="object"/> to create a portable reference for.</param>
         /// <param name="offset">The target offset within <paramref name="owner"/> for the target reference.</param>
-        /// <remarks>The <paramref name="offset"/> parameter is not validated, and it's responsability of the caller to ensure it's valid.</remarks>
+        /// <remarks>The <paramref name="offset"/> parameter is not validated, and it's responsibility of the caller to ensure it's valid.</remarks>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private ReadOnlyRef(object owner, IntPtr offset)
         {
@@ -83,7 +83,7 @@ private ReadOnlyRef(object owner, IntPtr offset)
         /// </summary>
         /// <param name="owner">The owner <see cref="object"/> to create a portable reference for.</param>
         /// <param name="value">The target reference to point to (it must be within <paramref name="owner"/>).</param>
-        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsability of the caller to ensure it's valid.</remarks>
+        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsibility of the caller to ensure it's valid.</remarks>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ReadOnlyRef(object owner, in T value)
         {
diff --git a/Microsoft.Toolkit.HighPerformance/Ref{T}.cs b/Microsoft.Toolkit.HighPerformance/Ref{T}.cs
index 61cb45d82cf..cc642ea48dc 100644
--- a/Microsoft.Toolkit.HighPerformance/Ref{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Ref{T}.cs
@@ -62,7 +62,7 @@ public ref T Value
         /// </summary>
         /// <param name="owner">The owner <see cref="object"/> to create a portable reference for.</param>
         /// <param name="value">The target reference to point to (it must be within <paramref name="owner"/>).</param>
-        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsability of the caller to ensure it's valid.</remarks>
+        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsibility of the caller to ensure it's valid.</remarks>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Ref(object owner, ref T value)
         {
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 564e90b8bc3..aab9e4d409a 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable SA1512
 
-// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
@@ -164,7 +164,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// }
         /// </code>
         /// We can then use a property to wrap instances of this type into our observable model (which supports
-        /// notifications), injecting the notification to theproperties of that model, like so:
+        /// notifications), injecting the notification to the properties of that model, like so:
         /// <code>
         /// public class BindablePerson : ObservableObject
         /// {
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 6b4bdd401e9..d5b58b52a5b 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable SA1512
 
-// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index e63e7811bda..facc027ae6e 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -63,7 +63,7 @@ public sealed class Ioc : IServiceProvider
             // data elements no larger than the natural word size [...] shall be properly aligned.
             // Object references shall be treated as though they are stored in the native word size."
             // The field being accessed here is of native int size (reference type), and is only ever accessed
-            // directly and atomically by a compare exhange instruction (see below), or here. We can therefore
+            // directly and atomically by a compare exchange instruction (see below), or here. We can therefore
             // assume this read is thread safe with respect to accesses to this property or to invocations to one
             // of the available configuration methods. So we can just read the field directly and make the necessary
             // check with our local copy, without the need of paying the locking overhead from this get accessor.
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
index 789febb71df..843547a01c8 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Mvvm.Input
     /// A generic interface representing a more specific version of <see cref="IAsyncRelayCommand"/>.
     /// </summary>
     /// <typeparam name="T">The type used as argument for the interface methods.</typeparam>
-    /// <remarks>This interface is needed to solve the diamong problem with base classes.</remarks>
+    /// <remarks>This interface is needed to solve the diamond problem with base classes.</remarks>
     public interface IAsyncRelayCommand<in T> : IAsyncRelayCommand, IRelayCommand<T>
     {
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
index 2dc82713118..a702f2327c1 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable SA1512
 
-// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
index 11ad5ba5853..0288e8dbb52 100644
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable SA1512
 
-// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 using System;
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
index 27ae2496668..075ed306a00 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
@@ -4,7 +4,7 @@
 
 #pragma warning disable SA1512
 
-// This file is inspired from the MvvmLight libray (lbugnion/mvvmlight),
+// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
 namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 558497a2b9b..f8e817e0d7e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -269,7 +269,7 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                 {
                     // We don't need whether or not the map contains the recipient, as the
                     // sequence of maps has already been copied from the set containing all
-                    // the mappings for the target recipiets: it is guaranteed to be here.
+                    // the mappings for the target recipients: it is guaranteed to be here.
                     IDictionarySlim<TToken> holder = map[key];
 
                     // Try to remove the registered handler for the input token,
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 427194be456..ea07f57ac85 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     public static partial class MessengerExtensions
     {
         /// <summary>
-        /// The <see cref="MethodInfo"/> instance assocuated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
+        /// The <see cref="MethodInfo"/> instance associated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
         /// </summary>
         private static readonly MethodInfo RegisterIRecipientMethodInfo;
 
@@ -111,13 +111,13 @@ where interfaceType.IsGenericType &&
                           interfaceType.GetGenericTypeDefinition() == typeof(IRecipient<>)
                     let messageType = interfaceType.GenericTypeArguments[0]
                     let registrationMethod = RegisterIRecipientMethodInfo.MakeGenericMethod(messageType, typeof(TToken))
-                    let registrationAction = GetRegisterationAction(type, registrationMethod)
+                    let registrationAction = GetRegistrationAction(type, registrationMethod)
                     select registrationAction).ToArray();
             }
 
             // Helper method to build and compile an expression tree to a message handler to use for the registration
             // This is used to reduce the overhead of repeated calls to MethodInfo.Invoke (which is over 10 times slower).
-            static Action<IMessenger, object, TToken> GetRegisterationAction(Type type, MethodInfo methodInfo)
+            static Action<IMessenger, object, TToken> GetRegistrationAction(Type type, MethodInfo methodInfo)
             {
                 // Input parameters (IMessenger instance, non-generic recipient, token)
                 ParameterExpression
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs b/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs
index f1e90403d3a..631d18c962a 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs
@@ -149,7 +149,7 @@ internal static ListBlock Parse(string markdown, int start, int maxEnd, int quot
                         }
 
                         russianDollIndex = Math.Min(russianDollIndex, (spaceCount - 1) / 4);
-                        int linestart = Math.Min(lineInfo.FirstNonWhitespaceChar, lineInfo.StartOfLine + ((russianDollIndex + 1) * 4));
+                        int lineStart = Math.Min(lineInfo.FirstNonWhitespaceChar, lineInfo.StartOfLine + ((russianDollIndex + 1) * 4));
 
                         // 0 spaces = end of the list.
                         // 1-4 spaces = first level.
@@ -177,20 +177,20 @@ internal static ListBlock Parse(string markdown, int start, int maxEnd, int quot
                                 builder.Builder.AppendLine();
                             }
 
-                            AppendTextToListItem(currentListItem, markdown, linestart, lineInfo.EndOfLine);
+                            AppendTextToListItem(currentListItem, markdown, lineStart, lineInfo.EndOfLine);
                         }
                         else
                         {
                             // Inline text. Ignores the 4 spaces that are used to continue the list.
-                            AppendTextToListItem(currentListItem, markdown, linestart, lineInfo.EndOfLine, true);
+                            AppendTextToListItem(currentListItem, markdown, lineStart, lineInfo.EndOfLine, true);
                         }
                     }
 
                     // Check for Closing Code Blocks.
                     if (currentListItem.Blocks.Last() is ListItemBuilder currentBlock)
                     {
-                        var blockmatchcount = Regex.Matches(currentBlock.Builder.ToString(), "```").Count;
-                        if (blockmatchcount > 0 && blockmatchcount % 2 != 0)
+                        var blockMatchCount = Regex.Matches(currentBlock.Builder.ToString(), "```").Count;
+                        if (blockMatchCount > 0 && blockMatchCount % 2 != 0)
                         {
                             inCodeBlock = true;
                         }
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs b/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs
index 8224f45766b..0ee728ca766 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs
@@ -296,7 +296,7 @@ internal static int ParseContents(string markdown, int startingPos, int maxEndin
             /// the block should find the start of the block, find the end and parse out the middle. The end most of the time will not be
             /// the max ending pos, but it sometimes can be. The function will return where it ended parsing the block in the markdown.
             /// </summary>
-            /// <returns>the postiion parsed to</returns>
+            /// <returns>the position parsed to</returns>
             internal int Parse(string markdown, int startingPos, int maxEndingPos, int quoteDepth)
             {
                 Cells = new List<TableCell>();
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs b/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
index 452f4ca2fe1..cb815721834 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
@@ -37,7 +37,7 @@ public YamlHeaderBlock()
         /// <param name="markdown"> The markdown text. </param>
         /// <param name="start"> The location of the first hash character. </param>
         /// <param name="end"> The location of the end of the line. </param>
-        /// <param name="realEndIndex"> The location of the actual end of the aprse. </param>
+        /// <param name="realEndIndex"> The location of the actual end of the parse. </param>
         /// <returns>Parsed <see cref="YamlHeaderBlock"/> class</returns>
         internal static YamlHeaderBlock Parse(string markdown, int start, int end, out int realEndIndex)
         {
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs b/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs
index 3e74b70d858..6f76660c1ba 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs
@@ -268,7 +268,7 @@ public static int IndexOf(string markdown, string search, int startingPos, int e
             int remainingCount = markdown.Length - startingPos;
             if (count > remainingCount)
             {
-                DebuggingReporter.ReportCriticalError("IndexOf count > remaing count");
+                DebuggingReporter.ReportCriticalError("IndexOf count > remaining count");
                 count = remainingCount;
             }
 
@@ -306,7 +306,7 @@ public static int IndexOf(string markdown, char search, int startingPos, int end
             int remainingCount = markdown.Length - startingPos;
             if (count > remainingCount)
             {
-                DebuggingReporter.ReportCriticalError("IndexOf count > remaing count");
+                DebuggingReporter.ReportCriticalError("IndexOf count > remaining count");
                 count = remainingCount;
             }
 
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
index 5d8e09ab74a..ea7b344a626 100644
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
+++ b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
@@ -28,7 +28,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
         }
 
         /// <summary>
-        /// Gets instance of symbol from sytax node
+        /// Gets instance of symbol from syntax node
         /// </summary>
         /// <param name="node">instance of <see cref="SyntaxNode"/></param>
         /// <param name="semanticModel"><see cref="SemanticModel"/></param>
@@ -84,7 +84,7 @@ public static ISymbol GetTargetOfNode(SyntaxNode node, SemanticModel semanticMod
         }
 
         /// <summary>
-        /// Initialises the analyzer, registering for code analysis.
+        /// Initializes the analyzer, registering for code analysis.
         /// </summary>
         /// <param name="context"><see cref="AnalysisContext"/></param>
         public override void Initialize(AnalysisContext context)
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
index 115968ee68b..4cd001cad57 100644
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
+++ b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
@@ -28,7 +28,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
         }
 
         /// <summary>
-        /// Gets instance of symbol from sytax node
+        /// Gets instance of symbol from syntax node
         /// </summary>
         /// <param name="node">instance of <see cref="SyntaxNode"/></param>
         /// <param name="semanticModel"><see cref="SemanticModel"/></param>
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
index eb0281faf77..439d1958f19 100644
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
+++ b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
     public class PlatformSpecificFixerCS : CodeFixProvider
     {
         /// <summary>
-        /// Gets the list of Diagnotics that can be fixed.
+        /// Gets the list of Diagnostics that can be fixed.
         /// </summary>
         public sealed override ImmutableArray<string> FixableDiagnosticIds
         {
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
index e5f6fd5f4f4..e7f91129fd3 100644
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
+++ b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
     public class PlatformSpecificFixerVB : CodeFixProvider
     {
         /// <summary>
-        /// Gets the list of Diagnotics that can be fixed.
+        /// Gets the list of Diagnostics that can be fixed.
         /// </summary>
         public sealed override ImmutableArray<string> FixableDiagnosticIds
         {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
index e3786ef8bba..3e6e40ca28a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
@@ -236,9 +236,9 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
 
             DocFXNote noteType = null;
             string header = null;
-            SolidColorBrush localforeground = null;
-            SolidColorBrush localbackground = null;
-            string symbolglyph = string.Empty;
+            SolidColorBrush localForeground = null;
+            SolidColorBrush localBackground = null;
+            string symbolGlyph = string.Empty;
 
             var theme = SampleController.Current.GetActualTheme();
 
@@ -255,7 +255,7 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                     {
                         noteType = style;
                         header = style.IdentifierReplacement;
-                        symbolglyph = style.Glyph;
+                        symbolGlyph = style.Glyph;
 
                         // Removes the identifier from the text
                         textInline.Text = textInline.Text.Replace(key, string.Empty);
@@ -273,20 +273,20 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                     {
                         noteType = style;
                         header = style.IdentifierReplacement;
-                        symbolglyph = style.Glyph;
+                        symbolGlyph = style.Glyph;
 
                         // Removes the identifier from the text
                         textinline.Text = textinline.Text.Replace(key, string.Empty);
 
                         if (theme == ElementTheme.Light)
                         {
-                            localforeground = style.LightForeground;
-                            localbackground = style.LightBackground;
+                            localForeground = style.LightForeground;
+                            localBackground = style.LightBackground;
                         }
                         else
                         {
-                            localforeground = new SolidColorBrush(Colors.White);
-                            localbackground = style.DarkBackground;
+                            localForeground = new SolidColorBrush(Colors.White);
+                            localBackground = style.DarkBackground;
                         }
 
                         // Apply special formatting context.
@@ -298,7 +298,7 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
 
                                 localContext.TrimLeadingWhitespace = true;
                                 QuoteForeground = Foreground;
-                                LinkForeground = localforeground;
+                                LinkForeground = localForeground;
                             }
                         }
                     }
@@ -336,12 +336,12 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                     border.BorderThickness = new Thickness(0);
                     border.Padding = new Thickness(20);
                     border.Margin = new Thickness(0, 5, 0, 5);
-                    border.Background = localbackground;
+                    border.Background = localBackground;
 
                     if (theme == ElementTheme.Light)
                     {
                         border.BorderThickness = new Thickness(0.5);
-                        border.BorderBrush = localforeground;
+                        border.BorderBrush = localForeground;
                     }
 
                     var headerPanel = new StackPanel
@@ -353,15 +353,15 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                     headerPanel.Children.Add(new TextBlock
                     {
                         FontSize = 18,
-                        Foreground = localforeground,
-                        Text = symbolglyph,
+                        Foreground = localForeground,
+                        Text = symbolGlyph,
                         FontFamily = new FontFamily("Segoe MDL2 Assets"),
                     });
 
                     headerPanel.Children.Add(new TextBlock
                     {
                         FontSize = 16,
-                        Foreground = localforeground,
+                        Foreground = localForeground,
                         Margin = new Thickness(5, 0, 0, 0),
                         Text = header,
                         VerticalAlignment = VerticalAlignment.Center,
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
index 18a3aa43a0d..099691541e7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
@@ -56,7 +56,7 @@ public string Mountain
                     if (_mountain == string.Empty && isMountainValid)
                     {
                         List<string> errors = new List<string>();
-                        errors.Add("Montain name cannot be empty");
+                        errors.Add("Mountain name cannot be empty");
                         _errors.Add("Mountain", errors);
                         this.ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs("Mountain"));
                     }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index b94c358fbc7..5a407197bc3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -182,9 +182,9 @@ public async Task<string> GetCSharpSourceAsync()
         {
             using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(CodeFile.StartsWith('/') ? CodeFile : $"SamplePages/{Name}/{CodeFile}"))
             {
-                using (var streamreader = new StreamReader(codeStream.AsStream()))
+                using (var streamReader = new StreamReader(codeStream.AsStream()))
                 {
-                    return await streamreader.ReadToEndAsync();
+                    return await streamReader.ReadToEndAsync();
                 }
             }
         }
@@ -193,9 +193,9 @@ public async Task<string> GetJavaScriptSourceAsync()
         {
             using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(JavaScriptCodeFile.StartsWith('/') ? JavaScriptCodeFile : $"SamplePages/{Name}/{JavaScriptCodeFile}"))
             {
-                using (var streamreader = new StreamReader(codeStream.AsStream()))
+                using (var streamReader = new StreamReader(codeStream.AsStream()))
                 {
-                    return await streamreader.ReadToEndAsync();
+                    return await streamReader.ReadToEndAsync();
                 }
             }
         }
@@ -300,13 +300,13 @@ async Task<Stream> CopyStream(HttpContent source)
             }
 
             IRandomAccessStream imageStream = null;
-            var localpath = $"{uri.Host}/{uri.LocalPath}";
+            var localPath = $"{uri.Host}/{uri.LocalPath}";
 
             // Cache only in Release
 #if !DEBUG
             try
             {
-                imageStream = await StreamHelper.GetLocalCacheFileStreamAsync(localpath, Windows.Storage.FileAccessMode.Read);
+                imageStream = await StreamHelper.GetLocalCacheFileStreamAsync(localPath, Windows.Storage.FileAccessMode.Read);
             }
             catch
             {
@@ -343,17 +343,17 @@ async Task<Stream> CopyStream(HttpContent source)
             return imageStream;
         }
 
-        private async Task SaveImageToCache(string localpath, Stream imageStream)
+        private async Task SaveImageToCache(string localPath, Stream imageStream)
         {
             var folder = ApplicationData.Current.LocalCacheFolder;
-            localpath = Path.Combine(folder.Path, localpath);
+            localPath = Path.Combine(folder.Path, localPath);
 
             // Resort to creating using traditional methods to avoid iteration for folder creation.
-            Directory.CreateDirectory(Path.GetDirectoryName(localpath));
+            Directory.CreateDirectory(Path.GetDirectoryName(localPath));
 
-            using (var filestream = File.Create(localpath))
+            using (var fileStream = File.Create(localPath))
             {
-                await imageStream.CopyToAsync(filestream);
+                await imageStream.CopyToAsync(fileStream);
             }
         }
 
diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index 2d720493fd4..515edb45b9b 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -119,7 +119,7 @@ public TResult Result
         public bool IsFaulted => Task.IsFaulted;
 
         /// <summary>
-        /// Gets the exception which occured on the task (if one occurred).
+        /// Gets the exception which occurred on the task (if one occurred).
         /// </summary>
         public AggregateException Exception => Task.Exception;
 
diff --git a/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs b/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs
index 45059162607..d2ee7bf2020 100644
--- a/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs
+++ b/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Toolkit.Collections
     public interface IIncrementalSource<TSource>
     {
         /// <summary>
-        /// This method is invoked everytime the view need to show more items. Retrieves items based on <paramref name="pageIndex"/> and <paramref name="pageSize"/> arguments.
+        /// This method is invoked every time the view need to show more items. Retrieves items based on <paramref name="pageIndex"/> and <paramref name="pageSize"/> arguments.
         /// </summary>
         /// <param name="pageIndex">
         /// The zero-based index of the page that corresponds to the items to retrieve.

From 221b615de6f51f08ddfd7555e4f94b584339d7dd Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 2 Aug 2020 19:36:09 +1000
Subject: [PATCH 337/595] more spelling

---
 .../Core/IAuthenticationBroker.cs                    |  2 +-
 .../Exceptions/ConfigNullException.cs                |  2 +-
 .../Exceptions/OAuthKeysRevokedException.cs          |  2 +-
 .../NETFramework/NetFrameworkAuthenticationBroker.cs |  4 ++--
 .../Services/LinkedIn/LinkedInDataProvider.cs        |  6 +++---
 .../Services/LinkedIn/LinkedInService.cs             | 10 +++++-----
 .../MicrosoftTranslator/ITranslatorService.cs        |  4 ++--
 .../Services/MicrosoftTranslator/ServiceLanguage.cs  |  2 +-
 Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs |  2 +-
 .../Services/Twitter/TwitterDataProvider.cs          |  8 ++++----
 .../Services/Twitter/TwitterOAuthRequestBuilder.cs   |  4 ++--
 .../Services/Twitter/TwitterPlaceBoundingBox.cs      |  2 +-
 .../Services/Twitter/TwitterService.cs               |  8 ++++----
 .../Services/Twitter/TwitterStreamEventType.cs       |  2 +-
 .../PlatformSpecificAnalyzerVB.cs                    |  2 +-
 .../Controls/XamlCodeEditor.xaml.cs                  |  6 +++---
 Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs     |  2 +-
 .../Diagnostics/Guard.Comparable.Generic.cs          | 12 ++++++------
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs         |  2 +-
 19 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Core/IAuthenticationBroker.cs b/Microsoft.Toolkit.Services/Core/IAuthenticationBroker.cs
index 770b5c3703d..1c56147e7c8 100644
--- a/Microsoft.Toolkit.Services/Core/IAuthenticationBroker.cs
+++ b/Microsoft.Toolkit.Services/Core/IAuthenticationBroker.cs
@@ -18,7 +18,7 @@ public interface IAuthenticationBroker
         /// <summary>
         /// Returns the authentication status, it could be UserCancel, ErrorHttp and Success.
         /// </summary>
-        /// <param name="requestUri"> Autorization base url</param>
+        /// <param name="requestUri"> Authorization base url</param>
         /// <param name="callbackUri"> LinkedInOAuthTokens callbackUri</param>
         /// <returns> Returns a status </returns>
         Task<AuthenticationResult> Authenticate(Uri requestUri, Uri callbackUri);
diff --git a/Microsoft.Toolkit.Services/Exceptions/ConfigNullException.cs b/Microsoft.Toolkit.Services/Exceptions/ConfigNullException.cs
index 550b98fa1ba..f32b19b731a 100644
--- a/Microsoft.Toolkit.Services/Exceptions/ConfigNullException.cs
+++ b/Microsoft.Toolkit.Services/Exceptions/ConfigNullException.cs
@@ -31,7 +31,7 @@ public ConfigNullException(string message)
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigNullException"/> class.
-        /// Constructor accepting additonal message string and inner exception
+        /// Constructor accepting additional message string and inner exception
         /// </summary>
         /// <param name="message">Additional error information.</param>
         /// <param name="innerException">Reference to inner exception.</param>
diff --git a/Microsoft.Toolkit.Services/Exceptions/OAuthKeysRevokedException.cs b/Microsoft.Toolkit.Services/Exceptions/OAuthKeysRevokedException.cs
index 363330b72e0..f9126448ada 100644
--- a/Microsoft.Toolkit.Services/Exceptions/OAuthKeysRevokedException.cs
+++ b/Microsoft.Toolkit.Services/Exceptions/OAuthKeysRevokedException.cs
@@ -33,7 +33,7 @@ public OAuthKeysRevokedException(string message)
         /// Initializes a new instance of the <see cref="OAuthKeysRevokedException"/> class.
         /// Constructor with additional message and inner exception.
         /// </summary>
-        /// <param name="message">Additionnal message.</param>
+        /// <param name="message">Additional message.</param>
         /// <param name="innerException">Reference to inner exception.</param>
         public OAuthKeysRevokedException(string message, Exception innerException)
             : base(message, innerException)
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
index 76fcb333f2e..11ea848c2d1 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
@@ -21,7 +21,7 @@ public Task<AuthenticationResult> Authenticate(Uri requestUri, Uri callbackUri)
             }
             else if (Application.Current != null)
             {
-                return AutenticateWindow(requestUri, callbackUri);
+                return this.AuthenticateWindow(requestUri, callbackUri);
             }
             else
             {
@@ -30,7 +30,7 @@ public Task<AuthenticationResult> Authenticate(Uri requestUri, Uri callbackUri)
             }
         }
 
-        public async Task<AuthenticationResult> AutenticateWindow(Uri requestUri, Uri callbackUri)
+        public async Task<AuthenticationResult> AuthenticateWindow(Uri requestUri, Uri callbackUri)
         {
             PopupWPF popupWindow;
             var taskCompletionSource = new TaskCompletionSource<AuthenticationResult>();
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index aa45d7c9598..f852688bc57 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -171,9 +171,9 @@ public void Logout()
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         public async Task LogoutAsync()
         {
-            var crendential = _passwordManager.Get(LinkedInConstants.STORAGEKEYACCESSTOKEN);
+            var credential = _passwordManager.Get(LinkedInConstants.STORAGEKEYACCESSTOKEN);
 
-            if (crendential != null)
+            if (credential != null)
             {
                 _passwordManager.Remove(LinkedInConstants.STORAGEKEYACCESSTOKEN);
                 await _storageManager.SetAsync(LinkedInConstants.STORAGEKEYUSER, null);
@@ -189,7 +189,7 @@ public async Task LogoutAsync()
         /// <param name="config">Query configuration.</param>
         /// <param name="maxRecords">Upper limit for records returned.</param>
         /// <param name="startRecord">Index of paged results.</param>
-        /// <param name="fields">A comma seperated string of required fields, which will have strongly typed representation in the model passed in.</param>
+        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
         /// <returns>Strongly typed list of results.</returns>
         public async Task<IEnumerable<TSchema>> GetDataAsync<TSchema>(LinkedInDataConfig config, int maxRecords, int startRecord = 0, string fields = "id")
         {
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index a70a7cff8dd..63ee832164f 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -138,7 +138,7 @@ public bool Initialize(string clientId, string clientSecret, string callbackUri)
 
 #if NET462
         /// <summary>
-        /// Initialize underlying provider with relevent token information for Uwp.
+        /// Initialize underlying provider with relevant token information for Uwp.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>
@@ -149,7 +149,7 @@ public bool Initialize(LinkedInOAuthTokens oAuthTokens, LinkedInPermissions requ
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="clientId">Client Id.</param>
         /// <param name="clientSecret">Client secret.</param>
@@ -162,7 +162,7 @@ public bool Initialize(string clientId, string clientSecret, string callbackUri)
 #endif
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="clientId">Client Id.</param>
         /// <param name="clientSecret">Client secret.</param>
@@ -199,7 +199,7 @@ public bool Initialize(string clientId, string clientSecret, string callbackUri,
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="authentication">Authentication result interface.</param>
@@ -231,7 +231,7 @@ public bool Initialize(LinkedInOAuthTokens oAuthTokens, IAuthenticationBroker au
         /// <param name="config">LinkedInDataConfig instance.</param>
         /// <param name="maxRecords">Upper limit of records to return.</param>
         /// <param name="startRecord">Index of paged results.</param>
-        /// <param name="fields">A comma seperated string of required fields, which will have strongly typed representation in the model passed in.</param>
+        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
         /// <returns>Strongly typed list of data returned from the service.</returns>
         public async Task<List<T>> RequestAsync<T>(LinkedInDataConfig config, int maxRecords = 20, int startRecord = 0, string fields = "id")
         {
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ITranslatorService.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ITranslatorService.cs
index c5c7f0227ed..984a74d6646 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ITranslatorService.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ITranslatorService.cs
@@ -35,7 +35,7 @@ public interface ITranslatorService
         /// <returns>A <see cref="Task"/> that represents the initialize operation.</returns>
         /// <exception cref="ArgumentNullException">The <see cref="SubscriptionKey"/> property hasn't been set.</exception>
         /// <exception cref="TranslatorServiceException">The provided <see cref="SubscriptionKey"/> isn't valid or has expired.</exception>
-        /// <remarks>Calling this method isn't mandatory, because the token is get/refreshed everytime is needed. However, it is called at startup, it can speed-up subsequest requests.</remarks>
+        /// <remarks>Calling this method isn't mandatory, because the token is get/refreshed every time is needed. However, it is called at startup, it can speed-up subsequent requests.</remarks>
         Task InitializeAsync();
 
         /// <summary>
@@ -47,7 +47,7 @@ public interface ITranslatorService
         /// <exception cref="ArgumentNullException">The <see cref="SubscriptionKey"/> property hasn't been set.</exception>
         /// <exception cref="TranslatorServiceException">The provided <see cref="SubscriptionKey"/> isn't valid or has expired.</exception>
         /// <remarks>
-        /// <para>Calling this method isn't mandatory, because the token is get/refreshed everytime is needed. However, it is called at startup, it can speed-up subsequest requests.</para>
+        /// <para>Calling this method isn't mandatory, because the token is get/refreshed every time is needed. However, it is called at startup, it can speed-up subsequent requests.</para>
         /// <para>You must register Microsoft Translator on https://portal.azure.com to obtain the Subscription key needed to use the service.</para>
         /// </remarks>
         Task InitializeAsync(string subscriptionKey, string language = null);
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
index 27fd7065ed1..6053cebb865 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
     /// <summary>
-    /// Holds information about langagues supported for text translation and speech synthesis.
+    /// Holds information about languages supported for text translation and speech synthesis.
     /// </summary>
     /// <seealso cref="ITranslatorService.GetLanguageNamesAsync(string)"/>
     public class ServiceLanguage
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs b/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
index 1714ead9951..97d2613aa02 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
@@ -100,7 +100,7 @@ public string Text
         public TwitterUser User { get; set; }
 
         /// <summary>
-        /// Gets or sets geo coordinates (latitude and logitude) returned by Twitter for some locations
+        /// Gets or sets geo coordinates (latitude and longitude) returned by Twitter for some locations
         /// </summary>
         [JsonProperty("coordinates")]
         [JsonConverter(typeof(TwitterCoordinatesConverter))]
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index 14e1d05e934..a6eda59f07e 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -227,12 +227,12 @@ public async Task<IEnumerable<TSchema>> SearchAsync<TSchema>(string hashTag, int
         /// <returns>Boolean indicating login success.</returns>
         public async Task<bool> LoginAsync()
         {
-            var crendetials = _passwordManager.Get("TwitterAccessToken");
+            var credentials = _passwordManager.Get("TwitterAccessToken");
             var user = await _storageManager.GetAsync("TwitterScreenName");
-            if (!string.IsNullOrEmpty(user) && crendetials != null)
+            if (!string.IsNullOrEmpty(user) && credentials != null)
             {
-                _tokens.AccessToken = crendetials.UserName;
-                _tokens.AccessTokenSecret = crendetials.Password;
+                _tokens.AccessToken = credentials.UserName;
+                _tokens.AccessTokenSecret = credentials.Password;
                 UserScreenName = user;
                 LoggedIn = true;
                 return true;
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestBuilder.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestBuilder.cs
index bce843e1ea6..671bbff15ab 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestBuilder.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestBuilder.cs
@@ -203,7 +203,7 @@ private string GenerateSignature()
         /// <summary>
         /// Generate authorization header.
         /// </summary>
-        /// <returns>Generated authorizatin header string.</returns>
+        /// <returns>Generated authorization header string.</returns>
         private string GenerateAuthorizationHeader()
         {
             StringBuilder authHeaderBuilder = new StringBuilder();
@@ -237,7 +237,7 @@ private IEnumerable<OAuthParameter> GetSignParameters()
         /// <summary>
         /// Get list of auth header parameters.
         /// </summary>
-        /// <returns>List of auth header paramters.</returns>
+        /// <returns>List of auth header parameters.</returns>
         private IEnumerable<OAuthParameter> GetAuthHeaderParameters()
         {
             yield return Version;
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
index 4afe10a13b0..9e20940bf28 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
@@ -20,7 +20,7 @@ public class TwitterPlaceBoundingBox
         public List<List<float[]>> Coordinates { get; set; }
 
         /// <summary>
-        /// Gets or sets the coordinate type. Polygon for a bounding box, Pointn for an exact coordinate.
+        /// Gets or sets the coordinate type. Polygon for a bounding box, Point for an exact coordinate.
         /// </summary>
         [JsonProperty("type")]
         public string Type { get; set; }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index dc2526cf0c9..d343db885ab 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -68,7 +68,7 @@ public TwitterService()
         public string UserScreenName => Provider.UserScreenName;
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="consumerKey">Consumer key.</param>
         /// <param name="consumerSecret">Consumer secret.</param>
@@ -126,7 +126,7 @@ public bool Initialize(string consumerKey, string consumerSecret, string callbac
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="authenticationBroker">Authentication result interface.</param>
@@ -175,7 +175,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens)
 
 #if NET462
         /// <summary>
-        /// Initialize underlying provider with relevent token information for Uwp.
+        /// Initialize underlying provider with relevant token information for Uwp.
         /// </summary>
         /// <param name="consumerKey">Consumer key.</param>
         /// <param name="consumerSecret">Consumer secret.</param>
@@ -187,7 +187,7 @@ public bool Initialize(string consumerKey, string consumerSecret, string callbac
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <returns>Success or failure.</returns>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
index 04d0201d030..246c3eeca8d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Toolkit.Services.Twitter
 {
     /// <summary>
-    /// Describes the type of event that has occured on twitter
+    /// Describes the type of event that has occurred on twitter
     /// </summary>
     public enum TwitterStreamEventType
     {
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
index 4cd001cad57..ec67c731a74 100644
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
+++ b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
@@ -98,7 +98,7 @@ public static ISymbol GetTargetOfNode(SyntaxNode node, SemanticModel semanticMod
         }
 
         /// <summary>
-        /// Initialises the analyzer, registering for code analysis.
+        /// Initializes the analyzer, registering for code analysis.
         /// </summary>
         /// <param name="context"><see cref="AnalysisContext"/></param>
         public override void Initialize(AnalysisContext context)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs
index aa7ca06244a..d742974ab73 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs
@@ -93,10 +93,10 @@ private void XamlCodeRenderer_KeyDown(Monaco.CodeEditor sender, Monaco.Helpers.W
                 // TODO: Mark Dirty here if we want to prevent overwrites.
 
                 // Setup Time for Auto-Compile
-                this._autocompileTimer?.Cancel(); // Stop Old Timer
+                this._autoCompileTimer?.Cancel(); // Stop Old Timer
 
                 // Create Compile Timer
-                this._autocompileTimer = ThreadPoolTimer.CreateTimer(
+                this._autoCompileTimer = ThreadPoolTimer.CreateTimer(
                     e =>
                     {
                         UpdateRequested?.Invoke(this, EventArgs.Empty);
@@ -131,7 +131,7 @@ public string Text
             GlyphImage = new Uri("ms-appx-web:///Icons/Error.png")
         };
 
-        private ThreadPoolTimer _autocompileTimer;
+        private ThreadPoolTimer _autoCompileTimer;
 
         public event EventHandler UpdateRequested;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 5a407197bc3..d9aeb0c36ba 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -473,7 +473,7 @@ public async Task PreparePropertyDescriptorAsync()
 
                         if (existingOption == null && string.IsNullOrWhiteSpace(type))
                         {
-                            throw new NotSupportedException($"Unrecognized short identifier '{name}'; Define type and parameters of property in first occurance in {XamlCodeFile}.");
+                            throw new NotSupportedException($"Unrecognized short identifier '{name}'; Define type and parameters of property in first occurence in {XamlCodeFile}.");
                         }
 
                         if (Enum.TryParse(type, out PropertyKind kind))
diff --git a/Microsoft.Toolkit/Diagnostics/Guard.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/Guard.Comparable.Generic.cs
index a57f183b996..e250821db25 100644
--- a/Microsoft.Toolkit/Diagnostics/Guard.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/Guard.Comparable.Generic.cs
@@ -122,7 +122,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     return;
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
             else if (sizeof(T) == 2)
             {
@@ -134,7 +134,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     return;
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
             else if (sizeof(T) == 4)
             {
@@ -146,7 +146,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     return;
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
             else if (sizeof(T) == 8)
             {
@@ -158,7 +158,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     return;
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
             else if (sizeof(T) == 16)
             {
@@ -176,7 +176,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     }
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
             else
             {
@@ -188,7 +188,7 @@ public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
                     return;
                 }
 
-                ThrowHelper.ThrowArgumentExceptionForsBitwiseEqualTo(value, target, name);
+                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
             }
         }
 
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index aad8c57b9f0..3a25912cbca 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -141,7 +141,7 @@ public static void ThrowArgumentExceptionForIsNotAssignableToType(object value,
         /// <typeparam name="T">The type of input values being compared.</typeparam>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        public static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
+        public static void ThrowArgumentExceptionForBitwiseEqualTo<T>(T value, T target, string name)
             where T : unmanaged
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");

From 719a57f716ffe16d7a04fde3eda1e543aba91c08 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 3 Aug 2020 17:25:49 +0200
Subject: [PATCH 338/595] Added fallback path for links with inline code

Fixes https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3123
---
 .../Render/MarkdownRenderer.Inlines.cs        | 87 ++++++++++++-------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs
index 95f0c3e9978..e83ea316c03 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs
@@ -539,47 +539,70 @@ protected override void RenderCodeRun(CodeInline element, IRenderContext context
                 throw new RenderContextIncorrectException();
             }
 
-            var text = CreateTextBlock(localContext);
-            text.Text = CollapseWhitespace(context, element.Text);
-            text.FontFamily = InlineCodeFontFamily ?? FontFamily;
-            text.Foreground = InlineCodeForeground ?? Foreground;
+            var text = CollapseWhitespace(context, element.Text);
 
-            if (localContext.WithinItalics)
+            // Avoid a crash if the current inline is inside an hyperline.
+            // This happens when using inline code blocks like [`SomeCode`](https://www.foo.bar).
+            if (localContext.Parent is Hyperlink)
             {
-                text.FontStyle = FontStyle.Italic;
-            }
+                // Fallback span
+                Run run = new Run
+                {
+                    Text = text,
+                    FontFamily = InlineCodeFontFamily ?? FontFamily,
+                    Foreground = InlineCodeForeground ?? Foreground
+                };
 
-            if (localContext.WithinBold)
-            {
-                text.FontWeight = FontWeights.Bold;
-            }
+                // Additional formatting
+                if (localContext.WithinItalics)
+                {
+                    run.FontStyle = FontStyle.Italic;
+                }
 
-            var borderthickness = InlineCodeBorderThickness;
-            var padding = InlineCodePadding;
+                if (localContext.WithinBold)
+                {
+                    run.FontWeight = FontWeights.Bold;
+                }
 
-            var border = new Border
+                // Add the fallback block
+                localContext.InlineCollection.Add(run);
+            }
+            else
             {
-                BorderThickness = borderthickness,
-                BorderBrush = InlineCodeBorderBrush,
-                Background = InlineCodeBackground,
-                Child = text,
-                Padding = padding,
-                Margin = InlineCodeMargin
-            };
+                var textBlock = CreateTextBlock(localContext);
+                textBlock.Text = text;
+                textBlock.FontFamily = InlineCodeFontFamily ?? FontFamily;
+                textBlock.Foreground = InlineCodeForeground ?? Foreground;
 
-            // Aligns content in InlineUI, see https://social.msdn.microsoft.com/Forums/silverlight/en-US/48b5e91e-efc5-4768-8eaf-f897849fcf0b/richtextbox-inlineuicontainer-vertical-alignment-issue?forum=silverlightarchieve
-            border.RenderTransform = new TranslateTransform
-            {
-                Y = 4
-            };
+                if (localContext.WithinItalics)
+                {
+                    textBlock.FontStyle = FontStyle.Italic;
+                }
 
-            var inlineUIContainer = new InlineUIContainer
-            {
-                Child = border,
-            };
+                if (localContext.WithinBold)
+                {
+                    textBlock.FontWeight = FontWeights.Bold;
+                }
 
-            // Add it to the current inlines
-            localContext.InlineCollection.Add(inlineUIContainer);
+                var inlineUIContainer = new InlineUIContainer
+                {
+                    Child = new Border
+                    {
+                        BorderThickness = InlineCodeBorderThickness,
+                        BorderBrush = InlineCodeBorderBrush,
+                        Background = InlineCodeBackground,
+                        Child = textBlock,
+                        Padding = InlineCodePadding,
+                        Margin = InlineCodeMargin,
+
+                        // Aligns content in InlineUI, see https://social.msdn.microsoft.com/Forums/silverlight/en-US/48b5e91e-efc5-4768-8eaf-f897849fcf0b/richtextbox-inlineuicontainer-vertical-alignment-issue?forum=silverlightarchieve
+                        RenderTransform = new TranslateTransform { Y = 4 }
+                    }
+                };
+
+                // Add it to the current inlines
+                localContext.InlineCollection.Add(inlineUIContainer);
+            }
         }
     }
 }
\ No newline at end of file

From 693f9c9c6a8541b362211e83b045506357e9585d Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 3 Aug 2020 09:36:02 -0700
Subject: [PATCH 339/595] Update missing default font property for
 InlineCodeFontFamily

---
 .../MarkdownTextBlock/MarkdownTextBlock.xaml               | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml
index 11a0deff313..8ba7a9041e9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml
@@ -44,15 +44,16 @@
         <Setter Property="CodeBackground" Value="{ThemeResource MarkdownBackgroundBrush}" />
         <Setter Property="CodeBorderBrush" Value="{ThemeResource MarkdownBorderBrush}" />
         <Setter Property="CodeBorderThickness" Value="0" />
+        <Setter Property="CodeFontFamily" Value="Consolas" />
+        <Setter Property="CodeMargin" Value="0, 7, 0, 7" />
+        <Setter Property="CodePadding" Value="10, 6, 10, 6" />
         <Setter Property="InlineCodeBorderThickness" Value="0" />
         <Setter Property="InlineCodePadding" Value="4, 2, 4, 2" />
         <Setter Property="InlineCodeMargin" Value="2,0,2,-4"/>
         <Setter Property="InlineCodeBackground" Value="{ThemeResource MarkdownInlineCodeBackgroundBrush}" />
         <Setter Property="InlineCodeBorderBrush" Value="{ThemeResource MarkdownBorderBrush}" />
         <Setter Property="InlineCodeForeground" Value="{ThemeResource MarkdownInlineCodeForegroundBrush}" />
-        <Setter Property="CodeFontFamily" Value="Consolas" />
-        <Setter Property="CodeMargin" Value="0, 7, 0, 7" />
-        <Setter Property="CodePadding" Value="10, 6, 10, 6" />
+        <Setter Property="InlineCodeFontFamily" Value="Consolas" />
         <Setter Property="EmojiFontFamily" Value="Segoe UI Emoji" />
         <Setter Property="Header1FontWeight" Value="Bold" />
         <Setter Property="Header1FontSize" Value="20" />

From 52da409b17874f3211e5c0e3d1e221481404378d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 3 Aug 2020 23:38:52 +0200
Subject: [PATCH 340/595] Reduced memory usage in Count tests

---
 .../Test_ReadOnlySpanExtensions.Count.cs      | 76 ++++++++++++++++---
 .../Extensions/Test_ReadOnlySpanExtensions.cs | 12 ++-
 2 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
index 3966aacc503..a3fd7fd39fd 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
@@ -3,12 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+#nullable enable
+
 namespace UnitTests.HighPerformance.Extensions
 {
     public partial class Test_ReadOnlySpanExtensions
@@ -168,15 +172,15 @@ public void Test_ReadOnlySpanExtensions_FilledCount64()
         /// <typeparam name="T">The type to test.</typeparam>
         /// <param name="value">The target value to look for.</param>
         /// <param name="provider">The function to use to create random data.</param>
-        private static void TestForType<T>(T value, Func<int, T, T[]> provider)
+        private static void TestForType<T>(T value, Func<int, T, UnmanagedSpanOwner<T>> provider)
             where T : unmanaged, IEquatable<T>
         {
             foreach (var count in TestCounts)
             {
-                T[] data = provider(count, value);
+                using UnmanagedSpanOwner<T> data = provider(count, value);
 
-                int result = data.Count(value);
-                int expected = CountWithForeach(data, value);
+                int result = data.Span.Count(value);
+                int expected = CountWithForeach(data.Span, value);
 
                 Assert.AreEqual(result, expected, $"Failed {typeof(T)} test with count {count}: got {result} instead of {expected}");
             }
@@ -214,14 +218,14 @@ private static int CountWithForeach<T>(ReadOnlySpan<T> span, T value)
         /// <param name="value">The value to look for.</param>
         /// <returns>An array of random <typeparamref name="T"/> elements.</returns>
         [Pure]
-        private static T[] CreateRandomData<T>(int count, T value)
+        private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count, T value)
             where T : unmanaged
         {
             var random = new Random(count);
 
-            T[] data = new T[count];
+            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.AsSpan()))
+            foreach (ref byte n in MemoryMarshal.AsBytes(data.Span))
             {
                 n = (byte)random.Next(0, byte.MaxValue);
             }
@@ -229,9 +233,11 @@ private static T[] CreateRandomData<T>(int count, T value)
             // Fill at least 20% of the items with a matching value
             int minimum = count / 20;
 
+            Span<T> span = data.Span;
+
             for (int i = 0; i < minimum; i++)
             {
-                data[random.Next(0, count)] = value;
+                span[random.Next(0, count)] = value;
             }
 
             return data;
@@ -245,14 +251,62 @@ private static T[] CreateRandomData<T>(int count, T value)
         /// <param name="value">The value to use to populate the array.</param>
         /// <returns>An array of <typeparamref name="T"/> elements.</returns>
         [Pure]
-        private static T[] CreateFilledData<T>(int count, T value)
+        private static UnmanagedSpanOwner<T> CreateFilledData<T>(int count, T value)
             where T : unmanaged
         {
-            T[] data = new T[count];
+            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            data.AsSpan().Fill(value);
+            data.Span.Fill(value);
 
             return data;
         }
+
+        /// <summary>
+        /// An owner for a buffer of an unmanaged type, recycling <see cref="byte"/> arrays to save memory.
+        /// </summary>
+        /// <typeparam name="T">The type of items to store in the rented buffers.</typeparam>
+        private sealed class UnmanagedSpanOwner<T> : IDisposable
+            where T : unmanaged
+        {
+            /// <summary>
+            /// The size of the current instance
+            /// </summary>
+            private readonly int length;
+
+            /// <summary>
+            /// The underlying <see cref="byte"/> array.
+            /// </summary>
+            private byte[]? array;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="UnmanagedSpanOwner{T}"/> class.
+            /// </summary>
+            /// <param name="size">The size of the buffer to rent.</param>
+            public UnmanagedSpanOwner(int size)
+            {
+                this.array = ArrayPool<byte>.Shared.Rent(size * Unsafe.SizeOf<T>());
+                this.length = size;
+            }
+
+            /// <inheritdoc/>
+            public void Dispose()
+            {
+                byte[]? array = this.array;
+
+                if (array is null)
+                {
+                    return;
+                }
+
+                this.array = null;
+
+                ArrayPool<byte>.Shared.Return(array);
+            }
+
+            /// <summary>
+            /// Gets the <see cref="Memory{T}"/> for the current instance.
+            /// </summary>
+            public Span<T> Span => this.array.AsSpan().Cast<byte, T>().Slice(0, this.length);
+        }
     }
 }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
index d3d20106a39..c431e4937cc 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
@@ -18,7 +18,9 @@ public partial class Test_ReadOnlySpanExtensions
         [TestMethod]
         public void Test_ReadOnlySpanExtensions_DangerousGetReference()
         {
-            ReadOnlySpan<int> data = CreateRandomData<int>(12, default).AsSpan();
+            using var owner = CreateRandomData<int>(12, default);
+
+            ReadOnlySpan<int> data = owner.Span;
 
             ref int r0 = ref data.DangerousGetReference();
             ref int r1 = ref Unsafe.AsRef(data[0]);
@@ -30,7 +32,9 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReference()
         [TestMethod]
         public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Zero()
         {
-            ReadOnlySpan<int> data = CreateRandomData<int>(12, default).AsSpan();
+            using var owner = CreateRandomData<int>(12, default);
+
+            ReadOnlySpan<int> data = owner.Span;
 
             ref int r0 = ref data.DangerousGetReference();
             ref int r1 = ref data.DangerousGetReferenceAt(0);
@@ -42,7 +46,9 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Zero()
         [TestMethod]
         public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Index()
         {
-            ReadOnlySpan<int> data = CreateRandomData<int>(12, default).AsSpan();
+            using var owner = CreateRandomData<int>(12, default);
+
+            ReadOnlySpan<int> data = owner.Span;
 
             ref int r0 = ref data.DangerousGetReferenceAt(5);
             ref int r1 = ref Unsafe.AsRef(data[5]);

From ee7fa9408815848981ce7ebfec834a43a644de11 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Tue, 4 Aug 2020 09:47:21 +1000
Subject: [PATCH 341/595] fix some spelling

---
 .../Inlines/EmojiInline.EmojiCodes.cs         |  2 +-
 .../Markdown/Inlines/HyperlinkInline.cs       |  4 +-
 .../Markdown/Inlines/ImageInline.cs           |  8 +-
 .../Markdown/Inlines/TextRunInline.cs         |  4 +-
 .../Markdown/MarkdownDocument.cs              | 14 ++--
 Microsoft.Toolkit.Parsers/Rss/AtomParser.cs   |  2 +-
 Microsoft.Toolkit.Parsers/Rss/RssHelper.cs    | 26 +++----
 .../Exceptions/ParserNullException.cs         |  2 +-
 .../Exceptions/RequestFailedException.cs      |  2 +-
 .../NetFrameworkAuthenticationBroker.cs       |  4 +-
 .../NetFrameworkPasswordManager.cs            | 18 ++---
 .../PasswordManagerNativeMethods.cs           | 28 ++++---
 .../NETFramework/PopupForm.cs                 |  2 +-
 .../Uwp/UwpPasswordManager.cs                 |  6 +-
 .../Services/LinkedIn/LinkedInService.cs      |  4 +-
 .../LinkedIn/LinkedInShareResponse.cs         |  4 +-
 .../Services/Twitter/TwitterService.cs        |  4 +-
 .../Twitter/TwitterStreamEventType.cs         |  2 +-
 .../Services/Twitter/TwitterUrlUnwound.cs     |  2 +-
 .../Services/Twitter/TwitterUser.cs           |  2 +-
 .../Twitter/TwitterUserStreamParser.cs        | 14 ++--
 .../Services/Weibo/WeiboService.cs            |  4 +-
 .../Services/Weibo/WeiboUser.cs               |  2 +-
 .../ObservableBluetoothLEDevice.cs            |  8 +-
 .../Adaptive/BaseImageHelper.cs               | 10 +--
 .../Adaptive/BaseTextHelper.cs                |  6 +-
 .../NotificationUserInput.cs                  |  4 +-
 .../Tiles/Builder/TileContentBuilder.cs       |  2 +-
 .../Controls/CodeRenderer.cs                  |  6 +-
 .../Controls/SampleAppMarkdownRenderer.cs     | 20 ++---
 .../Models/Sample.cs                          |  2 +-
 .../Pages/About.xaml                          | 14 ++--
 .../Pages/SampleController.xaml               |  6 +-
 .../Pages/SampleController.xaml.cs            | 12 +--
 .../Properties/Default.rd.xml                 |  6 +-
 .../AcrylicBrush/AcrylicBrushPage.xaml.cs     |  2 +-
 .../AdaptiveGridViewPage.xaml.cs              |  2 +-
 .../CameraPreview/CameraPreviewPage.xaml.cs   |  2 +-
 .../InAppNotificationPage.xaml.cs             |  2 +-
 .../SamplePages/TabView/TabViewPage.xaml.cs   |  2 +-
 .../Services/Facebook/FacebookService.cs      |  8 +-
 .../Extensions/AnimationExtensions.cs         |  2 +-
 .../ImageEx/ImageExBase.Source.cs             |  2 +-
 .../ImageEx/ImageExBase.cs                    |  4 +-
 .../Extensions/Markup/SymbolIconExtension.cs  |  2 +-
 .../Media/ScaleTransformExtensions.cs         |  2 +-
 .../Extensions/TextBoxRegEx/TextBoxRegex.cs   | 74 +++++++++----------
 .../Helpers/DeepLinkParser/DeepLinkParser.cs  |  6 +-
 .../Helpers/DispatcherHelper.cs               |  8 +-
 .../Helpers/DispatcherQueueHelper.cs          |  4 +-
 .../RemoteDeviceHelper/RemoteDeviceHelper.cs  |  4 +-
 .../Helpers/SystemInformation.cs              | 10 +--
 .../IncrementalLoadingCollection.cs           |  6 +-
 .../Extensions/StringExtensions.cs            |  2 +-
 .../Helpers/NotifyTaskCompletion.cs           |  2 +-
 .../Properties/UnitTestApp.rd.xml             |  2 +-
 .../Properties/UnitTestApp.rd.xml             |  2 +-
 ...ervableGroupedCollectionExtensionsTests.cs | 12 +--
 .../Diagnostics/Test_Guard.Array.cs           |  4 +-
 .../Extensions/Test_EnumValuesExtension.cs    |  6 +-
 ..._FontIconSourceExtensionMarkupExtension.cs | 12 +--
 UnitTests/UnitTests.UWP/PrivateType.cs        | 36 ++++-----
 .../Properties/UnitTestApp.rd.xml             |  2 +-
 .../Test_TokenizingTextBox_General.cs         |  6 +-
 ...okenizingTextBox_InterspersedCollection.cs | 10 +--
 .../Controls/Test_UniformGrid_AutoLayout.cs   | 64 ++++++++--------
 .../Controls/Test_UniformGrid_Dimensions.cs   | 36 ++++-----
 .../UI/Controls/Test_UniformGrid_FreeSpots.cs | 24 +++---
 .../Test_UniformGrid_RowColDefinitions.cs     |  4 +-
 69 files changed, 310 insertions(+), 312 deletions(-)

diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs b/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
index 89fc0053229..1a0e503a351 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
     public partial class EmojiInline
     {
         // Codes taken from https://gist.github.com/rxaviers/7360908
-        // Ignoring not implented symbols in Segoe UI Emoji font (e.g. :bowtie:)
+        // Ignoring not implemented symbols in Segoe UI Emoji font (e.g. :bowtie:)
         private static readonly Dictionary<string, int> _emojiCodesDictionary = new Dictionary<string, int>
         {
             { "smile", 0x1f604 },
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs b/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs
index 2acf0b4e4e3..4297f6e6676 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs
@@ -325,7 +325,7 @@ internal static InlineParseResult ParseEmailAddress(string markdown, int minStar
             // reddit (for example: '$' and '!').
 
             // Special characters as per https://en.wikipedia.org/wiki/Email_address#Local-part allowed
-            char[] allowedchars = new char[] { '!', '#', '$', '%', '&', '\'', '*', '+', '-', '/', '=', '?', '^', '_', '`', '{', '|', '}', '~' };
+            char[] allowedChars = { '!', '#', '$', '%', '&', '\'', '*', '+', '-', '/', '=', '?', '^', '_', '`', '{', '|', '}', '~' };
 
             int start = tripPos;
             while (start > minStart)
@@ -334,7 +334,7 @@ internal static InlineParseResult ParseEmailAddress(string markdown, int minStar
                 if ((c < 'a' || c > 'z') &&
                     (c < 'A' || c > 'Z') &&
                     (c < '0' || c > '9') &&
-                    !allowedchars.Contains(c))
+                    !allowedChars.Contains(c))
                 {
                     break;
                 }
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs b/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs
index 135dfec69a6..3b85323045b 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs
@@ -118,7 +118,7 @@ internal static InlineParseResult Parse(string markdown, int start, int end)
 
             if (pos < end && markdown[pos] == '[')
             {
-                int refstart = pos;
+                int refStart = pos;
 
                 // Find the reference ']' character
                 while (pos < end)
@@ -131,7 +131,7 @@ internal static InlineParseResult Parse(string markdown, int start, int end)
                     pos++;
                 }
 
-                reference = markdown.Substring(refstart + 1, pos - refstart - 1);
+                reference = markdown.Substring(refStart + 1, pos - refStart - 1);
             }
             else if (pos < end && markdown[pos] == '(')
             {
@@ -156,10 +156,10 @@ internal static InlineParseResult Parse(string markdown, int start, int end)
                 if (imageDimensionsPos > 0)
                 {
                     // trying to find 'x' which separates image width and height
-                    var dimensionsSepatorPos = markdown.IndexOf("x", imageDimensionsPos + 2, pos - imageDimensionsPos - 1, StringComparison.Ordinal);
+                    var dimensionsSeparatorPos = markdown.IndexOf("x", imageDimensionsPos + 2, pos - imageDimensionsPos - 1, StringComparison.Ordinal);
 
                     // didn't find separator, trying to parse value as imageWidth
-                    if (dimensionsSepatorPos == -1)
+                    if (dimensionsSeparatorPos == -1)
                     {
                         var imageWidthStr = markdown.Substring(imageDimensionsPos + 2, pos - imageDimensionsPos - 2);
 
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs b/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs
index adf1899e2aa..06937b1946b 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs
@@ -354,10 +354,10 @@ internal static TextRunInline Parse(string markdown, int start, int end)
                         continue;
                     }
 
-                    // Okay, we have an entity, but is it one we recognise?
+                    // Okay, we have an entity, but is it one we recognize?
                     string entityName = markdown.Substring(sequenceStartIndex + 1, semicolonIndex - (sequenceStartIndex + 1));
 
-                    // Unrecognised entity.
+                    // Unrecognized entity.
                     if (_entities.ContainsKey(entityName) == false)
                     {
                         continue;
diff --git a/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs b/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs
index c43cff1e462..ba481207856 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs
@@ -101,7 +101,7 @@ internal static List<MarkdownBlock> Parse(string markdown, int start, int end, i
             var paragraphText = new StringBuilder();
 
             // These are needed to parse underline-style header blocks.
-            int previousRealtStartOfLine = start;
+            int previousRealStartOfLine = start;
             int previousStartOfLine = start;
             int previousEndOfLine = start;
 
@@ -160,18 +160,18 @@ internal static List<MarkdownBlock> Parse(string markdown, int start, int end, i
                     else
                     {
                         int lastIndentation = 0;
-                        string lastline = null;
+                        string lastLine = null;
 
                         // Determines how many Quote levels were in the last line.
                         if (realStartOfLine > 0)
                         {
-                            lastline = markdown.Substring(previousRealtStartOfLine, previousEndOfLine - previousRealtStartOfLine);
-                            lastIndentation = lastline.Count(c => c == '>');
+                            lastLine = markdown.Substring(previousRealStartOfLine, previousEndOfLine - previousRealStartOfLine);
+                            lastIndentation = lastLine.Count(c => c == '>');
                         }
 
                         var currentEndOfLine = Common.FindNextSingleNewLine(markdown, nonSpacePos, end, out _);
-                        var currentline = markdown.Substring(realStartOfLine, currentEndOfLine - realStartOfLine);
-                        var currentIndentation = currentline.Count(c => c == '>');
+                        var currentLine = markdown.Substring(realStartOfLine, currentEndOfLine - realStartOfLine);
+                        var currentIndentation = currentLine.Count(c => c == '>');
                         var firstChar = markdown[realStartOfLine];
 
                         // This is a quote that doesn't start with a Quote marker, but carries on from the last line.
@@ -364,7 +364,7 @@ internal static List<MarkdownBlock> Parse(string markdown, int start, int end, i
                 }
 
                 // Repeat.
-                previousRealtStartOfLine = realStartOfLine;
+                previousRealStartOfLine = realStartOfLine;
                 previousStartOfLine = startOfLine;
                 previousEndOfLine = endOfLine;
                 startOfLine = startOfNextLine;
diff --git a/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs b/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
index 27420f9926d..65c2a56a6b7 100644
--- a/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
@@ -37,7 +37,7 @@ public override IEnumerable<RssSchema> LoadFeed(XDocument doc)
         }
 
         /// <summary>
-        /// Retieves strong type for passed item.
+        /// Retrieves strong type for passed item.
         /// </summary>
         /// <param name="item">XElement to parse.</param>
         /// <returns>Strong typed object.</returns>
diff --git a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs b/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
index e17afdbf233..5b4b19d5af3 100644
--- a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
@@ -23,9 +23,9 @@ internal static class RssHelper
         private const string ImagePattern = @"<img.*?src=[\""'](.+?)[\""'].*?>";
 
         /// <summary>
-        /// String for regular xpression for hyperlink pattern.
+        /// String for regular expression for hyperlink pattern.
         /// </summary>
-        private const string HiperlinkPattern = @"<a\s+(?:[^>]*?\s+)?href=""([^ ""]*)""";
+        private const string HyperlinkPattern = @"<a\s+(?:[^>]*?\s+)?href=""([^ ""]*)""";
 
         /// <summary>
         /// String for regular expression for height pattern.
@@ -45,7 +45,7 @@ internal static class RssHelper
         /// <summary>
         /// Regular expression for hyperlink pattern.
         /// </summary>
-        private static readonly Regex RegexLinks = new Regex(HiperlinkPattern, RegexOptions.IgnoreCase);
+        private static readonly Regex RegexLinks = new Regex(HyperlinkPattern, RegexOptions.IgnoreCase);
 
         /// <summary>
         /// Regular expression for height pattern.
@@ -82,7 +82,7 @@ public static string SanitizeString(this string text)
         }
 
         /// <summary>
-        /// Get item date from xelement and element name.
+        /// Get item date from <see cref="XElement"/> and element name.
         /// </summary>
         /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of element.</param>
@@ -93,7 +93,7 @@ public static DateTime GetSafeElementDate(this XElement item, string elementName
         }
 
         /// <summary>
-        /// Get item date from xelement, element name and namespace.
+        /// Get item date from <see cref="XElement"/>, element name and <see cref="XNamespace"/>.
         /// </summary>
         /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of element.</param>
@@ -117,7 +117,7 @@ public static DateTime GetSafeElementDate(this XElement item, string elementName
         }
 
         /// <summary>
-        /// Get item string value for xelement and element name.
+        /// Get item string value for <see cref="XElement"/> and element name.
         /// </summary>
         /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of element.</param>
@@ -133,7 +133,7 @@ public static string GetSafeElementString(this XElement item, string elementName
         }
 
         /// <summary>
-        /// Get item string values for xelement and element name.
+        /// Get item string values for <see cref="XElement"/> and element name.
         /// </summary>
         /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of the element.</param>
@@ -144,9 +144,9 @@ public static IEnumerable<string> GetSafeElementsString(this XElement item, stri
         }
 
         /// <summary>
-        /// Get item string values for xelement, element name and namespace.
+        /// Get item string values for <see cref="XElement"/>, element name and namespace.
         /// </summary>
-        /// <param name="item">XELement item.</param>
+        /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of element.</param>
         /// <param name="xNamespace">XNamespace namespace.</param>
         /// <returns>Safe list of string values.</returns>
@@ -163,7 +163,7 @@ public static IEnumerable<string> GetSafeElementsString(this XElement item, stri
         }
 
         /// <summary>
-        /// Get item string value for xelement, element name and namespace.
+        /// Get item string value for <see cref="XElement"/>, element name and namespace.
         /// </summary>
         /// <param name="item">XElement item.</param>
         /// <param name="elementName">Name of element.</param>
@@ -387,7 +387,7 @@ private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
             { "AT", new[] { "+0200", "Azores" } },
             { "AWDT", new[] { "-0900", "Australian West Daylight" } },
             { "AWST", new[] { "-0800", "Australian West Standard" } },
-            { "BAT", new[] { "-0300", "Bhagdad" } },
+            { "BAT", new[] { "-0300", "Baghdad" } },
             { "BDST", new[] { "-0200", "British Double Summer" } },
             { "BET", new[] { "+1100", "Bering Standard" } },
             { "BST", new[] { "+0300", "Brazil Standard" } },
@@ -413,8 +413,8 @@ private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
             { "GST", new[] { "-1000", "Guam Standard" } },
             { "HDT", new[] { "+0900", "Hawaii Daylight" } },
             { "HST", new[] { "+1000", "Hawaii Standard" } },
-            { "IDLE", new[] { "-1200", "Internation Date Line East" } },
-            { "IDLW", new[] { "+1200", "Internation Date Line West" } },
+            { "IDLE", new[] { "-1200", "International Date Line East" } },
+            { "IDLW", new[] { "+1200", "International Date Line West" } },
             { "IST", new[] { "-0530", "Indian Standard" } },
             { "IT", new[] { "-0330", "Iran" } },
             { "JST", new[] { "-0900", "Japan Standard" } },
diff --git a/Microsoft.Toolkit.Services/Exceptions/ParserNullException.cs b/Microsoft.Toolkit.Services/Exceptions/ParserNullException.cs
index a2767034a68..24da1f64e11 100644
--- a/Microsoft.Toolkit.Services/Exceptions/ParserNullException.cs
+++ b/Microsoft.Toolkit.Services/Exceptions/ParserNullException.cs
@@ -33,7 +33,7 @@ public ParserNullException(string message)
         /// Initializes a new instance of the <see cref="ParserNullException"/> class.
         /// Constructor with additional message and inner exception.
         /// </summary>
-        /// <param name="message">Additonal message.</param>
+        /// <param name="message">Additional message.</param>
         /// <param name="innerException">Reference to inner exception.</param>
         public ParserNullException(string message, Exception innerException)
             : base(message, innerException)
diff --git a/Microsoft.Toolkit.Services/Exceptions/RequestFailedException.cs b/Microsoft.Toolkit.Services/Exceptions/RequestFailedException.cs
index 87325795ba9..6bfd16057f0 100644
--- a/Microsoft.Toolkit.Services/Exceptions/RequestFailedException.cs
+++ b/Microsoft.Toolkit.Services/Exceptions/RequestFailedException.cs
@@ -24,7 +24,7 @@ public RequestFailedException()
         /// Initializes a new instance of the <see cref="RequestFailedException"/> class.
         /// Constructor with additional message.
         /// </summary>
-        /// <param name="message">Additional messsage.</param>
+        /// <param name="message">Additional message.</param>
         public RequestFailedException(string message)
             : base(message)
         {
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
index 11ea848c2d1..a182c84902b 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkAuthenticationBroker.cs
@@ -17,7 +17,7 @@ public Task<AuthenticationResult> Authenticate(Uri requestUri, Uri callbackUri)
             int numberForms = ApplicationForm.OpenForms.Count;
             if (numberForms > 0)
             {
-                return AutenticateForm(requestUri, callbackUri);
+                return this.AuthenticateForm(requestUri, callbackUri);
             }
             else if (Application.Current != null)
             {
@@ -45,7 +45,7 @@ public async Task<AuthenticationResult> AuthenticateWindow(Uri requestUri, Uri c
             return await taskCompletionSource.Task;
         }
 
-        public async Task<AuthenticationResult> AutenticateForm(Uri requestUri, Uri callbackUri)
+        public async Task<AuthenticationResult> AuthenticateForm(Uri requestUri, Uri callbackUri)
         {
             PopupForm popupForm;
             var taskCompletionSource = new TaskCompletionSource<AuthenticationResult>();
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkPasswordManager.cs b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkPasswordManager.cs
index 2ae71a41872..bca8353a8b1 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkPasswordManager.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/NetFrameworkPasswordManager.cs
@@ -31,10 +31,10 @@ public void Store(string resource, PasswordCredential credential)
                 Type = CRED_TYPE.GENERIC,
                 Persist = CRED_PERSIST.LOCAL_MACHINE
             };
-            NativeCredential ncred = NativeCredential.GetNativeCredential(cred);
+            NativeCredential userCredential = NativeCredential.GetNativeCredential(cred);
 
             // Write the info into the CredMan storage.
-            bool written = CredWrite(ref ncred, 0);
+            bool written = CredWrite(ref userCredential, 0);
             int lastError = Marshal.GetLastWin32Error();
             if (!written)
             {
@@ -52,14 +52,14 @@ public PasswordCredential Get(string key)
                 return null;
             }
 
-            CriticalCredentialHandle critCred = new CriticalCredentialHandle(nCredPtr);
+            CriticalCredentialHandle credentialHandle = new CriticalCredentialHandle(nCredPtr);
 
-            Credential credential = critCred.GetCredential();
-            PasswordCredential passCred = new PasswordCredential();
-            passCred.UserName = credential.UserName;
-            passCred.Password = credential.CredentialBlob;
-
-            return passCred;
+            Credential credential = credentialHandle.GetCredential();
+            return new PasswordCredential
+            {
+                UserName = credential.UserName,
+                Password = credential.CredentialBlob
+            };
         }
 
         public void Remove(string key)
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PasswordManagerNativeMethods.cs b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PasswordManagerNativeMethods.cs
index 6a60cee6fcb..d4f9a993fd3 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PasswordManagerNativeMethods.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PasswordManagerNativeMethods.cs
@@ -66,7 +66,7 @@ internal struct NativeCredential
             /// instance.</returns>
             internal static NativeCredential GetNativeCredential(Credential cred)
             {
-                NativeCredential ncred = new NativeCredential
+                return new NativeCredential
                 {
                     AttributeCount = 0,
                     Attributes = IntPtr.Zero,
@@ -79,7 +79,6 @@ internal static NativeCredential GetNativeCredential(Credential cred)
                     CredentialBlob = Marshal.StringToCoTaskMemUni(cred.CredentialBlob),
                     UserName = Marshal.StringToCoTaskMemUni(cred.UserName)
                 };
-                return ncred;
             }
         }
 
@@ -116,21 +115,20 @@ internal Credential GetCredential()
                 if (!IsInvalid)
                 {
                     // Get the Credential from the mem location
-                    NativeCredential ncred = (NativeCredential)Marshal.PtrToStructure(handle, typeof(NativeCredential));
+                    NativeCredential nativeCredential = (NativeCredential)Marshal.PtrToStructure(handle, typeof(NativeCredential));
 
                     // Create a managed Credential type and fill it with data from the native counterpart.
-                    Credential cred = new Credential
+                    return new Credential
                     {
-                        CredentialBlobSize = ncred.CredentialBlobSize,
-                        CredentialBlob = Marshal.PtrToStringUni(ncred.CredentialBlob, (int)ncred.CredentialBlobSize / 2),
-                        UserName = Marshal.PtrToStringUni(ncred.UserName),
-                        TargetName = Marshal.PtrToStringUni(ncred.TargetName),
-                        TargetAlias = Marshal.PtrToStringUni(ncred.TargetAlias),
-                        Type = ncred.Type,
-                        Flags = ncred.Flags,
-                        Persist = (CRED_PERSIST)ncred.Persist
+                        CredentialBlobSize = nativeCredential.CredentialBlobSize,
+                        CredentialBlob = Marshal.PtrToStringUni(nativeCredential.CredentialBlob, (int)nativeCredential.CredentialBlobSize / 2),
+                        UserName = Marshal.PtrToStringUni(nativeCredential.UserName),
+                        TargetName = Marshal.PtrToStringUni(nativeCredential.TargetName),
+                        TargetAlias = Marshal.PtrToStringUni(nativeCredential.TargetAlias),
+                        Type = nativeCredential.Type,
+                        Flags = nativeCredential.Flags,
+                        Persist = (CRED_PERSIST)nativeCredential.Persist
                     };
-                    return cred;
                 }
                 else
                 {
@@ -139,14 +137,14 @@ internal Credential GetCredential()
             }
 
             // Perform any specific actions to release the handle in the ReleaseHandle method.
-            // Often, you need to use Pinvoke to make a call into the Win32 API to release the
+            // Often, you need to use PInvoke to make a call into the Win32 API to release the
             // handle. In this case, however, we can use the Marshal class to release the unmanaged memory.
             protected override bool ReleaseHandle()
             {
                 // If the handle was set, free it. Return success.
                 if (!IsInvalid)
                 {
-                    // NOTE: We should also ZERO out the memory allocated to the handle, before free'ing it
+                    // NOTE: We should also ZERO out the memory allocated to the handle, before freeing it
                     // so there are no traces of the sensitive data left in memory.
                     CredFree(handle);
 
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PopupForm.cs b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PopupForm.cs
index e62b5d2ea78..2c4e6a2ac41 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PopupForm.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/NETFramework/PopupForm.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Toolkit.Services.PlatformSpecific.NetFramework
 {
     /// <summary>
-    /// Service WebView for winforms
+    /// Service WebView for windows forms
     /// </summary>
     public partial class PopupForm : Form
     {
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpPasswordManager.cs b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpPasswordManager.cs
index d1d4308832c..4d7b3f77fee 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpPasswordManager.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpPasswordManager.cs
@@ -29,13 +29,13 @@ public UwpPasswordManager()
         /// <inheritdoc/>
         public Toolkit.Services.Core.PasswordCredential Get(string key)
         {
-            var crendentials = RetrievePasswordCredential(key);
-            if (crendentials == null)
+            var credentials = RetrievePasswordCredential(key);
+            if (credentials == null)
             {
                 return null;
             }
 
-            return new Toolkit.Services.Core.PasswordCredential { Password = crendentials.Password, UserName = crendentials.UserName };
+            return new Toolkit.Services.Core.PasswordCredential { Password = credentials.Password, UserName = credentials.UserName };
         }
 
         private Windows.Security.Credentials.PasswordCredential RetrievePasswordCredential(string key)
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index 63ee832164f..251e5fb711d 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -113,7 +113,7 @@ public Task LogoutAsync()
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevent token information for Uwp.
+        /// Initialize underlying provider with relevant token information for Uwp.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>
@@ -124,7 +124,7 @@ public bool Initialize(LinkedInOAuthTokens oAuthTokens, LinkedInPermissions requ
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="clientId">Client Id.</param>
         /// <param name="clientSecret">Client secret.</param>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInShareResponse.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInShareResponse.cs
index de06b079155..294511da5a4 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInShareResponse.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInShareResponse.cs
@@ -10,12 +10,12 @@ namespace Microsoft.Toolkit.Services.LinkedIn
     public class LinkedInShareResponse
     {
         /// <summary>
-        /// Gets or sets updatekey property.
+        /// Gets or sets UpdateKey property.
         /// </summary>
         public string UpdateKey { get; set; }
 
         /// <summary>
-        /// Gets or sets updateurl property.
+        /// Gets or sets UpdateUrl property.
         /// </summary>
         public string UpdateUrl { get; set; }
     }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index d343db885ab..703657cf2fb 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -151,7 +151,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens, IAuthenticationBroker aut
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevent token information for Uwp.
+        /// Initialize underlying provider with relevant token information for Uwp.
         /// </summary>
         /// <param name="consumerKey">Consumer key.</param>
         /// <param name="consumerSecret">Consumer secret.</param>
@@ -163,7 +163,7 @@ public bool Initialize(string consumerKey, string consumerSecret, string callbac
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <returns>Success or failure.</returns>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
index 246c3eeca8d..91f582f41f8 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEventType.cs
@@ -35,7 +35,7 @@ public enum TwitterStreamEventType
         Favorite,
 
         /// <summary>
-        /// The source user has unfaovorited the target users tweet.
+        /// The source user has unfavorited the target users tweet.
         /// </summary>
         [EnumMemberAttribute(Value = "unfavorite")]
         Unfavorite,
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
index 095e0aec6a5..63073ed15d1 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
@@ -18,7 +18,7 @@ public class TwitterUrlUnwound
         public string Url { get; set; }
 
         /// <summary>
-        /// Gets or sets status of unwind; if anything but 200 the data's bad.
+        /// Gets or sets status of unwind; if anything but 200 is bad data.
         /// </summary>
         [JsonProperty("status")]
         public int Status { get; set; }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
index b3484b95663..dad92788421 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
@@ -54,7 +54,7 @@ public class TwitterUser
         public bool Protected { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether account is verified (blue checkmark).
+        /// Gets or sets a value indicating whether account is verified (blue check mark).
         /// </summary>
         [JsonProperty("verified")]
         public bool Verified { get; set; }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
index e0148295af9..d8f036df41f 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
@@ -51,16 +51,16 @@ public ITwitterResult Parse(string data)
             var events = obj.SelectToken("event", false);
             if (events != null)
             {
-                var targetobject = obj.SelectToken("target_object", false);
-                Tweet endtargetobject = null;
-                if (targetobject?.SelectToken("user", false) != null)
+                var targetObject = obj.SelectToken("target_object", false);
+                Tweet endTargetObject = null;
+                if (targetObject?.SelectToken("user", false) != null)
                 {
-                    endtargetobject = JsonConvert.DeserializeObject<Tweet>(targetobject.ToString());
+                    endTargetObject = JsonConvert.DeserializeObject<Tweet>(targetObject.ToString());
                 }
 
-                var endevent = JsonConvert.DeserializeObject<TwitterStreamEvent>(obj.ToString());
-                endevent.TargetObject = endtargetobject;
-                return endevent;
+                var endEvent = JsonConvert.DeserializeObject<TwitterStreamEvent>(obj.ToString());
+                endEvent.TargetObject = endTargetObject;
+                return endEvent;
             }
 
             var user = obj.SelectToken("user", false);
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
index 6863ba46aa6..f5f8dd7ec99 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
@@ -136,7 +136,7 @@ public bool Initialize(WeiboOAuthTokens oAuthTokens, IAuthenticationBroker authe
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevent token information for Uwp.
+        /// Initialize underlying provider with relevant token information for Uwp.
         /// </summary>
         /// <param name="appKey">App key.</param>
         /// <param name="appSecret">App secret.</param>
@@ -148,7 +148,7 @@ public bool Initialize(string appKey, string appSecret, string redirectUri)
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <returns>Success or failure.</returns>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
index 82e55fdeae1..f8312087338 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
@@ -84,7 +84,7 @@ public class WeiboUser
         public int StatusesCount { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether account is verified (blue checkmark).
+        /// Gets or sets a value indicating whether account is verified (blue check mark).
         /// </summary>
         [JsonProperty("verified")]
         public bool Verified { get; set; }
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs
index e54d84f4ef8..2e72750c433 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs
+++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs
@@ -35,7 +35,7 @@ public class ObservableBluetoothLEDevice : INotifyPropertyChanged, IEquatable<Ob
         public class RSSIComparer : IComparer
         {
             /// <summary>
-            /// Compares two ObservableBluettothLEDevices and returns a value indicating
+            /// Compares two <see cref="ObservableBluetoothLEDevice"/> and returns a value indicating
             /// whether one is less than, equal to, or greater than the other.
             /// </summary>
             /// <param name="x">First object to compare</param>
@@ -401,7 +401,7 @@ private void ObservableBluetoothLEDevice_PropertyChanged(object sender, Property
         /// ConnectAsync to this bluetooth device
         /// </summary>
         /// <returns>Connection task</returns>
-        /// <exception cref="Exception">Thorws Exception when no permission to access device</exception>
+        /// <exception cref="Exception">Throws Exception when no permission to access device</exception>
         public async Task ConnectAsync()
         {
             await DispatcherQueue.ExecuteOnUIThreadAsync(
@@ -438,9 +438,9 @@ await DispatcherQueue.ExecuteOnUIThreadAsync(
                     // In case we connected before, clear the service list and recreate it
                     Services.Clear();
 
-                    foreach (var serv in _result.Services)
+                    foreach (var service in _result.Services)
                     {
-                        Services.Add(new ObservableGattDeviceService(serv));
+                        Services.Add(new ObservableGattDeviceService(service));
                     }
 
                     ServiceCount = Services.Count;
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseImageHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseImageHelper.cs
index 67181d8ab1e..88afb1326a9 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseImageHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseImageHelper.cs
@@ -19,18 +19,18 @@ internal static void SetSource(ref string destination, string value)
             destination = value;
         }
 
-        internal static Element_AdaptiveImage CreateBaseElement(IBaseImage curr)
+        internal static Element_AdaptiveImage CreateBaseElement(IBaseImage current)
         {
-            if (curr.Source == null)
+            if (current.Source == null)
             {
                 throw new NullReferenceException("Source property is required.");
             }
 
             return new Element_AdaptiveImage()
             {
-                Src = curr.Source,
-                Alt = curr.AlternateText,
-                AddImageQuery = curr.AddImageQuery
+                Src = current.Source,
+                Alt = current.AlternateText,
+                AddImageQuery = current.AddImageQuery
             };
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
index a3ab59d4218..8cf643129b1 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
@@ -8,12 +8,12 @@ namespace Microsoft.Toolkit.Uwp.Notifications
 {
     internal class BaseTextHelper
     {
-        internal static Element_AdaptiveText CreateBaseElement(IBaseText curr)
+        internal static Element_AdaptiveText CreateBaseElement(IBaseText baseText)
         {
             return new Element_AdaptiveText()
             {
-                Text = curr.Text,
-                Lang = curr.Language
+                Text = baseText.Text,
+                Lang = baseText.Language
             };
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
index 9948ed5353a..0ef54e3ec39 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
@@ -28,7 +28,7 @@ internal NotificationUserInput(NotificationActivator.NOTIFICATION_USER_INPUT_DAT
         /// <summary>
         /// Gets the value of an input with the given key.
         /// </summary>
-        /// <param name="key">The key of the inpupt.</param>
+        /// <param name="key">The key of the input.</param>
         /// <returns>The value of the input.</returns>
         public string this[string key] => _data.First(i => i.Key == key).Value;
 
@@ -48,7 +48,7 @@ internal NotificationUserInput(NotificationActivator.NOTIFICATION_USER_INPUT_DAT
         public int Count => _data.Length;
 
         /// <summary>
-        /// Checks whether any inpupts have the given key.
+        /// Checks whether any inputs have the given key.
         /// </summary>
         /// <param name="key">The key to look for.</param>
         /// <returns>A boolean representing whether any inputs have the given key.</returns>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/Builder/TileContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/Builder/TileContentBuilder.cs
index 705a42c1373..8f2f5eadc44 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/Builder/TileContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/Builder/TileContentBuilder.cs
@@ -385,7 +385,7 @@ public TileContentBuilder SetTextStacking(TileTextStacking textStacking, TileSiz
         }
 
         /// <summary>
-        /// Set the tile's activation arguments for chasable tile notification.
+        /// Set the tile's activation arguments for tile notification.
         /// </summary>
         /// <param name="args">App-Defined custom arguments that will be passed in when the user click on the tile when this tile notification is being displayed.</param>
         /// <param name="size">The tile size that the custom argument should be applied to. Default to all currently supported tile size.</param>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.cs
index ea744557440..a2c9f0f698e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.cs
@@ -110,16 +110,16 @@ private async void PrintButton_Click(object sender, RoutedEventArgs e)
         {
             SampleController.Current.DisplayWaitRing = true;
 
-            var printblock = new RichTextBlock
+            var printBlock = new RichTextBlock
             {
                 FontFamily = _codeView.FontFamily,
                 RequestedTheme = ElementTheme.Light
             };
             var printFormatter = new RichTextBlockFormatter(ElementTheme.Light);
-            printFormatter.FormatRichTextBlock(_displayedText, _language, printblock);
+            printFormatter.FormatRichTextBlock(_displayedText, _language, printBlock);
 
             _printHelper = new PrintHelper(_container);
-            _printHelper.AddFrameworkElementToPrint(printblock);
+            _printHelper.AddFrameworkElementToPrint(printBlock);
 
             _printHelper.OnPrintFailed += PrintHelper_OnPrintFailed;
             _printHelper.OnPrintSucceeded += PrintHelper_OnPrintSucceeded;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
index 3e6e40ca28a..dc671f7c5a6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
@@ -79,7 +79,7 @@ protected override void RenderCode(CodeBlock element, IRenderContext context)
                 if (language != "XAML"
                     && prevIndex >= 0
                     && collection[prevIndex] is StackPanel prevPanel
-                    && prevPanel.Tag is CustCodeBlock block
+                    && prevPanel.Tag is CustomCodeBlock block
                     && !block.Languages.ContainsKey("XAML") // Prevent combining of XAML Code Blocks.
                     && !block.Languages.ContainsKey(language))
                 {
@@ -162,7 +162,7 @@ protected override void RenderCode(CodeBlock element, IRenderContext context)
                 }
                 else
                 {
-                    block = new CustCodeBlock();
+                    block = new CustomCodeBlock();
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
                     block.Languages.Add(language, (viewer, element.Text));
 #pragma warning restore SA1008 // Opening parenthesis must be spaced correctly
@@ -203,7 +203,7 @@ protected override void RenderCode(CodeBlock element, IRenderContext context)
                     headerGrid.Children.Add(copyButton);
                     Grid.SetColumn(copyButton, 1);
 
-                    // Collection the adornment and the standard UI, add them to a Stackpanel, and add it back to the collection.
+                    // Collection the adornment and the standard UI, add them to a StackPanel, and add it back to the collection.
                     var panel = new StackPanel
                     {
                         Background = viewer.Background,
@@ -266,9 +266,9 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                         }
                     }
                 }
-                else if (firstInline is TextRunInline textinline)
+                else if (firstInline is TextRunInline textRunInline)
                 {
-                    var key = textinline.Text.Split(' ').FirstOrDefault();
+                    var key = textRunInline.Text.Split(' ').FirstOrDefault();
                     if (styles.TryGetValue(key, out var style) && !style.Ignore)
                     {
                         noteType = style;
@@ -276,7 +276,7 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                         symbolGlyph = style.Glyph;
 
                         // Removes the identifier from the text
-                        textinline.Text = textinline.Text.Replace(key, string.Empty);
+                        textRunInline.Text = textRunInline.Text.Replace(key, string.Empty);
 
                         if (theme == ElementTheme.Light)
                         {
@@ -292,9 +292,9 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                         // Apply special formatting context.
                         if (noteType != null)
                         {
-                            if (localContext?.Clone() is UIElementCollectionRenderContext newcontext)
+                            if (localContext?.Clone() is UIElementCollectionRenderContext newContext)
                             {
-                                localContext = newcontext;
+                                localContext = newContext;
 
                                 localContext.TrimLeadingWhitespace = true;
                                 QuoteForeground = Foreground;
@@ -306,7 +306,7 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context)
                     if (style.Ignore)
                     {
                         // Blank entire block
-                        textinline.Text = string.Empty;
+                        textRunInline.Text = string.Empty;
                     }
                 }
             }
@@ -504,7 +504,7 @@ private class DocFXNote
         /// <summary>
         /// Code Block Tag Information to track current Language and Alternate Views.
         /// </summary>
-        private class CustCodeBlock
+        private class CustomCodeBlock
         {
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
 #pragma warning disable SA1009 // Closing parenthesis must be spaced correctly
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index d9aeb0c36ba..9e21f19f9ba 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -473,7 +473,7 @@ public async Task PreparePropertyDescriptorAsync()
 
                         if (existingOption == null && string.IsNullOrWhiteSpace(type))
                         {
-                            throw new NotSupportedException($"Unrecognized short identifier '{name}'; Define type and parameters of property in first occurence in {XamlCodeFile}.");
+                            throw new NotSupportedException($"Unrecognized short identifier '{name}'; Define type and parameters of property in first occurrence in {XamlCodeFile}.");
                         }
 
                         if (Enum.TryParse(type, out PropertyKind kind))
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
index 75415ae6431..0607623cd30 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
@@ -201,7 +201,7 @@
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
 
-                        <Border x:Name="Seperator"
+                        <Border x:Name="Separator"
                                 Grid.Row="4"
                                 Grid.Column="4"
                                 BorderThickness="0,1,0,0"
@@ -257,9 +257,9 @@
                         <Setter Target="NotesSection.(Grid.Column)" Value="1" />
                         <Setter Target="NotesSection.(Grid.RowSpan)" Value="1" />
                         <Setter Target="PrivacyButton.(Grid.Column)" Value="1" />
-                        <Setter Target="Seperator.(Grid.Row)" Value="6" />
-                        <Setter Target="Seperator.(Grid.Column)" Value="1" />
-                        <Setter Target="Seperator.Margin" Value="0,0,0,48" />
+                        <Setter Target="Separator.(Grid.Row)" Value="6" />
+                        <Setter Target="Separator.(Grid.Column)" Value="1" />
+                        <Setter Target="Separator.Margin" Value="0,0,0,48" />
 
                         <Setter Target="WhatNewPanel.MinWidth" Value="267" />
                         <Setter Target="ReleaseNotesPanel.MinWidth" Value="267" />
@@ -293,9 +293,9 @@
                         <Setter Target="NotesSection.(Grid.Column)" Value="4" />
                         <Setter Target="NotesSection.(Grid.RowSpan)" Value="3" />
                         <Setter Target="PrivacyButton.(Grid.Column)" Value="4" />
-                        <Setter Target="Seperator.(Grid.Row)" Value="4" />
-                        <Setter Target="Seperator.(Grid.Column)" Value="4" />
-                        <Setter Target="Seperator.Margin" Value="0,48" />
+                        <Setter Target="Separator.(Grid.Row)" Value="4" />
+                        <Setter Target="Separator.(Grid.Column)" Value="4" />
+                        <Setter Target="Separator.Margin" Value="0,48" />
 
                         <Setter Target="WhatNewPanel.MinWidth" Value="0" />
                         <Setter Target="ReleaseNotesPanel.MinWidth" Value="0" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index 8fb16a2fd87..99d1f479794 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -205,15 +205,15 @@
                             Padding="0, 10,0,0"
                             Header="Documentation">
                         <ScrollViewer x:Name="DocumentationScrollViewer">
-                            <controls:MarkdownTextBlock x:Name="DocumentationTextblock"
+                            <controls:MarkdownTextBlock x:Name="DocumentationTextBlock"
                                                         Foreground="{ThemeResource DocumentationForeground}"
                                                         Background="Transparent"
                                                         CodeBackground="{ThemeResource SampleMarkdownBackgroundBrush}"
                                                         QuoteBackground="{ThemeResource SampleMarkdownBackgroundBrush}"
                                                         InlineCodeBackground="{ThemeResource SampleMarkdownInlineCodeBackgroundBrush}"
                                                         LinkForeground="{ThemeResource Brush-Link-Normal}"
-                                                        ImageResolving="DocumentationTextblock_ImageResolving"
-                                                        LinkClicked="DocumentationTextblock_OnLinkClicked"
+                                                        ImageResolving="DocumentationTextBlock_ImageResolving"
+                                                        LinkClicked="DocumentationTextBlock_OnLinkClicked"
                                                         SchemeList="uwpct"
                                                         IsFocusEngagementEnabled="False"
                                                         ImageMaxWidth="500"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
index 0b973d5f401..f5cb6329feb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
@@ -52,7 +52,7 @@ public SampleController()
             ThemePicker.SelectedIndex = (int)GetCurrentTheme();
             ThemePicker.SelectionChanged += ThemePicker_SelectionChanged;
 
-            DocumentationTextblock.SetRenderer<SampleAppMarkdownRenderer>();
+            DocumentationTextBlock.SetRenderer<SampleAppMarkdownRenderer>();
 
             ProcessSampleEditorTime();
             XamlCodeEditor.UpdateRequested += XamlCodeEditor_UpdateRequested;
@@ -287,7 +287,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
                     documentationPath = path;
                     if (!string.IsNullOrWhiteSpace(contents))
                     {
-                        DocumentationTextblock.Text = contents;
+                        DocumentationTextBlock.Text = contents;
                         InfoAreaPivot.Items.Add(DocumentationPivotItem);
                     }
                 }
@@ -439,7 +439,7 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
             });
         }
 
-        private async void DocumentationTextblock_OnLinkClicked(object sender, LinkClickedEventArgs e)
+        private async void DocumentationTextBlock_OnLinkClicked(object sender, LinkClickedEventArgs e)
         {
             TrackingManager.TrackEvent("Link", e.Link);
             var link = e.Link;
@@ -454,7 +454,7 @@ private async void DocumentationTextblock_OnLinkClicked(object sender, LinkClick
             }
         }
 
-        private async void DocumentationTextblock_ImageResolving(object sender, ImageResolvingEventArgs e)
+        private async void DocumentationTextBlock_ImageResolving(object sender, ImageResolvingEventArgs e)
         {
             var deferral = e.GetDeferral();
             BitmapImage image = null;
@@ -597,8 +597,8 @@ private void ProcessSampleEditorTime()
                 if (XamlCodeEditor.TimeSampleEditedFirst != DateTime.MinValue &&
                     XamlCodeEditor.TimeSampleEditedLast != DateTime.MinValue)
                 {
-                    int secondsEdditingSample = (int)Math.Floor((XamlCodeEditor.TimeSampleEditedLast - XamlCodeEditor.TimeSampleEditedFirst).TotalSeconds);
-                    TrackingManager.TrackEvent("xamleditor", "edited", CurrentSample.Name, secondsEdditingSample);
+                    int secondsEditingSample = (int)Math.Floor((XamlCodeEditor.TimeSampleEditedLast - XamlCodeEditor.TimeSampleEditedFirst).TotalSeconds);
+                    TrackingManager.TrackEvent("xamleditor", "edited", CurrentSample.Name, secondsEditingSample);
                 }
                 else
                 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
index 9073f54f3b3..31d776c7538 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
@@ -22,8 +22,8 @@
       the application package. The asterisks are not wildcards.
     -->
     <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
+
+
     <!-- Add your application specific runtime directives here. -->
     <Type Name="Windows.UI.Xaml.Controls.Border" Dynamic="Required Public" />
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AcrylicBrush/AcrylicBrushPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AcrylicBrush/AcrylicBrushPage.xaml.cs
index 742287ddd81..b77262dc5ec 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AcrylicBrush/AcrylicBrushPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AcrylicBrush/AcrylicBrushPage.xaml.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     /// <summary>
-    /// A page that shows how to use the acrylic brushe.
+    /// A page that shows how to use the acrylic brush.
     /// </summary>
     public sealed partial class AcrylicBrushPage : Page
     {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
index 58f48a11114..45e6f47a270 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
@@ -27,7 +27,7 @@ public AdaptiveGridViewPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            _adaptiveGridViewControl = control.FindDescendantByName("AdaptiveGridViewcontrol") as AdaptiveGridView;
+            _adaptiveGridViewControl = control.FindDescendantByName("AdaptiveGridViewControl") as AdaptiveGridView;
             if (_adaptiveGridViewControl != null)
             {
                 var allPhotos = await new Data.PhotosDataSource().GetItemsAsync();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
index 948c7d05de2..e4c011e89ab 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
@@ -38,7 +38,7 @@ public CameraPreviewPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            // Using a semaphore lock for synchronocity.
+            // Using a semaphore lock for synchronicity.
             // This method gets called multiple times when accessing the page from Latest Pages
             // and creates unused duplicate references to Camera and memory leaks.
             await semaphoreSlim.WaitAsync();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
index cb35082fd6f..b9e543948a7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
@@ -127,7 +127,7 @@ private void Load()
             SampleController.Current.RegisterNewCommand("Show notification with buttons (with DataTemplate)", (sender, args) =>
             {
                 _exampleVSCodeInAppNotification?.Dismiss();
-                SetCustomControlTemplate(); // Use the custom template without the Dismiss button. The DataTemplate will handle readding it.
+                SetCustomControlTemplate(); // Use the custom template without the Dismiss button. The DataTemplate will handle re-adding it.
 
                 object inAppNotificationWithButtonsTemplate = null;
                 bool? isTemplatePresent = _resources?.TryGetValue("InAppNotificationWithButtonsTemplate", out inAppNotificationWithButtonsTemplate);
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
index 643fdcfb38c..74d9a3db253 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
@@ -58,7 +58,7 @@ private void Tabs_TabClosing(object sender, TabClosingEventArgs e)
         private void Tabs_TabDraggedOutside(object sender, TabDraggedOutsideEventArgs e)
         {
             // The sample app let's you drag items from a static TabView with TabViewItem's pre-defined.
-            // In the case of databound scenarios e.Item should be your data item, and e.Tab should always be the TabViewItem.
+            // In the case of data bound scenarios e.Item should be your data item, and e.Tab should always be the TabViewItem.
             var str = e.Item.ToString();
 
             if (e.Tab != null)
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
index 20ba5566eef..fb3bedd36aa 100644
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
+++ b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
@@ -47,7 +47,7 @@ public FacebookService()
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
@@ -63,7 +63,7 @@ public bool Initialize(FacebookOAuthTokens oAuthTokens, FacebookPermissions requ
         }
 
         /// <summary>
-        /// Initialize underlying provider with relevent token information.
+        /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="appId">Application ID (Provided by Facebook developer site)</param>
         /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
@@ -206,7 +206,7 @@ public Task<List<FacebookPost>> RequestAsync(FacebookDataConfig config, int maxR
         /// <typeparam name="T">Strong type of model.</typeparam>
         /// <param name="config">FacebookDataConfig instance.</param>
         /// <param name="maxRecords">Upper limit of records to return.</param>
-        /// <param name="fields">A comma seperated string of required fields, which will have strongly typed representation in the model passed in.</param>
+        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
         /// <returns>Strongly typed list of data returned from the service.</returns>
         public async Task<List<T>> RequestAsync<T>(FacebookDataConfig config, int maxRecords = 20, string fields = "id,message,from,created_time,link,full_picture")
         {
@@ -247,7 +247,7 @@ public Task<IncrementalLoadingCollection<FacebookRequestSource<FacebookPost>, Fa
         /// <param name="config">FacebookDataConfig instance.</param>
         /// <param name="pageSize">Upper limit of records to return.</param>
         /// <param name="maxPages">Upper limit of pages to return.</param>
-        /// <param name="fields">A comma seperated string of required fields, which will have strongly typed representation in the model passed in.</param>
+        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
         /// <returns>Strongly typed list of data returned from the service.</returns>
         public async Task<IncrementalLoadingCollection<FacebookRequestSource<T>, T>> RequestAsync<T>(FacebookDataConfig config, int pageSize, int maxPages, string fields = "id,message,from,created_time,link,full_picture")
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
index 7d0007ee480..4ecb6db00a5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
@@ -21,7 +21,7 @@ public static partial class AnimationExtensions
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
 #pragma warning disable SA1009 // Closing parenthesis must be spaced correctly
                               /// <summary>
-                              /// A cached dictionary mapping easings to bezier control points
+                              /// A cached dictionary mapping easings to b�zier control points
                               /// </summary>
         private static readonly Dictionary<(string, EasingMode), (Vector2, Vector2)> _compositionEasingFunctions = new Dictionary<(string, EasingMode), (Vector2, Vector2)>();
 #pragma warning restore SA1009 // Closing parenthesis must be spaced correctly
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
index 2527c0fde1f..41acbb86571 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
@@ -205,7 +205,7 @@ private async Task SetHttpSourceCustomCached(Uri imageUri)
 
                 lock (LockObj)
                 {
-                    // If you have many imageEx in a virtualized listview for instance
+                    // If you have many imageEx in a virtualized ListView for instance
                     // controls will be recycled and the uri will change while waiting for the previous one to load
                     if (_uri == imageUri)
                     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
index 24bf75f92ee..80c2e695f82 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
@@ -127,7 +127,7 @@ protected void RemoveImageOpened(RoutedEventHandler handler)
         /// <summary>
         /// Attach image failed event handler
         /// </summary>
-        /// <param name="handler">Excpetion Routed Event Handler</param>
+        /// <param name="handler">Exception Routed Event Handler</param>
         protected void AttachImageFailed(ExceptionRoutedEventHandler handler)
         {
             var image = Image as Image;
@@ -146,7 +146,7 @@ protected void AttachImageFailed(ExceptionRoutedEventHandler handler)
         /// <summary>
         /// Remove Image Failed handler
         /// </summary>
-        /// <param name="handler">Excpetion Routed Event Handler</param>
+        /// <param name="handler">Exception Routed Event Handler</param>
         protected void RemoveImageFailed(ExceptionRoutedEventHandler handler)
         {
             var image = Image as Image;
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
index a0faebb1557..95c5ddb4bf0 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
-    /// Custom <see cref="MarkupExtension"/> which can provide symbol-baased <see cref="FontIcon"/> values.
+    /// Custom <see cref="MarkupExtension"/> which can provide symbol-based <see cref="FontIcon"/> values.
     /// </summary>
     [MarkupExtensionReturnType(ReturnType = typeof(FontIcon))]
     public class SymbolIconExtension : TextIconExtension
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Media/ScaleTransformExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Media/ScaleTransformExtensions.cs
index fb16885049d..81282711ed6 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Media/ScaleTransformExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Media/ScaleTransformExtensions.cs
@@ -15,7 +15,7 @@ public static class ScaleTransformExtensions
         /// Gets the matrix that represents this transform.
         /// Implements WPF's SkewTransform.Value.
         /// </summary>
-        /// <param name="transform">Extended SkewTranform.</param>
+        /// <param name="transform">Extended SkewTransform.</param>
         /// <returns>Matrix representing transform.</returns>
         public static Matrix GetMatrix(this ScaleTransform transform)
         {
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
index 3cc924678a9..e925c3ca131 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
@@ -15,105 +15,105 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
     /// </summary>
     /// <remarks>
     /// If <see cref="ValidationMode"> is set to Normal then IsValid will be set according to whether the regex is valid.</see>
-    /// If <see cref="ValidationMode"> is set to Forced then IsValid will be set according to whether the regex is valid, when TextBox lose focus and in case the textbox is invalid clear its value. </see>
-    /// If <see cref="ValidationMode"> is set to Dynamic then IsValid will be set according to whether the regex is valid. If the newest charachter is invalid, only invalid character of the Textbox will be deleted.</see>
+    /// If <see cref="ValidationMode"> is set to Forced then IsValid will be set according to whether the regex is valid, when TextBox lose focus and in case the TextBox is invalid clear its value. </see>
+    /// If <see cref="ValidationMode"> is set to Dynamic then IsValid will be set according to whether the regex is valid. If the newest character is invalid, only invalid character of the TextBox will be deleted.</see>
     /// </remarks>
     public partial class TextBoxRegex
     {
         private static void TextBoxRegexPropertyOnChange(DependencyObject sender, DependencyPropertyChangedEventArgs e)
         {
-            var textbox = sender as TextBox;
+            var textBox = sender as TextBox;
 
-            if (textbox == null)
+            if (textBox == null)
             {
                 return;
             }
 
-            ValidateTextBox(textbox, false);
+            ValidateTextBox(textBox, false);
 
-            textbox.Loaded -= Textbox_Loaded;
-            textbox.LostFocus -= Textbox_LostFocus;
-            textbox.TextChanged -= Textbox_TextChanged;
-            textbox.Loaded += Textbox_Loaded;
-            textbox.LostFocus += Textbox_LostFocus;
-            textbox.TextChanged += Textbox_TextChanged;
+            textBox.Loaded -= TextBox_Loaded;
+            textBox.LostFocus -= TextBox_LostFocus;
+            textBox.TextChanged -= TextBox_TextChanged;
+            textBox.Loaded += TextBox_Loaded;
+            textBox.LostFocus += TextBox_LostFocus;
+            textBox.TextChanged += TextBox_TextChanged;
         }
 
-        private static void Textbox_TextChanged(object sender, TextChangedEventArgs e)
+        private static void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            var textbox = (TextBox)sender;
-            var validationMode = (ValidationMode)textbox.GetValue(ValidationModeProperty);
-            ValidateTextBox(textbox, validationMode == ValidationMode.Dynamic);
+            var textBox = (TextBox)sender;
+            var validationMode = (ValidationMode)textBox.GetValue(ValidationModeProperty);
+            ValidateTextBox(textBox, validationMode == ValidationMode.Dynamic);
         }
 
-        private static void Textbox_Loaded(object sender, RoutedEventArgs e)
+        private static void TextBox_Loaded(object sender, RoutedEventArgs e)
         {
-            var textbox = (TextBox)sender;
-            ValidateTextBox(textbox);
+            var textBox = (TextBox)sender;
+            ValidateTextBox(textBox);
         }
 
-        private static void Textbox_LostFocus(object sender, RoutedEventArgs e)
+        private static void TextBox_LostFocus(object sender, RoutedEventArgs e)
         {
-            var textbox = (TextBox)sender;
-            ValidateTextBox(textbox);
+            var textBox = (TextBox)sender;
+            ValidateTextBox(textBox);
         }
 
-        private static void ValidateTextBox(TextBox textbox, bool force = true)
+        private static void ValidateTextBox(TextBox textBox, bool force = true)
         {
-            var validationType = (ValidationType)textbox.GetValue(ValidationTypeProperty);
+            var validationType = (ValidationType)textBox.GetValue(ValidationTypeProperty);
             string regex;
             bool regexMatch;
             switch (validationType)
             {
                 default:
-                    regex = textbox.GetValue(RegexProperty) as string;
+                    regex = textBox.GetValue(RegexProperty) as string;
                     if (string.IsNullOrWhiteSpace(regex))
                     {
                         Debug.WriteLine("Regex property can't be null or empty when custom mode is selected");
                         return;
                     }
 
-                    regexMatch = Regex.IsMatch(textbox.Text, regex);
+                    regexMatch = Regex.IsMatch(textBox.Text, regex);
                     break;
                 case ValidationType.Decimal:
-                    regexMatch = textbox.Text.IsDecimal();
+                    regexMatch = textBox.Text.IsDecimal();
                     break;
                 case ValidationType.Email:
-                    regexMatch = textbox.Text.IsEmail();
+                    regexMatch = textBox.Text.IsEmail();
                     break;
                 case ValidationType.Number:
-                    regexMatch = textbox.Text.IsNumeric();
+                    regexMatch = textBox.Text.IsNumeric();
                     break;
                 case ValidationType.PhoneNumber:
-                    regexMatch = textbox.Text.IsPhoneNumber();
+                    regexMatch = textBox.Text.IsPhoneNumber();
                     break;
                 case ValidationType.Characters:
-                    regexMatch = textbox.Text.IsCharacterString();
+                    regexMatch = textBox.Text.IsCharacterString();
                     break;
             }
 
             if (!regexMatch && force)
             {
-                if (!string.IsNullOrEmpty(textbox.Text))
+                if (!string.IsNullOrEmpty(textBox.Text))
                 {
-                    var validationModel = (ValidationMode)textbox.GetValue(ValidationModeProperty);
+                    var validationModel = (ValidationMode)textBox.GetValue(ValidationModeProperty);
                     if (validationModel == ValidationMode.Forced)
                     {
-                        textbox.Text = string.Empty;
+                        textBox.Text = string.Empty;
                     }
                     else if (validationType != ValidationType.Email && validationType != ValidationType.PhoneNumber)
                     {
                         if (validationModel == ValidationMode.Dynamic)
                         {
-                            int selectionStart = textbox.SelectionStart == 0 ? textbox.SelectionStart : textbox.SelectionStart - 1;
-                            textbox.Text = textbox.Text.Remove(selectionStart, 1);
-                            textbox.SelectionStart = selectionStart;
+                            int selectionStart = textBox.SelectionStart == 0 ? textBox.SelectionStart : textBox.SelectionStart - 1;
+                            textBox.Text = textBox.Text.Remove(selectionStart, 1);
+                            textBox.SelectionStart = selectionStart;
                         }
                     }
                 }
             }
 
-            textbox.SetValue(IsValidProperty, regexMatch);
+            textBox.SetValue(IsValidProperty, regexMatch);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs b/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
index ea127030465..5c858aeac00 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
@@ -98,10 +98,10 @@ protected DeepLinkParser(IActivatedEventArgs args)
             var launchArgs = args as ILaunchActivatedEventArgs;
             if (launchArgs == null)
             {
-                var protcolArgs = args as IProtocolActivatedEventArgs;
-                if (protcolArgs != null)
+                var protocolArgs = args as IProtocolActivatedEventArgs;
+                if (protocolArgs != null)
                 {
-                    ParseUriString(protcolArgs.Uri.OriginalString);
+                    ParseUriString(protocolArgs.Uri.OriginalString);
                 }
                 else
                 {
diff --git a/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs
index f8e78311c55..c226d512edb 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs
@@ -206,7 +206,7 @@ public static Task<T> AwaitableRunAsync<T>(this CoreDispatcher dispatcher, Func<
                 throw new ArgumentNullException(nameof(function));
             }
 
-            // Skip the dispatch, if posssible
+            // Skip the dispatch, if possible
             if (dispatcher.HasThreadAccess)
             {
                 try
@@ -240,7 +240,7 @@ public static Task<T> AwaitableRunAsync<T>(this CoreDispatcher dispatcher, Func<
         /// Extension method for <see cref="CoreDispatcher"/>. Offering an actual awaitable <see cref="Task"/> with optional result that will be executed on the given dispatcher.
         /// </summary>
         /// <param name="dispatcher">Dispatcher of a thread to run <paramref name="function"/>.</param>
-        /// <param name="function">Asynchrounous function to be executed on the given dispatcher.</param>
+        /// <param name="function">Asynchronous function to be executed on the given dispatcher.</param>
         /// <param name="priority">Dispatcher execution priority, default is normal.</param>
         /// <returns>An awaitable <see cref="Task"/> for the operation.</returns>
         /// <remarks>If the current thread has UI access, <paramref name="function"/> will be invoked directly.</remarks>
@@ -303,7 +303,7 @@ public static Task AwaitableRunAsync(this CoreDispatcher dispatcher, Func<Task>
         /// </summary>
         /// <typeparam name="T">Returned data type of the function.</typeparam>
         /// <param name="dispatcher">Dispatcher of a thread to run <paramref name="function"/>.</param>
-        /// <param name="function">Asynchrounous function to be executed asynchrounously on the given dispatcher.</param>
+        /// <param name="function">Asynchronous function to be executed asynchronously on the given dispatcher.</param>
         /// <param name="priority">Dispatcher execution priority, default is normal.</param>
         /// <returns>An awaitable <see cref="Task{T}"/> for the operation.</returns>
         /// <remarks>If the current thread has UI access, <paramref name="function"/> will be invoked directly.</remarks>
@@ -314,7 +314,7 @@ public static Task<T> AwaitableRunAsync<T>(this CoreDispatcher dispatcher, Func<
                 throw new ArgumentNullException(nameof(function));
             }
 
-            // Skip the dispatch, if posssible
+            // Skip the dispatch, if possible
             if (dispatcher.HasThreadAccess)
             {
                 try
diff --git a/Microsoft.Toolkit.Uwp/Helpers/DispatcherQueueHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/DispatcherQueueHelper.cs
index 93f47ecc2f8..e752e17895a 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/DispatcherQueueHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/DispatcherQueueHelper.cs
@@ -114,7 +114,7 @@ public static Task<T> ExecuteOnUIThreadAsync<T>(this DispatcherQueue dispatcher,
         /// Extension method for <see cref="DispatcherQueue"/>. Offering an actual awaitable <see cref="Task"/> with optional result that will be executed on the given dispatcher.
         /// </summary>
         /// <param name="dispatcher">DispatcherQueue of a thread to run <paramref name="function"/>.</param>
-        /// <param name="function">Asynchrounous function to be executed on the given dispatcher.</param>
+        /// <param name="function">Asynchronous function to be executed on the given dispatcher.</param>
         /// <param name="priority">DispatcherQueue execution priority, default is normal.</param>
         /// <returns>An awaitable <see cref="Task"/> for the operation.</returns>
         /// <remarks>If the current thread has UI access, <paramref name="function"/> will be invoked directly.</remarks>
@@ -177,7 +177,7 @@ public static Task ExecuteOnUIThreadAsync(this DispatcherQueue dispatcher, Func<
         /// </summary>
         /// <typeparam name="T">Returned data type of the function.</typeparam>
         /// <param name="dispatcher">DispatcherQueue of a thread to run <paramref name="function"/>.</param>
-        /// <param name="function">Asynchrounous function to be executed asynchrounously on the given dispatcher.</param>
+        /// <param name="function">Asynchronous function to be executed Asynchronously on the given dispatcher.</param>
         /// <param name="priority">DispatcherQueue execution priority, default is normal.</param>
         /// <returns>An awaitable <see cref="Task{T}"/> for the operation.</returns>
         /// <remarks>If the current thread has UI access, <paramref name="function"/> will be invoked directly.</remarks>
diff --git a/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
index 1601ef903c5..f1190105639 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
@@ -44,7 +44,7 @@ public RemoteDeviceHelper(DispatcherQueue dispatcherQueue = null)
         /// <summary>
         /// Initializes a new instance of the <see cref="RemoteDeviceHelper"/> class.
         /// </summary>
-        /// <param name="filter">Initiate Enumeration with specific RemoteSysemKind with Filters</param>
+        /// <param name="filter">Initiate Enumeration with specific RemoteSystemKind with Filters</param>
         /// <param name="dispatcherQueue">The DispatcherQueue that should be used to dispatch UI updates, or null if this is being called from the UI thread.</param>
         public RemoteDeviceHelper(List<IRemoteSystemFilter> filter, DispatcherQueue dispatcherQueue = null)
         {
@@ -62,7 +62,7 @@ public void GenerateSystems()
         }
 
         /// <summary>
-        /// Initiate Enumeration with specific RemoteSysemKind with Filters
+        /// Initiate Enumeration with specific RemoteSystemKind with Filters
         /// </summary>
         private async void GenerateSystemsWithFilterAsync(List<IRemoteSystemFilter> filter)
         {
diff --git a/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs b/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
index 9c5ffd40d32..72357b3f790 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
@@ -117,7 +117,7 @@ public static async Task LaunchStoreForReviewAsync()
 
         /// <summary>
         /// Gets the first version of the app that was installed.
-        /// This will be the current version if a previous verison of the app was installed before accessing this property.
+        /// This will be the current version if a previous version of the app was installed before accessing this property.
         /// </summary>
         public PackageVersion FirstVersionInstalled { get; }
 
@@ -166,11 +166,11 @@ public TimeSpan AppUptime
             {
                 if (LaunchCount > 0)
                 {
-                    var subsessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
+                    var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
 
                     var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));
 
-                    return new TimeSpan(uptimeSoFar + subsessionLength);
+                    return new TimeSpan(uptimeSoFar + subSessionLength);
                 }
 
                 return TimeSpan.MinValue;
@@ -245,11 +245,11 @@ private void UpdateVisibility(bool visible)
             }
             else
             {
-                var subsessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
+                var subSessionLength = DateTime.UtcNow.Subtract(_sessionStart).Ticks;
 
                 var uptimeSoFar = _localObjectStorageHelper.Read<long>(nameof(AppUptime));
 
-                _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + subsessionLength);
+                _localObjectStorageHelper.Save(nameof(AppUptime), uptimeSoFar + subSessionLength);
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
index 2f694f3afa1..44871dde607 100644
--- a/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
+++ b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
@@ -41,7 +41,7 @@ public class IncrementalLoadingCollection<TSource, IType> : ObservableCollection
         public Action OnEndLoading { get; set; }
 
         /// <summary>
-        /// Gets or sets an <see cref="Action"/> that is called if an error occours during data retrieval. The actual <see cref="Exception"/> is passed as an argument.
+        /// Gets or sets an <see cref="Action"/> that is called if an error occurs during data retrieval. The actual <see cref="Exception"/> is passed as an argument.
         /// </summary>
         public Action<Exception> OnError { get; set; }
 
@@ -132,7 +132,7 @@ private set
         /// An <see cref="Action"/> that is called when a retrieval operation ends.
         /// </param>
         /// <param name="onError">
-        /// An <see cref="Action"/> that is called if an error occours during data retrieval.
+        /// An <see cref="Action"/> that is called if an error occurs during data retrieval.
         /// </param>
         /// <seealso cref="IIncrementalSource{TSource}"/>
         public IncrementalLoadingCollection(int itemsPerPage = 20, Action onStartLoading = null, Action onEndLoading = null, Action<Exception> onError = null)
@@ -156,7 +156,7 @@ public IncrementalLoadingCollection(int itemsPerPage = 20, Action onStartLoading
         /// An <see cref="Action"/> that is called when a retrieval operation ends.
         /// </param>
         /// <param name="onError">
-        /// An <see cref="Action"/> that is called if an error occours during data retrieval.
+        /// An <see cref="Action"/> that is called if an error occurs during data retrieval.
         /// </param>
         /// <seealso cref="IIncrementalSource{TSource}"/>
         public IncrementalLoadingCollection(TSource source, int itemsPerPage = 20, Action onStartLoading = null, Action onEndLoading = null, Action<Exception> onError = null)
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index 9192cb6810c..5e81855f128 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -27,7 +27,7 @@ public static class StringExtensions
         /// <summary>
         /// Regular expression for matching an email address.
         /// </summary>
-        /// <remarks>General Email Regex (RFC 5322 Official Standard) from emailregex.com.</remarks>
+        /// <remarks>General Email Regex (RFC 5322 Official Standard) from https://emailregex.com.</remarks>
         internal const string EmailRegex = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
 
         /// <summary>
diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index 515edb45b9b..0f9fb1f0610 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -9,7 +9,7 @@
 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.
+    /// Helper class to wrap around a Task to provide more information usable for UI data binding scenarios. As discussed in MSDN Magazine: https://msdn.microsoft.com/magazine/dn605875.
     /// </summary>
     /// <typeparam name="TResult">Type of result returned by task.</typeparam>
     [Obsolete("This helper will be removed in a future release, use the ObservableObject base class from Microsoft.Toolkit.Mvvm and the SetAndNotifyOnCompletion method")]
diff --git a/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
index efee59d2788..c58aac08178 100644
--- a/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
diff --git a/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
index efee59d2788..c58aac08178 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs
index 78e99abce61..a93ed45032e 100644
--- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs
+++ b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs
@@ -284,7 +284,7 @@ public void AddItem_WhenSeveralTargetGroupsAlreadyExist_ShouldAddItemToFirstExis
 
         [TestCategory("Collections")]
         [TestMethod]
-        public void InsertItem_WhenGroupDoesNotExist_ShoudThrow()
+        public void InsertItem_WhenGroupDoesNotExist_ShouldThrow()
         {
             var groupedCollection = new ObservableGroupedCollection<string, int>();
             groupedCollection.AddGroup("A", 1, 2, 3);
@@ -298,7 +298,7 @@ public void InsertItem_WhenGroupDoesNotExist_ShoudThrow()
         [DataTestMethod]
         [DataRow(-1)]
         [DataRow(4)]
-        public void InsertItem_WhenIndexOutOfRange_ShoudThrow(int index)
+        public void InsertItem_WhenIndexOutOfRange_ShouldThrow(int index)
         {
             var groupedCollection = new ObservableGroupedCollection<string, int>();
             groupedCollection.AddGroup("A", 1, 2, 3);
@@ -340,7 +340,7 @@ public void InsertItem_WithValidIndex_WithSeveralGroups_ShoudInsertItemInFirstGr
 
         [TestCategory("Collections")]
         [TestMethod]
-        public void SetItem_WhenGroupDoesNotExist_ShoudThrow()
+        public void SetItem_WhenGroupDoesNotExist_ShouldThrow()
         {
             var groupedCollection = new ObservableGroupedCollection<string, int>();
             groupedCollection.AddGroup("A", 1, 2, 3);
@@ -354,7 +354,7 @@ public void SetItem_WhenGroupDoesNotExist_ShoudThrow()
         [DataTestMethod]
         [DataRow(-1)]
         [DataRow(3)]
-        public void SetItem_WhenIndexOutOfRange_ShoudThrow(int index)
+        public void SetItem_WhenIndexOutOfRange_ShouldThrow(int index)
         {
             var groupedCollection = new ObservableGroupedCollection<string, int>();
             groupedCollection.AddGroup("A", 1, 2, 3);
@@ -369,7 +369,7 @@ public void SetItem_WhenIndexOutOfRange_ShoudThrow(int index)
         [DataRow(0, new[] { 23, 2, 3 })]
         [DataRow(1, new[] { 1, 23, 3 })]
         [DataRow(2, new[] { 1, 2, 23 })]
-        public void SetItem_WithValidIndex_WithSeveralGroups_ShoudReplaceItemInFirstGroup(int index, int[] expecteGroupValues)
+        public void SetItem_WithValidIndex_WithSeveralGroups_ShouldReplaceItemInFirstGroup(int index, int[] expectedGroupValues)
         {
             var groupedCollection = new ObservableGroupedCollection<string, int>();
             groupedCollection.AddGroup("A", 4, 5);
@@ -387,7 +387,7 @@ public void SetItem_WithValidIndex_WithSeveralGroups_ShoudReplaceItemInFirstGrou
 
             groupedCollection.ElementAt(1).Key.Should().Be("B");
             groupedCollection.ElementAt(1).Should().HaveCount(3);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(expecteGroupValues);
+            groupedCollection.ElementAt(1).Should().ContainInOrder(expectedGroupValues);
 
             groupedCollection.ElementAt(2).Key.Should().Be("B");
             groupedCollection.ElementAt(2).Should().HaveCount(2);
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs
index c7dee14f272..fcb7181273f 100644
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs
+++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs
@@ -88,9 +88,9 @@ public void Test_Guard_HasSizeGreaterThan_ArrayEqualFail()
         [TestCategory("Guard")]
         [TestMethod]
         [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeGreaterThan_ArraSmallerFail()
+        public void Test_Guard_HasSizeGreaterThan_ArraySmallerFail()
         {
-            Guard.HasSizeGreaterThan(new int[1], 4, nameof(Test_Guard_HasSizeGreaterThan_ArraSmallerFail));
+            Guard.HasSizeGreaterThan(new int[1], 4, nameof(Test_Guard_HasSizeGreaterThan_ArraySmallerFail));
         }
 
         [TestCategory("Guard")]
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_EnumValuesExtension.cs b/UnitTests/UnitTests.UWP/Extensions/Test_EnumValuesExtension.cs
index a46f6f7b864..cfd9b1a1406 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_EnumValuesExtension.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_EnumValuesExtension.cs
@@ -19,7 +19,7 @@ public class Test_EnumValuesExtension
         [UITestMethod]
         public void Test_EnumValuesExtension_MarkupExtension()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     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""
@@ -27,9 +27,9 @@ public void Test_EnumValuesExtension_MarkupExtension()
         <ListView x:Name=""Check"" ItemsSource=""{ex:EnumValues Type=local:Animal}""/>
 </Page>") as FrameworkElement;
 
-            var list = treeroot.FindChildByName("Check") as ListView;
+            var list = treeRoot.FindChildByName("Check") as ListView;
 
-            Assert.IsNotNull(list, "Could not find listview control in tree.");
+            Assert.IsNotNull(list, "Could not find ListView control in tree.");
 
             Animal[] items = list.ItemsSource as Animal[];
 
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
index 0a35c561b15..a2aa7f2a1fc 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
@@ -20,7 +20,7 @@ public class Test_FontIconSourceExtensionMarkupExtension
         [UITestMethod]
         public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeMdl2Asset()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     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""
@@ -28,7 +28,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeMdl2Asset()
         <controls:MockSwipeItem x:Name=""Check"" IconSource=""{ex:FontIconSource Glyph=&#xE105;}""/>
 </Page>") as FrameworkElement;
 
-            var button = treeroot.FindChildByName("Check") as MockSwipeItem;
+            var button = treeRoot.FindChildByName("Check") as MockSwipeItem;
 
             Assert.IsNotNull(button, $"Could not find the {nameof(MockSwipeItem)} control in tree.");
 
@@ -44,7 +44,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeMdl2Asset()
         [UITestMethod]
         public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeUI()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     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""
@@ -52,7 +52,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeUI()
         <controls:MockSwipeItem x:Name=""Check"" IconSource=""{ex:FontIconSource Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
 </Page>") as FrameworkElement;
 
-            var button = treeroot.FindChildByName("Check") as MockSwipeItem;
+            var button = treeRoot.FindChildByName("Check") as MockSwipeItem;
 
             Assert.IsNotNull(button, $"Could not find the {nameof(MockSwipeItem)} control in tree.");
 
@@ -68,7 +68,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeUI()
         [UITestMethod]
         public void Test_FontIconSourceExtension_MarkupExtension_ProvideCustomFontIcon()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     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""
@@ -76,7 +76,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideCustomFontIcon()
         <controls:MockSwipeItem x:Name=""Check"" IconSource=""{ex:FontIconSource Glyph=&#xE14D;, FontSize=7, FontFamily='Segoe MDL2 Assets', FontWeight=Bold, FontStyle=Italic, IsTextScaleFactorEnabled=True, MirroredWhenRightToLeft=True}""/>
 </Page>") as FrameworkElement;
 
-            var button = treeroot.FindChildByName("Check") as MockSwipeItem;
+            var button = treeRoot.FindChildByName("Check") as MockSwipeItem;
 
             Assert.IsNotNull(button, $"Could not find the {nameof(MockSwipeItem)} control in tree.");
 
diff --git a/UnitTests/UnitTests.UWP/PrivateType.cs b/UnitTests/UnitTests.UWP/PrivateType.cs
index 1db00eea621..9de773fb09b 100644
--- a/UnitTests/UnitTests.UWP/PrivateType.cs
+++ b/UnitTests/UnitTests.UWP/PrivateType.cs
@@ -68,7 +68,7 @@ public PrivateType(Type type)
         /// Invokes static member
         /// </summary>
         /// <param name="name">Name of the member to InvokeHelper</param>
-        /// <param name="args">Arguements to the invoction</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, params object[] args)
         {
@@ -80,7 +80,7 @@ public object InvokeStatic(string name, params object[] args)
         /// </summary>
         /// <param name="name">Name of the member to InvokeHelper</param>
         /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invoction</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, Type[] parameterTypes, object[] args)
         {
@@ -92,7 +92,7 @@ public object InvokeStatic(string name, Type[] parameterTypes, object[] args)
         /// </summary>
         /// <param name="name">Name of the member to InvokeHelper</param>
         /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invoction</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="typeArguments">An array of types corresponding to the types of the generic arguments.</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, Type[] parameterTypes, object[] args, Type[] typeArguments)
@@ -104,7 +104,7 @@ public object InvokeStatic(string name, Type[] parameterTypes, object[] args, Ty
         /// Invokes the static method
         /// </summary>
         /// <param name="name">Name of the member</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, object[] args, CultureInfo culture)
@@ -117,7 +117,7 @@ public object InvokeStatic(string name, object[] args, CultureInfo culture)
         /// </summary>
         /// <param name="name">Name of the member</param>
         /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture info</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, Type[] parameterTypes, object[] args, CultureInfo culture)
@@ -130,7 +130,7 @@ public object InvokeStatic(string name, Type[] parameterTypes, object[] args, Cu
         /// </summary>
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, BindingFlags bindingFlags, params object[] args)
         {
@@ -143,7 +143,7 @@ public object InvokeStatic(string name, BindingFlags bindingFlags, params object
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
         /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, BindingFlags bindingFlags, Type[] parameterTypes, object[] args)
         {
@@ -155,7 +155,7 @@ public object InvokeStatic(string name, BindingFlags bindingFlags, Type[] parame
         /// </summary>
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, BindingFlags bindingFlags, object[] args, CultureInfo culture)
@@ -169,7 +169,7 @@ public object InvokeStatic(string name, BindingFlags bindingFlags, object[] args
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
         /// /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture</param>
         /// <returns>Result of invocation</returns>
         public object InvokeStatic(string name, BindingFlags bindingFlags, Type[] parameterTypes, object[] args, CultureInfo culture)
@@ -183,7 +183,7 @@ public object InvokeStatic(string name, BindingFlags bindingFlags, Type[] parame
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
         /// /// <param name="parameterTypes">An array of <see cref="T:System.Type"/> objects representing the number, order, and type of the parameters for the method to invoke</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture</param>
         /// <param name="typeArguments">An array of types corresponding to the types of the generic arguments.</param>
         /// <returns>Result of invocation</returns>
@@ -241,7 +241,7 @@ public object GetStaticArrayElement(string name, params int[] indices)
         }
 
         /// <summary>
-        /// Sets the memeber of the static array
+        /// Sets the member of the static array
         /// </summary>
         /// <param name="name">Name of the array</param>
         /// <param name="value">value to set</param>
@@ -255,7 +255,7 @@ public void SetStaticArrayElement(string name, object value, params int[] indice
         }
 
         /// <summary>
-        /// Gets the element in satatic array
+        /// Gets the element in static array
         /// </summary>
         /// <param name="name">Name of the array</param>
         /// <param name="bindingFlags">Additional InvokeHelper attributes</param>
@@ -263,7 +263,7 @@ public void SetStaticArrayElement(string name, object value, params int[] indice
         /// A one-dimensional array of 32-bit integers that represent the indexes specifying
         /// the position of the element to get. For instance, to access a[10][11] the array would be {10,11}
         /// </param>
-        /// <returns>element at the spcified location</returns>
+        /// <returns>element at the specified location</returns>
         public object GetStaticArrayElement(string name, BindingFlags bindingFlags, params int[] indices)
         {
             Array arr = (Array)this.InvokeHelperStatic(name, BindingFlags.GetField | BindingFlags.GetProperty | bindingFlags, null, CultureInfo.InvariantCulture);
@@ -271,7 +271,7 @@ public object GetStaticArrayElement(string name, BindingFlags bindingFlags, para
         }
 
         /// <summary>
-        /// Sets the memeber of the static array
+        /// Sets the member of the static array
         /// </summary>
         /// <param name="name">Name of the array</param>
         /// <param name="bindingFlags">Additional InvokeHelper attributes</param>
@@ -300,7 +300,7 @@ public object GetStaticField(string name)
         /// Sets the static field
         /// </summary>
         /// <param name="name">Name of the field</param>
-        /// <param name="value">Arguement to the invocation</param>
+        /// <param name="value">Arguments to the invocation</param>
         public void SetStaticField(string name, object value)
         {
             this.SetStaticField(name, BindToEveryThing, value);
@@ -322,7 +322,7 @@ public object GetStaticField(string name, BindingFlags bindingFlags)
         /// </summary>
         /// <param name="name">Name of the field</param>
         /// <param name="bindingFlags">Additional InvokeHelper attributes</param>
-        /// <param name="value">Arguement to the invocation</param>
+        /// <param name="value">Arguments to the invocation</param>
         public void SetStaticField(string name, BindingFlags bindingFlags, object value)
         {
             this.InvokeHelperStatic(name, BindingFlags.SetField | bindingFlags | BindingFlags.Static, new[] { value }, CultureInfo.InvariantCulture);
@@ -374,7 +374,7 @@ public void SetStaticFieldOrProperty(string name, BindingFlags bindingFlags, obj
         /// Gets the static property
         /// </summary>
         /// <param name="name">Name of the field or property</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <returns>The static property.</returns>
         public object GetStaticProperty(string name, params object[] args)
         {
@@ -489,7 +489,7 @@ public void SetStaticProperty(string name, BindingFlags bindingFlags, object val
         /// </summary>
         /// <param name="name">Name of the member</param>
         /// <param name="bindingFlags">Additional invocation attributes</param>
-        /// <param name="args">Arguements to the invocation</param>
+        /// <param name="args">Arguments to the invocation</param>
         /// <param name="culture">Culture</param>
         /// <returns>Result of invocation</returns>
         private object InvokeHelperStatic(string name, BindingFlags bindingFlags, object[] args, CultureInfo culture)
diff --git a/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
index 98511bbba74..50999352cde 100644
--- a/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
index 3c4c0c235ab..4822631c3d3 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
@@ -18,7 +18,7 @@ public class Test_TokenizingTextBox_General
         [UITestMethod]
         public void Test_Clear()
         {
-            var treeroot = XamlReader.Load(
+            var treeRoot = XamlReader.Load(
 @"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
@@ -29,9 +29,9 @@ public void Test_Clear()
 
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var tokenBox = treeroot.FindChildByName("tokenboxname") as TokenizingTextBox;
+            var tokenBox = treeRoot.FindChildByName("tokenboxname") as TokenizingTextBox;
 
             Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
 
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
index 140e6ec5fde..1f489e23eb4 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
@@ -129,7 +129,7 @@ public void TestIndexMappingOuterBounds()
 #endif
 
         /// <summary>
-        /// Tests the mapping indicies of the projected outer collection back to the inner source.
+        /// Tests the mapping indices of the projected outer collection back to the inner source.
         /// </summary>
         [TestMethod]
         public void TestIndexMappingInner()
@@ -150,7 +150,7 @@ public void TestIndexMappingInner()
         }
 
         /// <summary>
-        /// Tests the mapping indicies of the projected outer collection back to the inner source.
+        /// Tests the mapping indices of the projected outer collection back to the inner source.
         /// </summary>
         [TestMethod]
         public void TestIndexMappingInnerDifferentOrder()
@@ -176,7 +176,7 @@ public void TestIndexMappingInnerDifferentOrder()
 
 #if DEBUG
         /// <summary>
-        /// Tests the mapping indicies of the projected outer collection back to the inner source.
+        /// Tests the mapping indices of the projected outer collection back to the inner source.
         /// </summary>
         [TestMethod]
         public void TestIndexMappingInnerBounds()
@@ -265,7 +265,7 @@ public void TestMoveKeysBackwardAdjacentNearPivot()
             CollectionAssert.AreEqual(new object[] { "1", "2", 3 }, ioc, string.Format("Collection not as expected, received {0}", ioc.ToArray().ToArrayString()));
 
             Assert.AreEqual(0, ioc.IndexOf("1"), "Key didn't move backwards.");
-            Assert.AreEqual(1, ioc.IndexOf("2"), "Key didn't move backwards (2).");            
+            Assert.AreEqual(1, ioc.IndexOf("2"), "Key didn't move backwards (2).");
         }
 
         [TestMethod]
@@ -316,7 +316,7 @@ public void TestBasicInsertionEnumeration()
         }
 
         [TestMethod]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1008:Opening parenthesis should be spaced correctly", Justification = "Alignment/readibility")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1008:Opening parenthesis should be spaced correctly", Justification = "Alignment/readability")]
         public void TestBasicIndexing()
         {
             var originalSource = new List<object>(new object[] { 1, 3, 5 });
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
index c486dbc7eb8..b24c51b2439 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
@@ -21,7 +21,7 @@ public class Test_UniformGrid_AutoLayout
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_FixedElementSingle()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -49,9 +49,9 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle()
                 (2, 1)
             };
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -82,7 +82,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_FixedElementZeroZeroSpecial()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     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""
@@ -114,9 +114,9 @@ Otherwise we can't tell it apart from the other items. -->
                 (2, 1)
             };
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -144,7 +144,7 @@ Otherwise we can't tell it apart from the other items. -->
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_FixedElementSquare()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -174,9 +174,9 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare()
                 (2, 3)
             };
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -204,7 +204,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -220,9 +220,9 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -232,14 +232,14 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
 
             grid.Measure(new Size(1000, 1000));
 
-            var border = treeroot.FindChildByName("OurItem") as Border;
+            var border = treeRoot.FindChildByName("OurItem") as Border;
 
             Assert.IsNotNull(border, "Could not find our item to test.");
 
             Assert.AreEqual(1, Grid.GetRow(border));
             Assert.AreEqual(1, Grid.GetColumn(border));
 
-            var border2 = treeroot.FindChildByName("Shifted") as Border;
+            var border2 = treeRoot.FindChildByName("Shifted") as Border;
 
             Assert.IsNotNull(border2, "Could not find shifted item to test.");
 
@@ -251,7 +251,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_VerticalElement()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -267,9 +267,9 @@ public void Test_UniformGrid_AutoLayout_VerticalElement()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -279,14 +279,14 @@ public void Test_UniformGrid_AutoLayout_VerticalElement()
 
             grid.Measure(new Size(1000, 1000));
 
-            var border = treeroot.FindChildByName("OurItem") as Border;
+            var border = treeRoot.FindChildByName("OurItem") as Border;
 
             Assert.IsNotNull(border, "Could not find our item to test.");
 
             Assert.AreEqual(1, Grid.GetRow(border));
             Assert.AreEqual(1, Grid.GetColumn(border));
 
-            var border2 = treeroot.FindChildByName("Shifted") as Border;
+            var border2 = treeRoot.FindChildByName("Shifted") as Border;
 
             Assert.IsNotNull(border2, "Could not find shifted item to test.");
 
@@ -298,7 +298,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_HorizontalElement()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -314,9 +314,9 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -326,14 +326,14 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement()
 
             grid.Measure(new Size(1000, 1000));
 
-            var border = treeroot.FindChildByName("OurItem") as Border;
+            var border = treeRoot.FindChildByName("OurItem") as Border;
 
             Assert.IsNotNull(border, "Could not find our item to test.");
 
             Assert.AreEqual(0, Grid.GetRow(border));
             Assert.AreEqual(1, Grid.GetColumn(border));
 
-            var border2 = treeroot.FindChildByName("Shifted") as Border;
+            var border2 = treeRoot.FindChildByName("Shifted") as Border;
 
             Assert.IsNotNull(border2, "Could not find shifted item to test.");
 
@@ -345,7 +345,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_LargeElement()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -369,9 +369,9 @@ public void Test_UniformGrid_AutoLayout_LargeElement()
                 (2, 2),
             };
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -393,7 +393,7 @@ public void Test_UniformGrid_AutoLayout_LargeElement()
         [UITestMethod]
         public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -409,9 +409,9 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -421,14 +421,14 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition()
 
             grid.Measure(new Size(1000, 1000));
 
-            var border = treeroot.FindChildByName("OurItem") as Border;
+            var border = treeRoot.FindChildByName("OurItem") as Border;
 
             Assert.IsNotNull(border, "Could not find our item to test.");
 
             Assert.AreEqual(1, Grid.GetRow(border));
             Assert.AreEqual(1, Grid.GetColumn(border));
 
-            var border2 = treeroot.FindChildByName("Shifted") as Border;
+            var border2 = treeRoot.FindChildByName("Shifted") as Border;
 
             Assert.IsNotNull(border2, "Could not find shifted item to test.");
 
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
index db58e683413..a8e43606e31 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
@@ -19,7 +19,7 @@ public class Test_UniformGrid_Dimensions
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_NoElements()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -27,9 +27,9 @@ public void Test_UniformGrid_GetDimensions_NoElements()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -47,7 +47,7 @@ public void Test_UniformGrid_GetDimensions_NoElements()
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_AllVisible()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -63,9 +63,9 @@ public void Test_UniformGrid_GetDimensions_AllVisible()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -83,7 +83,7 @@ public void Test_UniformGrid_GetDimensions_AllVisible()
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_SomeVisible()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -99,9 +99,9 @@ public void Test_UniformGrid_GetDimensions_SomeVisible()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -124,7 +124,7 @@ public void Test_UniformGrid_GetDimensions_SomeVisible()
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_FirstColumn()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -140,9 +140,9 @@ public void Test_UniformGrid_GetDimensions_FirstColumn()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -160,7 +160,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumn()
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_ElementLarger()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -176,9 +176,9 @@ public void Test_UniformGrid_GetDimensions_ElementLarger()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
@@ -196,7 +196,7 @@ public void Test_UniformGrid_GetDimensions_ElementLarger()
         [UITestMethod]
         public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns()
         {
-            var treeroot = XamlReader.Load(@"<Page
+            var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -211,9 +211,9 @@ public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns()
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeroot, "Could not load XAML tree.");
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var grid = treeroot.FindChildByName("UniformGrid") as UniformGrid;
+            var grid = treeRoot.FindChildByName("UniformGrid") as UniformGrid;
 
             Assert.IsNotNull(grid, "Could not find UniformGrid in tree.");
 
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
index 60069fe0759..1a22e5c0780 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
@@ -17,7 +17,7 @@ public class Test_UniformGrid_FreeSpots
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_Basic()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[4, 5]
+            var testRef = new TakenSpotsReferenceHolder(new bool[4, 5]
                 {
                     { false,  true, false,  true, false },
                     { false,  true,  true,  true, false },
@@ -25,7 +25,7 @@ public void Test_UniformGrid_GetFreeSpots_Basic()
                     { false, false,  true, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 0, false).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 0, false).ToArray();
 
             var expected = new (int row, int column)[]
                 {
@@ -47,7 +47,7 @@ public void Test_UniformGrid_GetFreeSpots_Basic()
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_FirstColumn()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[4, 5]
+            var testRef = new TakenSpotsReferenceHolder(new bool[4, 5]
                 {
                     { true,  false, false,  true, false },
                     { false,  true,  true,  true, false },
@@ -55,7 +55,7 @@ public void Test_UniformGrid_GetFreeSpots_FirstColumn()
                     { false, false,  true, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 2, false).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 2, false).ToArray();
 
             var expected = new (int row, int column)[]
             {
@@ -77,14 +77,14 @@ public void Test_UniformGrid_GetFreeSpots_FirstColumn()
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBoundMinusOne()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[3, 3]
+            var testRef = new TakenSpotsReferenceHolder(new bool[3, 3]
                 {
                     { false, false, false },
                     { false, false, false },
                     { false, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 2, false).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 2, false).ToArray();
 
             var expected = new (int row, int column)[]
                 {
@@ -105,14 +105,14 @@ public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBoundMinusOne()
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBound()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[3, 3]
+            var testRef = new TakenSpotsReferenceHolder(new bool[3, 3]
                 {
                     { false, false, false },
                     { false, false, false },
                     { false, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 3, false).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 3, false).ToArray();
 
             var expected = new (int row, int column)[]
                 {
@@ -133,14 +133,14 @@ public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBound()
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBound_TopDown()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[3, 3]
+            var testRef = new TakenSpotsReferenceHolder(new bool[3, 3]
                 {
                     { false, false, false },
                     { false, false, false },
                     { false, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 3, true).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 3, true).ToArray();
 
             var expected = new (int row, int column)[]
                 {
@@ -161,7 +161,7 @@ public void Test_UniformGrid_GetFreeSpots_FirstColumnEndBound_TopDown()
         [UITestMethod]
         public void Test_UniformGrid_GetFreeSpots_VerticalOrientation()
         {
-            var testref = new TakenSpotsReferenceHolder(new bool[4, 5]
+            var testRef = new TakenSpotsReferenceHolder(new bool[4, 5]
                 {
                     { false, false, false,  true, false },
                     { false,  true,  true, false, false },
@@ -169,7 +169,7 @@ public void Test_UniformGrid_GetFreeSpots_VerticalOrientation()
                     { false, false,  true, false, false },
                 });
 
-            var results = UniformGrid.GetFreeSpot(testref, 0, true).ToArray();
+            var results = UniformGrid.GetFreeSpot(testRef, 0, true).ToArray();
 
             // top-bottom, transpose of matrix above.
             var expected = new (int row, int column)[]
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
index 6b68556f2cd..bf6539aea5f 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
@@ -125,7 +125,7 @@ public void Test_UniformGrid_SetupRowDefinitions_FirstFixed()
             Assert.AreEqual(3, grid.RowDefinitions.Count);
 
             var rdo = grid.RowDefinitions[0];
-            
+
             // Did we mark that our row is special?
             Assert.AreEqual(false, UniformGrid.GetAutoLayout(rdo));
 
@@ -465,7 +465,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_AllAutomatic()
 
             //// DO IT AGAIN
             //// This is so we can check that it will behave the same again on another pass.
-            
+
             // We'll have three columns in this setup
             grid.SetupColumnDefinitions(3);
 

From 611d687bb9f7bb2f6a554373c8767aedbd5e0649 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 01:59:32 +0200
Subject: [PATCH 342/595] Attempt to fix CI with manual memory management

---
 .../Test_ReadOnlySpanExtensions.Count.cs      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
index a3fd7fd39fd..4be89dd4c08 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
@@ -265,7 +264,7 @@ private static UnmanagedSpanOwner<T> CreateFilledData<T>(int count, T value)
         /// An owner for a buffer of an unmanaged type, recycling <see cref="byte"/> arrays to save memory.
         /// </summary>
         /// <typeparam name="T">The type of items to store in the rented buffers.</typeparam>
-        private sealed class UnmanagedSpanOwner<T> : IDisposable
+        private sealed unsafe class UnmanagedSpanOwner<T> : IDisposable
             where T : unmanaged
         {
             /// <summary>
@@ -274,9 +273,9 @@ private sealed class UnmanagedSpanOwner<T> : IDisposable
             private readonly int length;
 
             /// <summary>
-            /// The underlying <see cref="byte"/> array.
+            /// The pointer to the underlying <see cref="byte"/> array.
             /// </summary>
-            private byte[]? array;
+            private IntPtr ptr;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="UnmanagedSpanOwner{T}"/> class.
@@ -284,29 +283,29 @@ private sealed class UnmanagedSpanOwner<T> : IDisposable
             /// <param name="size">The size of the buffer to rent.</param>
             public UnmanagedSpanOwner(int size)
             {
-                this.array = ArrayPool<byte>.Shared.Rent(size * Unsafe.SizeOf<T>());
+                this.ptr = Marshal.AllocHGlobal(size * Unsafe.SizeOf<T>());
                 this.length = size;
             }
 
             /// <inheritdoc/>
             public void Dispose()
             {
-                byte[]? array = this.array;
+                IntPtr ptr = this.ptr;
 
-                if (array is null)
+                if (ptr == IntPtr.Zero)
                 {
                     return;
                 }
 
-                this.array = null;
+                this.ptr = IntPtr.Zero;
 
-                ArrayPool<byte>.Shared.Return(array);
+                Marshal.FreeHGlobal(ptr);
             }
 
             /// <summary>
             /// Gets the <see cref="Memory{T}"/> for the current instance.
             /// </summary>
-            public Span<T> Span => this.array.AsSpan().Cast<byte, T>().Slice(0, this.length);
+            public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
         }
     }
 }

From 76c9f41de65843649dac0f80eb6300fed3c85046 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 13:08:28 +0200
Subject: [PATCH 343/595] Minor code refactoring

---
 .../Buffers/Internals/UnmanagedSpanOwner.cs   | 54 +++++++++++++++++++
 .../Test_ReadOnlySpanExtensions.Count.cs      | 50 +----------------
 ...UnitTests.HighPerformance.Shared.projitems |  1 +
 3 files changed, 56 insertions(+), 49 deletions(-)
 create mode 100644 UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
new file mode 100644
index 00000000000..f821205b281
--- /dev/null
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace UnitTests.HighPerformance.Shared.Buffers.Internals
+{
+    /// <summary>
+    /// An owner for a buffer of an unmanaged type, recycling <see cref="byte"/> arrays to save memory.
+    /// </summary>
+    /// <typeparam name="T">The type of items to store in the rented buffers.</typeparam>
+    internal sealed unsafe class UnmanagedSpanOwner<T> : IDisposable
+        where T : unmanaged
+    {
+        /// <summary>
+        /// The size of the current instance
+        /// </summary>
+        private readonly int length;
+
+        /// <summary>
+        /// The pointer to the underlying <see cref="byte"/> array.
+        /// </summary>
+        private IntPtr ptr;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnmanagedSpanOwner{T}"/> class.
+        /// </summary>
+        /// <param name="size">The size of the buffer to rent.</param>
+        public UnmanagedSpanOwner(int size)
+        {
+            this.ptr = Marshal.AllocHGlobal(size * Unsafe.SizeOf<T>());
+            this.length = size;
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            IntPtr ptr = this.ptr;
+
+            if (ptr == IntPtr.Zero)
+            {
+                return;
+            }
+
+            this.ptr = IntPtr.Zero;
+
+            Marshal.FreeHGlobal(ptr);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Memory{T}"/> for the current instance.
+        /// </summary>
+        public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
+    }
+}
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
index 4be89dd4c08..28d59489aaa 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
@@ -5,10 +5,10 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.Toolkit.HighPerformance.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 #nullable enable
 
@@ -259,53 +259,5 @@ private static UnmanagedSpanOwner<T> CreateFilledData<T>(int count, T value)
 
             return data;
         }
-
-        /// <summary>
-        /// An owner for a buffer of an unmanaged type, recycling <see cref="byte"/> arrays to save memory.
-        /// </summary>
-        /// <typeparam name="T">The type of items to store in the rented buffers.</typeparam>
-        private sealed unsafe class UnmanagedSpanOwner<T> : IDisposable
-            where T : unmanaged
-        {
-            /// <summary>
-            /// The size of the current instance
-            /// </summary>
-            private readonly int length;
-
-            /// <summary>
-            /// The pointer to the underlying <see cref="byte"/> array.
-            /// </summary>
-            private IntPtr ptr;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="UnmanagedSpanOwner{T}"/> class.
-            /// </summary>
-            /// <param name="size">The size of the buffer to rent.</param>
-            public UnmanagedSpanOwner(int size)
-            {
-                this.ptr = Marshal.AllocHGlobal(size * Unsafe.SizeOf<T>());
-                this.length = size;
-            }
-
-            /// <inheritdoc/>
-            public void Dispose()
-            {
-                IntPtr ptr = this.ptr;
-
-                if (ptr == IntPtr.Zero)
-                {
-                    return;
-                }
-
-                this.ptr = IntPtr.Zero;
-
-                Marshal.FreeHGlobal(ptr);
-            }
-
-            /// <summary>
-            /// Gets the <see cref="Memory{T}"/> for the current instance.
-            /// </summary>
-            public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
-        }
     }
 }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
index 06b7503c5f8..9539bf31078 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
+++ b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
@@ -9,6 +9,7 @@
     <Import_RootNamespace>UnitTests.HighPerformance.Shared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Buffers\Internals\UnmanagedSpanOwner.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_MemoryBufferWriter{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_ArrayPoolBufferWriter{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_MemoryOwner{T}.cs" />

From 1dcdb247ac63d23b2cdc09f6f3f417c261c2c6cb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 13:16:39 +0200
Subject: [PATCH 344/595] Reduced memory usage in hash code tests

---
 .../Helpers/Test_HashCode{T}.cs               | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
index c82ad26fd80..36817d4f29f 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
@@ -8,6 +8,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.Toolkit.HighPerformance.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 namespace UnitTests.HighPerformance.Helpers
 {
@@ -67,19 +68,23 @@ public void Test_HashCodeOfT_VectorUnsupportedTypes_TestRepeat()
         [TestMethod]
         public void Test_HashCodeOfT_ManagedType_TestRepeat()
         {
-            var random = new Random();
+            var localTestCounts = TestCounts.Slice(0, 8);
+
+            // Only rent a single array of the maximum necessary size, to save space
+            string[] data = new string[localTestCounts[localTestCounts.Length - 1]];
 
-            foreach (var count in TestCounts.Slice(0, 8))
+            var random = new Random();
+            foreach (ref string text in data.AsSpan())
             {
-                string[] data = new string[count];
+                text = random.NextDouble().ToString("E");
+            }
 
-                foreach (ref string text in data.AsSpan())
-                {
-                    text = random.NextDouble().ToString("E");
-                }
+            foreach (var count in localTestCounts)
+            {
+                Span<string> iterationData = data.AsSpan().Slice(0, count);
 
-                int hash1 = HashCode<string>.Combine(data);
-                int hash2 = HashCode<string>.Combine(data);
+                int hash1 = HashCode<string>.Combine(iterationData);
+                int hash2 = HashCode<string>.Combine(iterationData);
 
                 Assert.AreEqual(hash1, hash2, $"Failed {typeof(string)} test with count {count}: got {hash1} and then {hash2}");
             }
@@ -95,10 +100,10 @@ private static void TestForType<T>()
         {
             foreach (var count in TestCounts)
             {
-                T[] data = CreateRandomData<T>(count);
+                using UnmanagedSpanOwner<T> data = CreateRandomData<T>(count);
 
-                int hash1 = HashCode<T>.Combine(data);
-                int hash2 = HashCode<T>.Combine(data);
+                int hash1 = HashCode<T>.Combine(data.Span);
+                int hash2 = HashCode<T>.Combine(data.Span);
 
                 Assert.AreEqual(hash1, hash2, $"Failed {typeof(T)} test with count {count}: got {hash1} and then {hash2}");
             }
@@ -111,14 +116,14 @@ private static void TestForType<T>()
         /// <param name="count">The number of array items to create.</param>
         /// <returns>An array of random <typeparamref name="T"/> elements.</returns>
         [Pure]
-        private static T[] CreateRandomData<T>(int count)
+        private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count)
             where T : unmanaged
         {
             var random = new Random(count);
 
-            T[] data = new T[count];
+            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.AsSpan()))
+            foreach (ref byte n in MemoryMarshal.AsBytes(data.Span))
             {
                 n = (byte)random.Next(0, byte.MaxValue);
             }

From 26a90788d26c4bb20740177002e63f9363a04dba Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 13:34:19 +0200
Subject: [PATCH 345/595] Added missing file header

---
 .../Buffers/Internals/UnmanagedSpanOwner.cs   | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
index f821205b281..7decb5969b5 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.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.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -31,6 +35,21 @@ public UnmanagedSpanOwner(int size)
             this.length = size;
         }
 
+        /// <summary>
+        /// Gets the length of the buffer in use.
+        /// </summary>
+        public int Length => this.length;
+
+        /// <summary>
+        /// Gets a pointer to the start of the buffer in use.
+        /// </summary>
+        public T* Ptr => (T*)this.ptr;
+
+        /// <summary>
+        /// Gets the <see cref="Memory{T}"/> for the current instance.
+        /// </summary>
+        public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
+
         /// <inheritdoc/>
         public void Dispose()
         {
@@ -45,10 +64,5 @@ public void Dispose()
 
             Marshal.FreeHGlobal(ptr);
         }
-
-        /// <summary>
-        /// Gets the <see cref="Memory{T}"/> for the current instance.
-        /// </summary>
-        public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
     }
 }

From 9964e66d9df77ae3a40fc7b31a6638ae39b1d30f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 13:46:24 +0200
Subject: [PATCH 346/595] Code refactoring to support Memory<T> tests

---
 .../Buffers/Internals/UnmanagedSpanOwner.cs   | 28 ++++++++---
 .../Test_ReadOnlySpanExtensions.Count.cs      | 10 ++--
 .../Helpers/Test_HashCode{T}.cs               |  6 +--
 .../Helpers/Test_ParallelHelper.For.cs        | 43 ++++++++++------
 .../Helpers/Test_ParallelHelper.For2D.cs      | 50 +++++++++++++------
 5 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
index 7decb5969b5..70f87a1f8ca 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -12,7 +13,7 @@ namespace UnitTests.HighPerformance.Shared.Buffers.Internals
     /// An owner for a buffer of an unmanaged type, recycling <see cref="byte"/> arrays to save memory.
     /// </summary>
     /// <typeparam name="T">The type of items to store in the rented buffers.</typeparam>
-    internal sealed unsafe class UnmanagedSpanOwner<T> : IDisposable
+    internal sealed unsafe class UnmanagedSpanOwner<T> : MemoryManager<T>
         where T : unmanaged
     {
         /// <summary>
@@ -45,13 +46,8 @@ public UnmanagedSpanOwner(int size)
         /// </summary>
         public T* Ptr => (T*)this.ptr;
 
-        /// <summary>
-        /// Gets the <see cref="Memory{T}"/> for the current instance.
-        /// </summary>
-        public Span<T> Span => new Span<T>((void*)this.ptr, this.length);
-
         /// <inheritdoc/>
-        public void Dispose()
+        protected override void Dispose(bool disposing)
         {
             IntPtr ptr = this.ptr;
 
@@ -64,5 +60,23 @@ public void Dispose()
 
             Marshal.FreeHGlobal(ptr);
         }
+
+        /// <inheritdoc/>
+        public override Span<T> GetSpan()
+        {
+            return new Span<T>((void*)this.ptr, this.length);
+        }
+
+        /// <inheritdoc/>
+        public override MemoryHandle Pin(int elementIndex = 0)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc/>
+        public override void Unpin()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
index 28d59489aaa..10f1591aeab 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
@@ -178,8 +178,8 @@ private static void TestForType<T>(T value, Func<int, T, UnmanagedSpanOwner<T>>
             {
                 using UnmanagedSpanOwner<T> data = provider(count, value);
 
-                int result = data.Span.Count(value);
-                int expected = CountWithForeach(data.Span, value);
+                int result = data.GetSpan().Count(value);
+                int expected = CountWithForeach(data.GetSpan(), value);
 
                 Assert.AreEqual(result, expected, $"Failed {typeof(T)} test with count {count}: got {result} instead of {expected}");
             }
@@ -224,7 +224,7 @@ private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count, T value)
 
             UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.Span))
+            foreach (ref byte n in MemoryMarshal.AsBytes(data.GetSpan()))
             {
                 n = (byte)random.Next(0, byte.MaxValue);
             }
@@ -232,7 +232,7 @@ private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count, T value)
             // Fill at least 20% of the items with a matching value
             int minimum = count / 20;
 
-            Span<T> span = data.Span;
+            Span<T> span = data.GetSpan();
 
             for (int i = 0; i < minimum; i++)
             {
@@ -255,7 +255,7 @@ private static UnmanagedSpanOwner<T> CreateFilledData<T>(int count, T value)
         {
             UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            data.Span.Fill(value);
+            data.GetSpan().Fill(value);
 
             return data;
         }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
index 36817d4f29f..86828480387 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
@@ -102,8 +102,8 @@ private static void TestForType<T>()
             {
                 using UnmanagedSpanOwner<T> data = CreateRandomData<T>(count);
 
-                int hash1 = HashCode<T>.Combine(data.Span);
-                int hash2 = HashCode<T>.Combine(data.Span);
+                int hash1 = HashCode<T>.Combine(data.GetSpan());
+                int hash2 = HashCode<T>.Combine(data.GetSpan());
 
                 Assert.AreEqual(hash1, hash2, $"Failed {typeof(T)} test with count {count}: got {hash1} and then {hash2}");
             }
@@ -123,7 +123,7 @@ private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count)
 
             UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
 
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.Span))
+            foreach (ref byte n in MemoryMarshal.AsBytes(data.GetSpan()))
             {
                 n = (byte)random.Next(0, byte.MaxValue);
             }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs
index 2fac17df1f0..f1d2b98a306 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs
@@ -6,6 +6,7 @@
 using Microsoft.Toolkit.HighPerformance.Extensions;
 using Microsoft.Toolkit.HighPerformance.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 namespace UnitTests.HighPerformance.Helpers
 {
@@ -19,15 +20,17 @@ public partial class Test_ParallelHelper
 
         [TestCategory("ParallelHelper")]
         [TestMethod]
-        public void Test_ParallelHelper_ForWithIndices()
+        public unsafe void Test_ParallelHelper_ForWithIndices()
         {
             foreach (int count in TestForCounts)
             {
-                int[] data = new int[count];
+                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
 
-                ParallelHelper.For(0, data.Length, new Assigner(data));
+                data.GetSpan().Clear();
 
-                foreach (var item in data.Enumerate())
+                ParallelHelper.For(0, data.Length, new Assigner(data.Length, data.Ptr));
+
+                foreach (var item in data.GetSpan().Enumerate())
                 {
                     if (item.Index != item.Value)
                     {
@@ -56,15 +59,17 @@ public void Test_ParallelHelper_ForInvalidRange_RangeAll()
 
         [TestCategory("ParallelHelper")]
         [TestMethod]
-        public void Test_ParallelHelper_ForWithRanges()
+        public unsafe void Test_ParallelHelper_ForWithRanges()
         {
             foreach (int count in TestForCounts)
             {
-                int[] data = new int[count];
+                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
+
+                data.GetSpan().Clear();
 
-                ParallelHelper.For(..data.Length, new Assigner(data));
+                ParallelHelper.For(..data.Length, new Assigner(data.Length, data.Ptr));
 
-                foreach (var item in data.Enumerate())
+                foreach (var item in data.GetSpan().Enumerate())
                 {
                     if (item.Index != item.Value)
                     {
@@ -78,21 +83,31 @@ public void Test_ParallelHelper_ForWithRanges()
         /// <summary>
         /// A type implementing <see cref="IAction"/> to initialize an array
         /// </summary>
-        private readonly struct Assigner : IAction
+        private readonly unsafe struct Assigner : IAction
         {
-            private readonly int[] array;
+            private readonly int length;
+            private readonly int* ptr;
 
-            public Assigner(int[] array) => this.array = array;
+            public Assigner(int length, int* ptr)
+            {
+                this.length = length;
+                this.ptr = ptr;
+            }
 
             /// <inheritdoc/>
             public void Invoke(int i)
             {
-                if (this.array[i] != 0)
+                if ((uint)i >= (uint)this.length)
+                {
+                    throw new IndexOutOfRangeException($"The target position was out of range, was {i} and should've been in [0, {this.length})");
+                }
+
+                if (this.ptr[i] != 0)
                 {
-                    throw new InvalidOperationException($"Invalid target position {i}, was {this.array[i]} instead of 0");
+                    throw new InvalidOperationException($"Invalid target position {i}, was {this.ptr[i]} instead of 0");
                 }
 
-                this.array[i] = i;
+                this.ptr[i] = i;
             }
         }
     }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs
index 8fccecf17be..e038e2c877e 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs
@@ -6,6 +6,7 @@
 using System.Drawing;
 using Microsoft.Toolkit.HighPerformance.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 namespace UnitTests.HighPerformance.Helpers
 {
@@ -27,21 +28,23 @@ public partial class Test_ParallelHelper
 
         [TestCategory("ParallelHelper")]
         [TestMethod]
-        public void Test_ParallelHelper_For2DWithIndices()
+        public unsafe void Test_ParallelHelper_For2DWithIndices()
         {
             foreach (var size in TestFor2DSizes)
             {
-                int[,] data = new int[size.Height, size.Width];
+                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(size.Height * size.Width);
 
-                ParallelHelper.For2D(0, size.Height, 0, size.Width, new Assigner2D(data));
+                data.GetSpan().Clear();
+
+                ParallelHelper.For2D(0, size.Height, 0, size.Width, new Assigner2D(size.Height, size.Width, data.Ptr));
 
                 for (int i = 0; i < size.Height; i++)
                 {
                     for (int j = 0; j < size.Width; j++)
                     {
-                        if (data[i, j] != unchecked(i * 397 ^ j))
+                        if (data.Ptr[(i * size.Width) + j] != unchecked(i * 397 ^ j))
                         {
-                            Assert.Fail($"Invalid item at position [{i},{j}], value was {data[i, j]} instead of {unchecked(i * 397 ^ j)}");
+                            Assert.Fail($"Invalid item at position [{i},{j}], value was {data.Ptr[(i * size.Width) + j]} instead of {unchecked(i * 397 ^ j)}");
                         }
                     }
                 }
@@ -67,21 +70,23 @@ public void Test_ParallelHelper_For2DInvalidRange_RangeAll()
 
         [TestCategory("ParallelHelper")]
         [TestMethod]
-        public void Test_ParallelHelper_For2DWithRanges()
+        public unsafe void Test_ParallelHelper_For2DWithRanges()
         {
             foreach (var size in TestFor2DSizes)
             {
-                int[,] data = new int[size.Height, size.Width];
+                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(size.Height * size.Width);
+
+                data.GetSpan().Clear();
 
-                ParallelHelper.For2D(..size.Height, ..size.Width, new Assigner2D(data));
+                ParallelHelper.For2D(..size.Height, ..size.Width, new Assigner2D(size.Height, size.Width, data.Ptr));
 
                 for (int i = 0; i < size.Height; i++)
                 {
                     for (int j = 0; j < size.Width; j++)
                     {
-                        if (data[i, j] != unchecked(i * 397 ^ j))
+                        if (data.Ptr[(i * size.Width) + j] != unchecked(i * 397 ^ j))
                         {
-                            Assert.Fail($"Invalid item at position [{i},{j}], value was {data[i, j]} instead of {unchecked(i * 397 ^ j)}");
+                            Assert.Fail($"Invalid item at position [{i},{j}], value was {data.Ptr[(i * size.Width) + j]} instead of {unchecked(i * 397 ^ j)}");
                         }
                     }
                 }
@@ -92,21 +97,34 @@ public void Test_ParallelHelper_For2DWithRanges()
         /// <summary>
         /// A type implementing <see cref="IAction"/> to initialize a 2D array
         /// </summary>
-        private readonly struct Assigner2D : IAction2D
+        private readonly unsafe struct Assigner2D : IAction2D
         {
-            private readonly int[,] array;
+            private readonly int height;
+            private readonly int width;
+            private readonly int* ptr;
 
-            public Assigner2D(int[,] array) => this.array = array;
+            public Assigner2D(int height, int width, int* ptr)
+            {
+                this.height = height;
+                this.width = width;
+                this.ptr = ptr;
+            }
 
             /// <inheritdoc/>
             public void Invoke(int i, int j)
             {
-                if (this.array[i, j] != 0)
+                if ((uint)i >= (uint)this.height ||
+                    (uint)j >= (uint)this.width)
+                {
+                    throw new IndexOutOfRangeException($"The target position was invalid, was [{i}, {j}], should've been in [0, {this.height}] and [0, {this.width}]");
+                }
+
+                if (this.ptr[(i * this.width) + j] != 0)
                 {
-                    throw new InvalidOperationException($"Invalid target position [{i},{j}], was {this.array[i, j]} instead of 0");
+                    throw new InvalidOperationException($"Invalid target position [{i},{j}], was {this.ptr[(i * this.width) + j]} instead of 0");
                 }
 
-                this.array[i, j] = unchecked(i * 397 ^ j);
+                this.ptr[(i * this.width) + j] = unchecked(i * 397 ^ j);
             }
         }
     }

From 7e7121ce7277902661d322c3873c9a0ae465a2e7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 13:51:49 +0200
Subject: [PATCH 347/595] Switched to unmanaged memory in all parallel tests

---
 .../Extensions/Test_ReadOnlySpanExtensions.cs  |  6 +++---
 .../Helpers/Test_ParallelHelper.ForEach.In.cs  | 13 +++++++------
 .../Helpers/Test_ParallelHelper.ForEach.Ref.cs | 18 ++++++++++++------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
index c431e4937cc..80b6b4dfcf8 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
@@ -20,7 +20,7 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReference()
         {
             using var owner = CreateRandomData<int>(12, default);
 
-            ReadOnlySpan<int> data = owner.Span;
+            ReadOnlySpan<int> data = owner.GetSpan();
 
             ref int r0 = ref data.DangerousGetReference();
             ref int r1 = ref Unsafe.AsRef(data[0]);
@@ -34,7 +34,7 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Zero()
         {
             using var owner = CreateRandomData<int>(12, default);
 
-            ReadOnlySpan<int> data = owner.Span;
+            ReadOnlySpan<int> data = owner.GetSpan();
 
             ref int r0 = ref data.DangerousGetReference();
             ref int r1 = ref data.DangerousGetReferenceAt(0);
@@ -48,7 +48,7 @@ public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Index()
         {
             using var owner = CreateRandomData<int>(12, default);
 
-            ReadOnlySpan<int> data = owner.Span;
+            ReadOnlySpan<int> data = owner.GetSpan();
 
             ref int r0 = ref data.DangerousGetReferenceAt(5);
             ref int r1 = ref Unsafe.AsRef(data[5]);
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs
index b53a97b7042..b7d49e5a9f3 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using Microsoft.Toolkit.HighPerformance.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 namespace UnitTests.HighPerformance.Helpers
 {
@@ -19,15 +20,15 @@ public unsafe void Test_ParallelHelper_ForEach_In()
         {
             foreach (int count in TestForCounts)
             {
-                int[] data = CreateRandomData(count);
+                using UnmanagedSpanOwner<int> data = CreateRandomData(count);
 
                 int sum = 0;
 
-                ParallelHelper.ForEach<int, Summer>(data.AsMemory(), new Summer(&sum));
+                ParallelHelper.ForEach<int, Summer>(data.Memory, new Summer(&sum));
 
                 int expected = 0;
 
-                foreach (int n in data)
+                foreach (int n in data.GetSpan())
                 {
                     expected += n;
                 }
@@ -55,13 +56,13 @@ public unsafe void Test_ParallelHelper_ForEach_In()
         /// <param name="count">The number of array items to create.</param>
         /// <returns>An array of random <see cref="int"/> elements.</returns>
         [Pure]
-        private static int[] CreateRandomData(int count)
+        private static UnmanagedSpanOwner<int> CreateRandomData(int count)
         {
             var random = new Random(count);
 
-            int[] data = new int[count];
+            UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
 
-            foreach (ref int n in data.AsSpan())
+            foreach (ref int n in data.GetSpan())
             {
                 n = random.Next(0, byte.MaxValue);
             }
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs
index cccfbb7ffec..0571fae722d 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs
@@ -5,6 +5,7 @@
 using System;
 using Microsoft.Toolkit.HighPerformance.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using UnitTests.HighPerformance.Shared.Buffers.Internals;
 
 namespace UnitTests.HighPerformance.Helpers
 {
@@ -16,21 +17,26 @@ public void Test_ParallelHelper_ForEach_Ref()
         {
             foreach (int count in TestForCounts)
             {
-                int[] data = CreateRandomData(count);
-                int[] copy = data.AsSpan().ToArray();
+                using UnmanagedSpanOwner<int> data = CreateRandomData(count);
+                using UnmanagedSpanOwner<int> copy = new UnmanagedSpanOwner<int>(count);
 
-                foreach (ref int n in copy.AsSpan())
+                data.GetSpan().CopyTo(copy.GetSpan());
+
+                foreach (ref int n in copy.GetSpan())
                 {
                     n = unchecked(n * 397);
                 }
 
-                ParallelHelper.ForEach(data.AsMemory(), new Multiplier(397));
+                ParallelHelper.ForEach(data.Memory, new Multiplier(397));
+
+                Span<int> dataSpan = data.GetSpan();
+                Span<int> copySpan = copy.GetSpan();
 
                 for (int i = 0; i < data.Length; i++)
                 {
-                    if (data[i] != copy[i])
+                    if (dataSpan[i] != copySpan[i])
                     {
-                        Assert.Fail($"Item #{i} was not a match, was {data[i]} instead of {copy[i]}");
+                        Assert.Fail($"Item #{i} was not a match, was {dataSpan[i]} instead of {copySpan[i]}");
                     }
                 }
             }

From d85f836b582407b9af0a0d93430e55fe25a192b3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 4 Aug 2020 14:56:50 +0200
Subject: [PATCH 348/595] Improved reliability of Task.GetResultOrDefault

---
 .../Extensions/TaskExtensions.cs              | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
index 9254f3c6290..204a74fe1c7 100644
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
@@ -2,7 +2,6 @@
 // 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.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Reflection;
@@ -41,28 +40,21 @@ public static class TaskExtensions
 #endif
             )
             {
-                Type taskType = task.GetType();
-
-                // Check if the task is actually some Task<T>
-                if (
-#if NETSTANDARD1_4
-                    taskType.GetTypeInfo().IsGenericType &&
-#else
-                    taskType.IsGenericType &&
-#endif
-                    taskType.GetGenericTypeDefinition() == typeof(Task<>))
-                {
-                    // Get the Task<T>.Result property
-                    PropertyInfo propertyInfo =
+                // Try to get the Task<T>.Result property. This method would've
+                // been called anyway after the type checks, but using that to
+                // validate the input type saves some additional reflection calls.
+                // Furthermore, doing this also makes the method flexible enough to
+                // cases whether the input Task<T> is actually an instance of some
+                // runtime-specific type that inherits from Task<T>.
+                PropertyInfo? propertyInfo =
 #if NETSTANDARD1_4
-                        taskType.GetRuntimeProperty(nameof(Task<object>.Result));
+                    task.GetType().GetRuntimeProperty(nameof(Task<object>.Result));
 #else
-                        taskType.GetProperty(nameof(Task<object>.Result));
+                    task.GetType().GetProperty(nameof(Task<object>.Result));
 #endif
 
-                    // Finally retrieve the result
-                    return propertyInfo!.GetValue(task);
-                }
+                // Return the result, if possible
+                return propertyInfo?.GetValue(task);
             }
 
             return null;

From e469f9e23f012a7b790ada106f4df517aed4d226 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 5 Aug 2020 00:22:38 +0200
Subject: [PATCH 349/595] Added unit test for AsyncTaskMethodBuilder<T>

---
 .../Extensions/Test_TaskExtensions.cs         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
index 6754f5214a6..8e1d529186e 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
@@ -37,6 +37,25 @@ public void Test_TaskExtensions_ResultOrDefault()
             Assert.AreEqual(42, ((Task)tcs.Task).GetResultOrDefault());
         }
 
+        [TestCategory("TaskExtensions")]
+        [TestMethod]
+        public async Task Test_TaskExtensions_ResultOrDefault_FromAsyncTaskMethodBuilder()
+        {
+            var tcs = new TaskCompletionSource<object>();
+
+            Task<string> taskFromBuilder = GetTaskFromAsyncMethodBuilder("Test", tcs);
+
+            Assert.IsNull(((Task)taskFromBuilder).GetResultOrDefault());
+            Assert.IsNull(taskFromBuilder.GetResultOrDefault());
+
+            tcs.SetResult(null);
+
+            await taskFromBuilder;
+
+            Assert.AreEqual(((Task)taskFromBuilder).GetResultOrDefault(), "Test");
+            Assert.AreEqual(taskFromBuilder.GetResultOrDefault(), "Test");
+        }
+
         [TestCategory("TaskExtensions")]
         [TestMethod]
         public void Test_TaskExtensions_ResultOrDefault_OfT_Int32()
@@ -86,5 +105,16 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_String()
 
             Assert.AreEqual("Hello world", tcs.Task.GetResultOrDefault());
         }
+
+        // Creates a Task<T> of a given type which is actually an instance of
+        // System.Runtime.CompilerServices.AsyncTaskMethodBuilder<TResult>.AsyncStateMachineBox<TStateMachine>.
+        // See https://source.dot.net/#System.Private.CoreLib/AsyncTaskMethodBuilderT.cs,f8f35fd356112b30.
+        // This is needed to verify that the extension also works when the input Task<T> is of a derived type.
+        private static async Task<T> GetTaskFromAsyncMethodBuilder<T>(T result, TaskCompletionSource<object> tcs)
+        {
+            await tcs.Task;
+
+            return result;
+        }
     }
 }

From 4be14715e7a249853ec328989e08e93aac7329e4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 5 Aug 2020 18:48:44 +0200
Subject: [PATCH 350/595] Added SetProperty overloads with expression/broadcast

---
 .../ComponentModel/ObservableObject.cs        | 21 +++++++-
 .../ComponentModel/ObservableRecipient.cs     | 48 +++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index aab9e4d409a..1e55461498e 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -203,7 +203,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// </remarks>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, propertyName);
+            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, out _, propertyName);
         }
 
         /// <summary>
@@ -220,6 +220,21 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
+        {
+            return SetProperty(propertyExpression, newValue, comparer, out _, propertyName);
+        }
+
+        /// <summary>
+        /// Implements the shared logic for <see cref="SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>
+        /// </summary>
+        /// <typeparam name="T">The type of property to set.</typeparam>
+        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="oldValue">The resulting initial value for the target property.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        private protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, out T oldValue, [CallerMemberName] string? propertyName = null)
         {
             PropertyInfo? parentPropertyInfo;
             FieldInfo? parentFieldInfo = null;
@@ -236,13 +251,15 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
                 ThrowArgumentExceptionForInvalidPropertyExpression();
 
                 // This is never executed, as the method above always throws
+                oldValue = default!;
+
                 return false;
             }
 
             object parent = parentPropertyInfo is null
                 ? parentFieldInfo!.GetValue(instance)
                 : parentPropertyInfo.GetValue(instance);
-            T oldValue = (T)targetPropertyInfo.GetValue(parent);
+            oldValue = (T)targetPropertyInfo.GetValue(parent);
 
             if (comparer.Equals(oldValue, newValue))
             {
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index d5b58b52a5b..66189f2fb4a 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
@@ -230,5 +231,52 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
 
             return false;
         }
+
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
+        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,string)"/>, with the difference being that this
+        /// method is used to relay properties from a wrapped model in the current instance. For more info, see the docs for
+        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of property to set.</typeparam>
+        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
+        {
+            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
+        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>,
+        /// with the difference being that this method is used to relay properties from a wrapped model in the
+        /// current instance. For more info, see the docs for
+        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of property to set.</typeparam>
+        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
+        {
+            bool propertyChanged = SetProperty(propertyExpression, newValue, comparer, out T oldValue, propertyName);
+
+            if (propertyChanged && broadcast)
+            {
+                Broadcast(oldValue, newValue, propertyName);
+            }
+
+            return propertyChanged;
+        }
     }
 }
\ No newline at end of file

From 3fc26f01ae5da251d40d202f6820b241f8734151 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 5 Aug 2020 19:11:45 +0200
Subject: [PATCH 351/595] Minor performance improvement for Set(ref T) overload

---
 .../ComponentModel/ObservableObject.cs        | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 1e55461498e..61f5c41f65e 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -66,7 +66,26 @@ protected virtual void OnPropertyChanging([CallerMemberName] string? propertyNam
         /// </remarks>
         protected bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(ref field, newValue, EqualityComparer<T>.Default, propertyName);
+            // We duplicate the code here instead of calling the overload because we can't
+            // guarantee that the invoked SetProperty<T> will be inlined, and we need the JIT
+            // to be able to see the full EqualityComparer<T>.Default.Equals call, so that
+            // it'll use the intrinsics version of it and just replace the whole invocation
+            // with a direct comparison when possible (eg. for primitive numeric types).
+            // This is the fastest SetProperty<T> overload so we particularly care about
+            // the codegen quality here, and the code is small and simple enough so that
+            // duplicating it still doesn't make the whole class harder to maintain.
+            if (EqualityComparer<T>.Default.Equals(field, newValue))
+            {
+                return false;
+            }
+
+            OnPropertyChanging(propertyName);
+
+            field = newValue;
+
+            OnPropertyChanged(propertyName);
+
+            return true;
         }
 
         /// <summary>

From 8daecadac0dfc8b038016d4c883d45ce40962d5e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 5 Aug 2020 19:16:03 +0200
Subject: [PATCH 352/595] Minor code tweaks

---
 .../ComponentModel/ObservableRecipient.cs     | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 66189f2fb4a..ca847383b87 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -141,7 +141,18 @@ protected virtual void Broadcast<T>(T oldValue, T newValue, string? propertyName
         /// </remarks>
         protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(ref field, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
+            T oldValue = field;
+
+            // We duplicate the code as in the base class here to leverage
+            // the intrinsics support for EqualityComparer<T>.Default.Equals.
+            bool propertyChanged = SetProperty(ref field, newValue, propertyName);
+
+            if (propertyChanged && broadcast)
+            {
+                Broadcast(oldValue, newValue, propertyName);
+            }
+
+            return propertyChanged;
         }
 
         /// <summary>
@@ -159,21 +170,16 @@ protected bool SetProperty<T>(ref T field, T newValue, bool broadcast, [CallerMe
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            if (!broadcast)
-            {
-                return SetProperty(ref field, newValue, comparer, propertyName);
-            }
-
             T oldValue = field;
 
-            if (SetProperty(ref field, newValue, comparer, propertyName))
+            bool propertyChanged = SetProperty(ref field, newValue, comparer, propertyName);
+
+            if (propertyChanged && broadcast)
             {
                 Broadcast(oldValue, newValue, propertyName);
-
-                return true;
             }
 
-            return false;
+            return propertyChanged;
         }
 
         /// <summary>
@@ -217,19 +223,14 @@ protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool b
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            if (!broadcast)
-            {
-                return SetProperty(oldValue, newValue, comparer, callback, propertyName);
-            }
+            bool propertyChanged = SetProperty(oldValue, newValue, comparer, callback, propertyName);
 
-            if (SetProperty(oldValue, newValue, comparer, callback, propertyName))
+            if (propertyChanged && broadcast)
             {
                 Broadcast(oldValue, newValue, propertyName);
-
-                return true;
             }
 
-            return false;
+            return propertyChanged;
         }
 
         /// <summary>

From 228cdac0439ed47f2fb527e1154f74741b8d1ab8 Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Wed, 5 Aug 2020 17:25:36 -0700
Subject: [PATCH 353/595] Update Microsoft.Toolkit.HighPerformance.csproj

---
 .../Microsoft.Toolkit.HighPerformance.csproj                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
index f1d961a73c2..a0d6bcb991c 100644
--- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
+++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
@@ -78,9 +78,9 @@
 
         <!-- NETCORE_RUNTIME: to avoid issues with APIs that assume a specific memory layout, we define a
              .NET Core runtime constant to indicate the either .NET Core 2.1 or .NET Core 3.1. These are
-             runtimes with the same overall memory layout for objects (in particular: strings, SZ arrays
+             runtimes with the same overall memory layout for objects (in particular: strings, SZ arrays,
              and 2D arrays). We can use this constant to make sure that APIs that are exclusively available
-             for .NET Standard targets do not make any assumtpion of any internals of the runtime being
+             for .NET Standard targets do not make any assumption of any internals of the runtime being
              actually used by the consumers. -->
         <DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
       </PropertyGroup>

From 28fdd20235523bf640fba0a28f5a3184b1242cc5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 6 Aug 2020 13:14:06 +0200
Subject: [PATCH 354/595] Minor (possible) bug fix

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index f8e817e0d7e..9c27badd255 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -638,9 +638,14 @@ public Type2(Type tMessage, Type tToken)
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public bool Equals(Type2 other)
             {
+                // We can't just use reference equality, as that's technically not guaranteed
+                // to work and might fail in very rare cases (eg. with type forwarding between
+                // different assemblies). Instead, we can use the == operator to compare for
+                // equality, which still avoids the callvirt overhead of calling Type.Equals,
+                // and is also implemented as a JIT intrinsic on runtimes such as .NET Core.
                 return
-                    ReferenceEquals(this.tMessage, other.tMessage) &&
-                    ReferenceEquals(this.tToken, other.tToken);
+                    this.tMessage == other.tMessage &&
+                    this.tToken == other.tToken;
             }
 
             /// <inheritdoc/>

From 715319f5904e1abf81ab0c0078598ed10d58386e Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Thu, 6 Aug 2020 13:37:24 -0700
Subject: [PATCH 355/595] Update Microsoft.Toolkit.Uwp.UI.Controls.csproj

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 0785dd2fd3d..6174415e0f3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -7,17 +7,17 @@
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
       
       Controls:
-        - AdaptiveGridView: Presents items in a evenly-spaced set of columns to fill the total available space.
+        - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
         - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
         - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
         - Carousel: Presents items in a carousel control.
         - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
-        - DropShadowPanel: DropShadowPanel contol allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
+        - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
         - Expander: Expander allows user to show/hide content based on a boolean state.
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
         - HeaderedContentControl: Provides a header to content.
         - HeaderedItemsControl: Provides a header to items.
-        - HeaderedTextBlock: Provide a header for read only text.
+        - HeaderedTextBlock: Provide a header for read-only text.
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
@@ -32,12 +32,12 @@
         - RangeSelector: "Double slider" control for range values.
         - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
         - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
-        - ScrollHeader: A UI control that works as a ListView or GridView header control with quick return, sticky and fade behavior.
+        - ScrollHeader: A UI control that works as a ListView or GridView header control with quick return, sticky, and fade behavior.
         - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
         - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter.
         - TileControl: A ContentControl that show an image repeated many times.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
-        - UniformGrid: Presents items in a evenly-spaced set of rows or columns to fill the total available display space.
+        - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
         - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
     </Description>
     <PackageTags>UWP Toolkit Windows Controls XAML Range WrapPanel Adaptive Markdown BladeView Blade CameraPreview Camera Carousel DockPanel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader StaggeredPanel Staggered Tile Tokenizing TextBox UniformGrid Uniform Grid</PackageTags>

From cc0aaf1ae1e637bc0b43a377bff4ab63aa0022ff Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:27:57 -0700
Subject: [PATCH 356/595] Update readme.md

---
 Microsoft.Toolkit.Uwp.SampleApp/readme.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/readme.md b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
index a98806768a6..41f9e8bad8a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/readme.md
+++ b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
@@ -6,7 +6,7 @@ This document describes how to add a new sample page for a new control you want
 
 
 ## 1. Add Sample page and .bind template
-First you need to create a Xaml page in the folder /SamplePages/YourControl.  This will be the logical page used to by the app to navigate to the sample and containe code.
+First you need to create a Xaml page in the folder /SamplePages/YourControl.  This will be the logical page used to by the app to navigate to the sample and contain code.
 
 If providing 'live' XAML, a .bind file is loaded and dynamically fed to the XamlReader.Load method to convert into actual controls.  This changes a few things about how samples need to be written (detailed below), but allows developers to actually change the sample and see the results live.
 
@@ -39,11 +39,11 @@ You can define "interactive" values in this file. The value types can be:
 * String: You want the user to provide a text. The string is built like this @[Name:**String**:Default value]
 * Slider: You want the user to provide a double value. The string is built like this @[Name:**Slider**:Default value:min-max]
 * DoubleSlider: Same as slider but with double values (0.01 precision)
-* TimeSpan: You want the user to provide a duration. The string is built like this (all values in miliseconds) @[Name:**TimeSpan**:DefaultValue:min-max]
+* TimeSpan: You want the user to provide a duration. The string is built like this (all values in milliseconds) @[Name:**TimeSpan**:DefaultValue:min-max]
 * Enum: You want the user to provide a enum value. The string is built like this @[Name:**Enum**:EnumType.DefaultValue]
 * Brush: You want the user to select a color from a list. The string is built like this @[Name:**Brush**:Black]
 * Bool: You want the user to enable or disable a property. The string is built like this @[Name:**Bool**:True]
-* Thickness: You want the user to provide a Thicknes. The string is built like this @[Name:**Thickness**:0,20,10,0]
+* Thickness: You want the user to provide a Thickness. The string is built like this @[Name:**Thickness**:0,20,10,0]
 
 The `Property Name` can also contain spaces, but these will be removed from the property name used for accessing the value in the property bag for any binding/access, see below.
 
@@ -86,7 +86,7 @@ Value="@[Value:Slider:0:0-180]@"
 ## 3. Have a *'Shallow Copy'* of your example in the sample page
 Even though the sample page content is ignored and the dynamic template injected, for the XamlReader to access some classes, a reference to the item is sometimes needed in the hosting app for it to be accessible.  (I assume it's an optimization thing.)  
 
-Therefore, for any new control/extension, you should still have a simplified snippet of it contained in the sample page compiled/loaded by the app.  You should remove names, events, and properties (unless extensions) from these so the namespace isn't accidently polluted.  If you re-use the same control, you don't have to include it twice.
+Therefore, for any new control/extension, you should still have a simplified snippet of it contained in the sample page compiled/loaded by the app.  You should remove names, events, and properties (unless extensions) from these so the namespace isn't accidentally polluted.  If you re-use the same control, you don't have to include it twice.
 
 
 ## 4. For Events/Resource Templates: Have your sample page implement the **IXamlRendererListener** interface
@@ -163,7 +163,7 @@ Select the category where you want your page to be listed and add the following
 
 Some features used by samples aren't available on all the OS versions that the Sample App runs on.  In order to make sure a sample is valid for the host OS, add the `ApiCheck` key/value in your JSON definition.
 
-The value is a string which is the fully-qualified typename to check for the presense of.  You can also accompany this with the `BadgeUpdateVersionRequred` which uses the string provided to show a short message on the sample information so uplevel implementors know the minimum version required.
+The value is a string which is the fully-qualified typename to check for the presence of.  You can also accompany this with the `BadgeUpdateVersionRequred` which uses the string provided to show a short message on the sample information so uplevel implementors know the minimum version required.
 
 ```json
     {
@@ -190,7 +190,7 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 > NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on github, the sample app will use the packaged version
 
-> NOTE: To test your documentation in the sample app while running in debug mode, the docs repository will need to be cloned in the same folder as this repository and named **WindowsCommunityToolkitDocs**. For exaple, this folder structure works best:
+> NOTE: To test your documentation in the sample app while running in debug mode, the docs repository will need to be cloned in the same folder as this repository and named **WindowsCommunityToolkitDocs**. For example, this folder structure works best:
 > ```
 > repositories
 > ├── WindowsCommunityToolkit
@@ -199,4 +199,4 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 ### CodeUrl
 
-The value of CodeUrl is modified when the app is built in release mode. The branch is automaticaly changed to **master**. This allows you to test the link in debug while pointing to dev.
+The value of CodeUrl is modified when the app is built in release mode. The branch is automatically changed to **master**. This allows you to test the link in debug while pointing to dev.

From 467b1733f3e219a70bbde4fb6d117d397835a167 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 6 Aug 2020 17:45:30 -0700
Subject: [PATCH 357/595] Replace Newtonsoft.Json with the new .Net
 JsonSerializer.

---
 .../Microsoft.Toolkit.Services.csproj         |  2 +-
 .../Microsoft.Toolkit.Services.rd.xml         |  6 ++
 .../Services/LinkedIn/LinkedInDataProvider.cs | 16 ++-
 .../Services/LinkedIn/LinkedInParser.cs       | 10 +-
 .../MicrosoftTranslator/AzureAuthToken.cs     |  9 +-
 .../MicrosoftTranslator/ErrorResponse.cs      | 16 ++-
 .../MicrosoftTranslator/ServiceLanguage.cs    |  4 +-
 .../MicrosoftTranslator/TranslatorService.cs  | 13 ++-
 .../Services/Twitter/Tweet.cs                 | 58 +++++------
 .../Services/Twitter/TweetParser.cs           |  4 +-
 .../Twitter/TwitterCoordinatesConverter.cs    | 97 ++++++++++++++++---
 .../Services/Twitter/TwitterDataProvider.cs   |  8 +-
 .../Services/Twitter/TwitterDirectMessage.cs  | 22 ++---
 .../Services/Twitter/TwitterEntities.cs       | 14 +--
 .../Services/Twitter/TwitterError.cs          |  6 +-
 .../Services/Twitter/TwitterErrors.cs         |  4 +-
 .../Services/Twitter/TwitterExtended.cs       |  4 +-
 .../Twitter/TwitterExtendedEntities.cs        |  4 +-
 .../Services/Twitter/TwitterGeoData.cs        |  6 +-
 .../Services/Twitter/TwitterHashtag.cs        |  6 +-
 .../Services/Twitter/TwitterMedia.cs          | 26 ++---
 .../Twitter/TwitterMediaAdditionalInfo.cs     | 10 +-
 .../Services/Twitter/TwitterMediaSizeData.cs  |  8 +-
 .../Services/Twitter/TwitterMediaSizes.cs     | 10 +-
 .../Services/Twitter/TwitterMediaVideoInfo.cs |  8 +-
 .../Twitter/TwitterMediaVideoVariants.cs      |  8 +-
 .../Services/Twitter/TwitterOAuthRequest.cs   | 33 ++++---
 .../Twitter/TwitterOAuthRequestExtensions.cs  |  8 --
 .../Services/Twitter/TwitterParser.cs         |  8 +-
 .../Services/Twitter/TwitterPlace.cs          | 18 ++--
 .../Twitter/TwitterPlaceBoundingBox.cs        |  7 +-
 .../Services/Twitter/TwitterPoll.cs           |  8 +-
 .../Services/Twitter/TwitterPollOptions.cs    |  6 +-
 .../Services/Twitter/TwitterSearchParser.cs   |  4 +-
 .../Twitter/TwitterStreamDeletedEvent.cs      |  6 +-
 .../Services/Twitter/TwitterStreamEvent.cs    |  9 +-
 .../Services/Twitter/TwitterSymbol.cs         |  6 +-
 .../Services/Twitter/TwitterUrl.cs            | 12 +--
 .../Services/Twitter/TwitterUrlUnwound.cs     | 10 +-
 .../Services/Twitter/TwitterUser.cs           | 66 ++++++-------
 .../Services/Twitter/TwitterUserMention.cs    |  4 +-
 .../Twitter/TwitterUserStreamParser.cs        | 41 +++-----
 .../Services/Weibo/WeiboDataProvider.cs       | 15 ++-
 .../Services/Weibo/WeiboError.cs              |  6 +-
 .../Services/Weibo/WeiboGeoInfo.cs            |  6 +-
 .../Services/Weibo/WeiboImage.cs              |  8 +-
 .../Services/Weibo/WeiboOAuthRequest.cs       | 23 +++--
 .../Weibo/WeiboOAuthRequestExtensions.cs      |  8 --
 .../Services/Weibo/WeiboParser.cs             |  8 +-
 .../Services/Weibo/WeiboStatus.cs             | 36 +++----
 .../Services/Weibo/WeiboStatusParser.cs       | 16 +--
 .../Services/Weibo/WeiboUser.cs               | 28 +++---
 .../DifferencesGen.csproj                     |  5 -
 .../Data/GitHub.cs                            |  4 +-
 .../Data/PhotosDataSource.cs                  |  4 +-
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  4 +-
 .../Models/GitHubRelease.cs                   | 14 +--
 .../Models/LandingPageLink.cs                 |  6 +-
 .../Models/LandingPageLinks.cs                |  8 +-
 .../Models/LandingPageResource.cs             |  8 +-
 .../Models/Sample.cs                          | 10 +-
 .../Models/Samples.cs                         |  9 +-
 .../Pages/About.xaml.cs                       |  7 +-
 .../EnumValuesExtensionPage.xaml.cs           |  4 +-
 .../InAppNotificationPage.xaml.cs             |  4 +-
 .../MarkdownParser/MarkdownParserPage.xaml.cs | 12 ++-
 .../MicrosoftTranslatorPage.xaml.cs           | 17 ++--
 .../landingPageLinks.json                     |  4 -
 .../Microsoft.Toolkit.Uwp.Services.csproj     |  3 -
 .../Microsoft.Toolkit.Uwp.Services.rd.xml     |  1 +
 .../Facebook/FacebookRequestSource.cs         |  4 +-
 .../Services/Facebook/FacebookService.cs      | 22 ++++-
 ...initeCanvasVirtualDrawingSurface.Render.cs | 22 +++--
 .../InfiniteCanvas/Drawables/InkDrawable.cs   |  2 +-
 .../JsonConverters/SerializableStroke.cs      |  2 +-
 ... Microsoft.Toolkit.Uwp.UI.Controls.rd.xml} |  1 +
 .../ObjectStorage/JsonObjectSerializer.cs     |  6 +-
 .../Microsoft.Toolkit.Uwp.csproj              |  4 +-
 .../Properties/Microsoft.Toolkit.Uwp.rd.xml   |  6 ++
 .../Microsoft.Windows.Toolkit.rd.xml          | 33 -------
 .../Helpers/Test_StorageHelper.cs             |  8 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  3 +
 82 files changed, 542 insertions(+), 474 deletions(-)
 create mode 100644 Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml
 rename Microsoft.Toolkit.Uwp.UI.Controls/Properties/{Microsoft.Windows.Toolkit.UI.Controls.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.rd.xml} (68%)
 create mode 100644 Microsoft.Toolkit.Uwp/Properties/Microsoft.Toolkit.Uwp.rd.xml
 delete mode 100644 Microsoft.Toolkit.Uwp/Properties/Microsoft.Windows.Toolkit.rd.xml

diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index 1db59a5b434..a7d3225ee7e 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml b/Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml
new file mode 100644
index 00000000000..9f5b9bd9498
--- /dev/null
+++ b/Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="Microsoft.Toolkit.Services">
+    <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
+  </Library>
+</Directives>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index f852688bc57..cf07a1c305e 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -7,9 +7,9 @@
 using System.Diagnostics;
 using System.Net.Http;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json.Linq;
 
 #if WINRT
 using Microsoft.Toolkit.Services.PlatformSpecific.Uwp;
@@ -81,7 +81,8 @@ public LinkedInDataProvider(LinkedInOAuthTokens tokens, LinkedInPermissions requ
                 throw new ArgumentException("Missing callback uri");
             }
 
-            if (!Enum.IsDefined(typeof(LinkedInPermissions), requiredPermissions))
+            // Check if outside the bounds of the LinkedInPermissions Enum
+            if (requiredPermissions < 0 || requiredPermissions > (LinkedInPermissions)15)
             {
                 throw new ArgumentException("Error retrieving required permissions");
             }
@@ -278,9 +279,14 @@ private async Task<string> GetAccessTokenAsync(LinkedInOAuthTokens tokens, strin
             {
                 using (var response = await client.SendAsync(request).ConfigureAwait(false))
                 {
-                    var jsonString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    var json = JObject.Parse(jsonString);
-                    return json.GetValue("access_token").Value<string>();
+                    using (var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    {
+                        using (var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false))
+                        {
+                            var value = jsonDoc.RootElement.GetProperty("access_token");
+                            return value.GetString();
+                        }
+                    }
                 }
             }
         }
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs
index 583385bd1ee..4e145764452 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.LinkedIn
 {
@@ -24,11 +24,11 @@ public IEnumerable<T> Parse(string data)
 
             try
             {
-                results = JsonConvert.DeserializeObject<List<T>>(data);
+                results = JsonSerializer.Deserialize<List<T>>(data);
             }
-            catch (JsonSerializationException)
+            catch (JsonException)
             {
-                T linkedInResult = JsonConvert.DeserializeObject<T>(data);
+                T linkedInResult = JsonSerializer.Deserialize<T>(data);
                 results = new List<T> { linkedInResult };
             }
 
@@ -42,7 +42,7 @@ public IEnumerable<T> Parse(string data)
         /// <returns>Returns string data.</returns>
         public string Parse(T dataToShare)
         {
-            return JsonConvert.SerializeObject(dataToShare, Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            return JsonSerializer.Serialize(dataToShare, typeof(T), new JsonSerializerOptions { IgnoreNullValues = true });
         }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
index 4ac141da9e0..32dff4c0c74 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -24,6 +24,9 @@ internal class AzureAuthToken
         /// </summary>
         private static readonly Uri ServiceUrl = new Uri("https://api.cognitive.microsoft.com/sts/v1.0/issueToken");
 
+        // TODO
+        // private static readonly Uri ServiceUrl = new Uri(THIS SHOULD BE A PARAMETER NOW);
+
         /// <summary>
         /// After obtaining a valid token, this class will cache it for this duration.
         /// Use a duration of 8 minutes, which is less than the actual token lifetime of 10 minutes.
@@ -99,8 +102,8 @@ public async Task<string> GetAccessTokenAsync()
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    var error = JsonConvert.DeserializeObject<ErrorResponse>(content);
-                    throw new TranslatorServiceException(error.Message);
+                    var error = JsonSerializer.Deserialize<ErrorResponse>(content);
+                    throw new TranslatorServiceException(error?.Error?.Message);
                 }
 
                 _storedTokenTime = DateTime.Now;
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs
index 3d9e9038495..870ee897f0e 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs
@@ -2,21 +2,27 @@
 // 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.Text.Json.Serialization;
+
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
+#pragma warning disable SA1402 // File may only contain a single type
     /// <summary>
     /// Holds information about an error occurred while accessing Microsoft Translator Service.
     /// </summary>
     internal class ErrorResponse
+    {
+        [JsonPropertyName("error")]
+        public Error Error { get; set; }
+    }
+
+    internal class Error
     {
         /// <summary>
         /// Gets or sets the error message.
         /// </summary>
+        [JsonPropertyName("message")]
         public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HTTP status code.
-        /// </summary>
-        public int StatusCode { get; set; }
     }
+#pragma warning restore SA1402 // File may only contain a single type
 }
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
index 6053cebb865..abed597f9bd 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -30,7 +30,7 @@ public class ServiceLanguage
         /// <summary>
         /// Gets the directionality, which is rtl for right-to-left languages or ltr for left-to-right languages.
         /// </summary>
-        [JsonProperty("dir")]
+        [JsonPropertyName("dir")]
         public string Directionality { get; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
index ac3680b266a..83c9a008956 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
@@ -8,9 +8,8 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -113,7 +112,7 @@ public async Task<IEnumerable<DetectedLanguageResponse>> DetectLanguagesWithResp
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var responseContent = JsonConvert.DeserializeObject<IEnumerable<DetectedLanguageResponse>>(content);
+                var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
                 return responseContent;
             }
         }
@@ -144,8 +143,8 @@ public async Task<IEnumerable<ServiceLanguage>> GetLanguageNamesAsync(string lan
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var jsonContent = JToken.Parse(content)["translation"];
-                var responseContent = JsonConvert.DeserializeObject<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
+                var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
+                var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
                 responseContent.ForEach(r => r.Value.Code = r.Key);
 
                 return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
@@ -221,7 +220,7 @@ public async Task<IEnumerable<TranslationResponse>> TranslateWithResponseAsync(I
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var responseContent = JsonConvert.DeserializeObject<IEnumerable<TranslationResponse>>(content);
+                var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
                 return responseContent;
             }
         }
@@ -254,7 +253,7 @@ private HttpRequestMessage CreateHttpRequest(string uriString, HttpMethod method
 
             if (content != null)
             {
-                var jsonRequest = JsonConvert.SerializeObject(content);
+                var jsonRequest = JsonSerializer.Serialize(content);
                 var requestContent = new StringContent(jsonRequest, System.Text.Encoding.UTF8, JsonMediaType);
                 request.Content = requestContent;
             }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs b/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
index 97d2613aa02..c0dea2d0092 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/Tweet.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Globalization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -18,19 +18,19 @@ public class Tweet : Toolkit.Parsers.SchemaBase, ITwitterResult
         /// <summary>
         /// Gets or sets time item was created.
         /// </summary>
-        [JsonProperty("created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
         /// <summary>
         /// Gets or sets item Id.
         /// </summary>
-        [JsonProperty("id_str")]
+        [JsonPropertyName("id_str")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets text of the tweet (handles both 140 and 280 characters)
         /// </summary>
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text
         {
             get { return _text ?? FullText; }
@@ -40,13 +40,13 @@ public string Text
         /// <summary>
         /// Gets or sets text of the tweet (280 characters).
         /// </summary>
-        [JsonProperty("full_text")]
+        [JsonPropertyName("full_text")]
         private string FullText { get; set; }
 
         /// <summary>
         /// Gets or sets display text range (indexes of tweet text without RT and leading user mentions)
         /// </summary>
-        [JsonProperty("display_text_range")]
+        [JsonPropertyName("display_text_range")]
         public int[] DisplayTextRange { get; set; }
 
         /// <summary>
@@ -54,68 +54,68 @@ public string Text
         /// (true when tweet is longer than 140 characters)
         /// This entity may be deprecated - it never seems to be set to true.
         /// </summary>
-        [JsonProperty("truncated")]
+        [JsonPropertyName("truncated")]
         public bool IsTruncated { get; set; }
 
         /// <summary>
         /// Gets or sets attached content of the tweet
         /// </summary>
-        [JsonProperty("entities")]
+        [JsonPropertyName("entities")]
         public TwitterEntities Entities { get; set; }
 
         /// <summary>
         /// Gets or sets extended attached content of the tweet
         /// </summary>
-        [JsonProperty("extended_entities")]
+        [JsonPropertyName("extended_entities")]
         public TwitterExtendedEntities ExtendedEntities { get; set; }
 
         /// <summary>
         /// Gets or sets tweet source (client or website used)
         /// </summary>
-        [JsonProperty("source")]
+        [JsonPropertyName("source")]
         public string Source { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_screen_name
         /// </summary>
-        [JsonProperty("in_reply_to_screen_name")]
+        [JsonPropertyName("in_reply_to_screen_name")]
         public string InReplyToScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_status_id_str
         /// </summary>
-        [JsonProperty("in_reply_to_status_id_str")]
+        [JsonPropertyName("in_reply_to_status_id_str")]
         public string InReplyToStatusId { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_user_id_str
         /// </summary>
-        [JsonProperty("in_reply_to_user_id_str")]
+        [JsonPropertyName("in_reply_to_user_id_str")]
         public string InReplyToUserId { get; set; }
 
         /// <summary>
         /// Gets or sets user who posted the status.
         /// </summary>
-        [JsonProperty("user")]
+        [JsonPropertyName("user")]
         public TwitterUser User { get; set; }
 
         /// <summary>
         /// Gets or sets geo coordinates (latitude and longitude) returned by Twitter for some locations
         /// </summary>
-        [JsonProperty("coordinates")]
+        [JsonPropertyName("coordinates")]
         [JsonConverter(typeof(TwitterCoordinatesConverter))]
         public TwitterCoordinates Coordinates { get; set; }
 
         /// <summary>
         /// Gets or sets the Place object returned by Twitter for some locations
         /// </summary>
-        [JsonProperty("place")]
+        [JsonPropertyName("place")]
         public TwitterPlace Place { get; set; }
 
         /// <summary>
         /// Gets or sets the Retweeted Tweet
         /// </summary>
-        [JsonProperty("retweeted_status")]
+        [JsonPropertyName("retweeted_status")]
         public Tweet RetweetedStatus { get; set; }
 
         /// <summary>
@@ -138,25 +138,25 @@ public DateTime CreationDate
         /// <summary>
         /// Gets or sets quoted_status
         /// </summary>
-        [JsonProperty("quoted_status")]
+        [JsonPropertyName("quoted_status")]
         public Tweet QuotedStatus { get; set; }
 
         /// <summary>
         /// Gets or sets quoted_status_id_str
         /// </summary>
-        [JsonProperty("quoted_status_id_str")]
+        [JsonPropertyName("quoted_status_id_str")]
         public string QuotedStatusId { get; set; }
 
         /// <summary>
         /// Gets or sets quoted_status_permalink
         /// </summary>
-        [JsonProperty("quoted_status_permalink")]
+        [JsonPropertyName("quoted_status_permalink")]
         public TwitterUrl QuotedStatusPermalink { get; set; }
 
         /// <summary>
         /// Gets or sets approximate count of tweets quoting tweet
         /// </summary>
-        [JsonProperty("quote_count")]
+        [JsonPropertyName("quote_count")]
         public int QuoteCount { get; set; }
 
         /// <summary>
@@ -165,49 +165,49 @@ public DateTime CreationDate
         /// <remarks>
         /// Premium and Enterprise API access only
         /// </remarks>
-        [JsonProperty("reply_count")]
+        [JsonPropertyName("reply_count")]
         public int ReplyCount { get; set; }
 
         /// <summary>
         /// Gets or sets number of times tweet has been retweeted
         /// </summary>
-        [JsonProperty("retweet_count")]
+        [JsonPropertyName("retweet_count")]
         public int RetweetCount { get; set; }
 
         /// <summary>
         /// Gets or sets number of times tweet has been liked
         /// </summary>
-        [JsonProperty("favorite_count")]
+        [JsonPropertyName("favorite_count")]
         public int FavoriteCount { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not logged-in user has liked tweet
         /// </summary>
-        [JsonProperty("favorited")]
+        [JsonPropertyName("favorited")]
         public bool Favorited { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not logged-in user has retweeted tweet
         /// </summary>
-        [JsonProperty("retweeted")]
+        [JsonPropertyName("retweeted")]
         public bool Retweeted { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether URL in tweet has been flagged for sensitive content
         /// </summary>
-        [JsonProperty("possibly_sensitive")]
+        [JsonPropertyName("possibly_sensitive")]
         public bool Sensitive { get; set; }
 
         /// <summary>
         /// Gets or sets stream filter of tweet
         /// </summary>
-        [JsonProperty("filter_level")]
+        [JsonPropertyName("filter_level")]
         public string FilterLevel { get; set; }
 
         /// <summary>
         /// Gets or sets BCP 47 language identifier of tweet content
         /// </summary>
-        [JsonProperty("lang")]
+        [JsonPropertyName("lang")]
         public string Language { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TweetParser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TweetParser.cs
index 711e95808f0..26a544cb6f8 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TweetParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TweetParser.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -24,7 +24,7 @@ public IEnumerable<Tweet> Parse(string data)
                 return null;
             }
 
-            return JsonConvert.DeserializeObject<List<Tweet>>(data);
+            return JsonSerializer.Deserialize<List<Tweet>>(data);
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
index 73375d98fab..5a53501286a 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
@@ -3,41 +3,104 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
-    internal class TwitterCoordinatesConverter : JsonConverter
+    internal class TwitterCoordinatesConverter : JsonConverter<TwitterCoordinates>
     {
+        private readonly JsonEncodedText latitudeName = JsonEncodedText.Encode("Latitude");
+        private readonly JsonEncodedText longitudeName = JsonEncodedText.Encode("Longitude");
+
         public override bool CanConvert(Type objectType)
         {
             return false;
         }
 
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        private readonly JsonConverter<double> _doubleConverter;
+
+        public TwitterCoordinatesConverter(JsonSerializerOptions options)
+        {
+            if (options?.GetConverter(typeof(double)) is JsonConverter<double> doubleConverter)
+            {
+                _doubleConverter = doubleConverter;
+            }
+            else
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        public override TwitterCoordinates Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             try
             {
-                if (reader.TokenType != JsonToken.StartObject)
+                if (reader.TokenType != JsonTokenType.StartObject)
                 {
                     return null;
                 }
 
-                var jObject = JObject.Load(reader);
-                var jCoordinates = jObject["coordinates"] as JArray;
+                double latitude = default;
+                bool latitudeSet = false;
 
-                if (jCoordinates.Count != 2)
+                double longitude = default;
+                bool longitudeSet = false;
+
+                // Get the first property.
+                reader.Read();
+                if (reader.TokenType != JsonTokenType.PropertyName)
                 {
-                    return null;
+                    throw new JsonException();
+                }
+
+                if (reader.ValueTextEquals(latitudeName.EncodedUtf8Bytes))
+                {
+                    latitude = ReadProperty(ref reader, options);
+                    latitudeSet = true;
+                }
+                else if (reader.ValueTextEquals(longitudeName.EncodedUtf8Bytes))
+                {
+                    longitude = ReadProperty(ref reader, options);
+                    longitudeSet = true;
+                }
+                else
+                {
+                    throw new JsonException();
                 }
 
-                var twitterCoordinates = new TwitterCoordinates
+                // Get the second property.
+                reader.Read();
+                if (reader.TokenType != JsonTokenType.PropertyName)
                 {
-                    Latitude = (double)jCoordinates[0],
-                    Longitude = (double)jCoordinates[1]
+                    throw new JsonException();
+                }
+
+                if (latitudeSet && reader.ValueTextEquals(longitudeName.EncodedUtf8Bytes))
+                {
+                    longitude = ReadProperty(ref reader, options);
+                }
+                else if (longitudeSet && reader.ValueTextEquals(latitudeName.EncodedUtf8Bytes))
+                {
+                    latitude = ReadProperty(ref reader, options);
+                }
+                else
+                {
+                    throw new JsonException();
+                }
+
+                reader.Read();
+
+                if (reader.TokenType != JsonTokenType.EndObject)
+                {
+                    throw new JsonException();
+                }
+
+                return new TwitterCoordinates
+                {
+                    Latitude = latitude,
+                    Longitude = longitude
                 };
-                return twitterCoordinates;
             }
             catch
             {
@@ -45,7 +108,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             }
         }
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        private double ReadProperty(ref Utf8JsonReader reader, JsonSerializerOptions options)
+        {
+            reader.Read();
+            return _doubleConverter.Read(ref reader, typeof(double), options);
+        }
+
+        public override void Write(Utf8JsonWriter writer, TwitterCoordinates value, JsonSerializerOptions options)
         {
             throw new NotImplementedException();
         }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index a6eda59f07e..b594fcba563 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -10,9 +10,9 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json;
 
 #if WINRT
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -140,7 +140,7 @@ public async Task<TwitterUser> GetUserAsync(string screenName = null)
 
                 TwitterOAuthRequest request = new TwitterOAuthRequest();
                 rawResult = await request.ExecuteGetAsync(uri, _tokens, _signatureManager);
-                return JsonConvert.DeserializeObject<TwitterUser>(rawResult);
+                return JsonSerializer.Deserialize<TwitterUser>(rawResult);
             }
             catch (UserNotFoundException)
             {
@@ -150,7 +150,7 @@ public async Task<TwitterUser> GetUserAsync(string screenName = null)
             {
                 if (!string.IsNullOrEmpty(rawResult))
                 {
-                    var errors = JsonConvert.DeserializeObject<TwitterErrors>(rawResult);
+                    var errors = JsonSerializer.Deserialize<TwitterErrors>(rawResult);
 
                     throw new TwitterException { Errors = errors };
                 }
@@ -191,7 +191,7 @@ public async Task<IEnumerable<TSchema>> GetUserTimeLineAsync<TSchema>(string scr
             {
                 if (!string.IsNullOrEmpty(rawResult))
                 {
-                    var errors = JsonConvert.DeserializeObject<TwitterErrors>(rawResult);
+                    var errors = JsonSerializer.Deserialize<TwitterErrors>(rawResult);
 
                     throw new TwitterException { Errors = errors };
                 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDirectMessage.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDirectMessage.cs
index 7ffe9355f1c..803c9b7404d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDirectMessage.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDirectMessage.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Globalization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -17,70 +17,70 @@ public class TwitterDirectMessage : ITwitterResult
         /// Gets or sets the direct message id.
         /// </summary>
         /// <value>The direct message id.</value>
-        [JsonProperty(PropertyName = "id")]
+        [JsonPropertyName("id")]
         public decimal Id { get; set; }
 
         /// <summary>
         /// Gets or sets the sender id.
         /// </summary>
         /// <value>The sender id.</value>
-        [JsonProperty(PropertyName = "sender_id")]
+        [JsonPropertyName("sender_id")]
         public decimal SenderId { get; set; }
 
         /// <summary>
         /// Gets or sets the direct message text.
         /// </summary>
         /// <value>The direct message text.</value>
-        [JsonProperty(PropertyName = "text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
 
         /// <summary>
         /// Gets or sets the recipient id.
         /// </summary>
         /// <value>The recipient id.</value>
-        [JsonProperty(PropertyName = "recipient_id")]
+        [JsonPropertyName("recipient_id")]
         public decimal RecipientId { get; set; }
 
         /// <summary>
         /// Gets or sets the created date.
         /// </summary>
         /// <value>The created date.</value>
-        [JsonProperty(PropertyName = "created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the sender screen.
         /// </summary>
         /// <value>The name of the sender screen.</value>
-        [JsonProperty(PropertyName = "sender_screen_name")]
+        [JsonPropertyName("sender_screen_name")]
         public string SenderScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the recipient screen.
         /// </summary>
         /// <value>The name of the recipient screen.</value>
-        [JsonProperty(PropertyName = "recipient_screen_name")]
+        [JsonPropertyName("recipient_screen_name")]
         public string RecipientScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets the sender.
         /// </summary>
         /// <value>The sender.</value>
-        [JsonProperty(PropertyName = "sender")]
+        [JsonPropertyName("sender")]
         public TwitterUser Sender { get; set; }
 
         /// <summary>
         /// Gets or sets the recipient.
         /// </summary>
         /// <value>The recipient.</value>
-        [JsonProperty(PropertyName = "recipient")]
+        [JsonPropertyName("recipient")]
         public TwitterUser Recipient { get; set; }
 
         /// <summary>
         /// Gets or sets the entities.
         /// </summary>
         /// <value>The entities.</value>
-        [JsonProperty(PropertyName = "entities")]
+        [JsonPropertyName("entities")]
         public TwitterEntities Entities { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterEntities.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterEntities.cs
index 0e489429c48..d4e76c90a12 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterEntities.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterEntities.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -15,35 +15,35 @@ public class TwitterEntities
         /// Gets or sets Hashtags array of the tweet.
         /// This array will be empty if no Hashtags are present.
         /// </summary>
-        [JsonProperty("Hashtags")]
+        [JsonPropertyName("Hashtags")]
         public TwitterHashtag[] Hashtags { get; set; }
 
         /// <summary>
         /// Gets or sets Symbols array of the tweet.
         /// This array will be empty if no Symbols are present.
         /// </summary>
-        [JsonProperty("Symbols")]
+        [JsonPropertyName("Symbols")]
         public TwitterSymbol[] Symbols { get; set; }
 
         /// <summary>
         /// Gets or sets Media array of the tweet.
         /// This array will not exist if no media is present.
         /// </summary>
-        [JsonProperty("media")]
+        [JsonPropertyName("media")]
         public TwitterMedia[] Media { get; set; }
 
         /// <summary>
         /// Gets or sets Urls array of the tweet.
         /// This array will be empty if no Urls are present.
         /// </summary>
-        [JsonProperty("urls")]
+        [JsonPropertyName("urls")]
         public TwitterUrl[] Urls { get; set; }
 
         /// <summary>
         /// Gets or sets array of usernames mentioned in the tweet.
         /// This array will be empty if no usernames are mentioned.
         /// </summary>
-        [JsonProperty("user_mentions")]
+        [JsonPropertyName("user_mentions")]
         public TwitterUserMention[] UserMentions { get; set; }
 
         /// <summary>
@@ -51,7 +51,7 @@ public class TwitterEntities
         /// This array will not exist if no poll is present.
         /// This array will always have one poll.
         /// </summary>
-        [JsonProperty("polls")]
+        [JsonPropertyName("polls")]
         public TwitterPoll Poll { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterError.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterError.cs
index 66e1abf291c..3df83ff3c61 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterError.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterError.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,13 +14,13 @@ public class TwitterError
         /// <summary>
         /// Gets or sets error code
         /// </summary>
-        [JsonProperty("code")]
+        [JsonPropertyName("code")]
         public int Code { get; set; }
 
         /// <summary>
         /// Gets or sets error message
         /// </summary>
-        [JsonProperty("message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterErrors.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterErrors.cs
index 2ccad80ee64..801c7485bcc 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterErrors.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterErrors.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,7 +14,7 @@ public class TwitterErrors
         /// <summary>
         /// Gets or sets the list of errors
         /// </summary>
-        [JsonProperty("errors")]
+        [JsonPropertyName("errors")]
         public TwitterError[] Errors { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtended.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtended.cs
index c0bd10a7019..d9cca155f90 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtended.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtended.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,7 +14,7 @@ public class TwitterExtended
         /// <summary>
         /// Gets or sets the text of the tweet (280 characters).
         /// </summary>
-        [JsonProperty("full_text")]
+        [JsonPropertyName("full_text")]
         public string FullText { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtendedEntities.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtendedEntities.cs
index 9f912a1f027..6f4ae88d54c 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtendedEntities.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterExtendedEntities.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,7 +14,7 @@ public class TwitterExtendedEntities
         /// <summary>
         /// Gets or sets Media of the tweet.
         /// </summary>
-        [JsonProperty("media")]
+        [JsonPropertyName("media")]
         public TwitterMedia[] Media { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterGeoData.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterGeoData.cs
index 125dc904cc6..977090f6f36 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterGeoData.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterGeoData.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -19,7 +19,7 @@ public class TwitterGeoData
         /// <summary>
         /// Gets or sets the type of data
         /// </summary>
-        [JsonProperty("type")]
+        [JsonPropertyName("type")]
         public string DataType { get; set; }
 
         /// <summary>
@@ -43,7 +43,7 @@ public string DisplayCoordinates
         /// <summary>
         /// Gets or sets the coordinates of the geographic data
         /// </summary>
-        [JsonProperty("coordinates")]
+        [JsonPropertyName("coordinates")]
         public string[] Coordinates { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterHashtag.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterHashtag.cs
index 6dc329569b8..d5350ede07a 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterHashtag.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterHashtag.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,13 +14,13 @@ public class TwitterHashtag
         /// <summary>
         /// Gets or sets indices of hashtag location in tweet string.
         /// </summary>
-        [JsonProperty("indices")]
+        [JsonPropertyName("indices")]
         public int[] Indices { get; set; }
 
         /// <summary>
         /// Gets or sets hashtag text, excluding #.
         /// </summary>
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMedia.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMedia.cs
index e6846337bb6..2ebe86dacf7 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMedia.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMedia.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,73 +14,73 @@ public class TwitterMedia
         /// <summary>
         /// Gets or sets ID as string.
         /// </summary>
-        [JsonProperty("id_str")]
+        [JsonPropertyName("id_str")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets indices array.
         /// </summary>
-        [JsonProperty("indices")]
+        [JsonPropertyName("indices")]
         public int[] Indices { get; set; }
 
         /// <summary>
         /// Gets or sets MediaUrl (direct link to image).
         /// </summary>
-        [JsonProperty("media_url")]
+        [JsonPropertyName("media_url")]
         public string MediaUrl { get; set; }
 
         /// <summary>
         /// Gets or sets HTTPS MediaUrl.
         /// </summary>
-        [JsonProperty("media_url_https")]
+        [JsonPropertyName("media_url_https")]
         public string MediaUrlHttps { get; set; }
 
         /// <summary>
         /// Gets or sets t.co shortened tweet Url.
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
 
         /// <summary>
         /// Gets or sets DisplayUrl (pics.twitter.com Url).
         /// </summary>
-        [JsonProperty("display_url")]
+        [JsonPropertyName("display_url")]
         public string DisplayUrl { get; set; }
 
         /// <summary>
         /// Gets or sets DisplayUrl (pics.twitter.com Url).
         /// </summary>
-        [JsonProperty("expanded_url")]
+        [JsonPropertyName("expanded_url")]
         public string ExpandedUrl { get; set; }
 
         /// <summary>
         /// Gets or sets MediaType - photo, animated_gif, or video
         /// </summary>
-        [JsonProperty("type")]
+        [JsonPropertyName("type")]
         public string MediaType { get; set; }
 
         /// <summary>
         /// Gets or sets size array
         /// </summary>
-        [JsonProperty("sizes")]
+        [JsonPropertyName("sizes")]
         public TwitterMediaSizes Sizes { get; set; }
 
         /// <summary>
         /// Gets or sets the SourceId - tweet ID of media's original tweet
         /// </summary>
-        [JsonProperty("source_status_id_str")]
+        [JsonPropertyName("source_status_id_str")]
         public string SourceIdStr { get; set; }
 
         /// <summary>
         /// Gets or sets metadata for video attached to tweet
         /// </summary>
-        [JsonProperty("video_info")]
+        [JsonPropertyName("video_info")]
         public TwitterMediaVideoInfo VideoInfo { get; set; }
 
         /// <summary>
         /// Gets or sets extended metadata for video attached to tweet.
         /// </summary>
-        [JsonProperty("additional_media_info")]
+        [JsonPropertyName("additional_media_info")]
         public TwitterMediaAdditionalInfo AdditionalMediaInfo { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaAdditionalInfo.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaAdditionalInfo.cs
index 048844380c0..4ded7817d98 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaAdditionalInfo.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaAdditionalInfo.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,25 +14,25 @@ public class TwitterMediaAdditionalInfo
         /// <summary>
         /// Gets or sets title of video
         /// </summary>
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title { get; set; }
 
         /// <summary>
         /// Gets or sets description of video
         /// </summary>
-        [JsonProperty("description")]
+        [JsonPropertyName("description")]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether video is embeddable
         /// </summary>
-        [JsonProperty("embeddable")]
+        [JsonPropertyName("embeddable")]
         public bool Embeddable { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether "monetizable"
         /// </summary>
-        [JsonProperty("monetizable")]
+        [JsonPropertyName("monetizable")]
         public bool Monetizable { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizeData.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizeData.cs
index db91c1502e9..7c787eb4af4 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizeData.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizeData.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,19 +14,19 @@ public class TwitterMediaSizeData
         /// <summary>
         /// Gets or sets width integer.
         /// </summary>
-        [JsonProperty("w")]
+        [JsonPropertyName("w")]
         public int Width { get; set; }
 
         /// <summary>
         /// Gets or sets height integer.
         /// </summary>
-        [JsonProperty("h")]
+        [JsonPropertyName("h")]
         public int Height { get; set; }
 
         /// <summary>
         /// Gets or sets resize string.
         /// </summary>
-        [JsonProperty("resize")]
+        [JsonPropertyName("resize")]
         public string Resize { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizes.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizes.cs
index d6a4cb73a04..dbffbf70cf2 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizes.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaSizes.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,25 +14,25 @@ public class TwitterMediaSizes
         /// <summary>
         /// Gets or sets small metadata.
         /// </summary>
-        [JsonProperty("small")]
+        [JsonPropertyName("small")]
         public TwitterMediaSizeData Small { get; set; }
 
         /// <summary>
         /// Gets or sets thumbnail metadata.
         /// </summary>
-        [JsonProperty("thumb")]
+        [JsonPropertyName("thumb")]
         public TwitterMediaSizeData Thumb { get; set; }
 
         /// <summary>
         /// Gets or sets large metadata.
         /// </summary>
-        [JsonProperty("large")]
+        [JsonPropertyName("large")]
         public TwitterMediaSizeData Large { get; set; }
 
         /// <summary>
         /// Gets or sets medium metadata.
         /// </summary>
-        [JsonProperty("medium")]
+        [JsonPropertyName("medium")]
         public TwitterMediaSizeData Medium { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoInfo.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoInfo.cs
index 1fde7a7789d..88904902388 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoInfo.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoInfo.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,19 +14,19 @@ public class TwitterMediaVideoInfo
         /// <summary>
         /// Gets or sets video aspect ratio (width, height)
         /// </summary>
-        [JsonProperty("aspect_ratio")]
+        [JsonPropertyName("aspect_ratio")]
         public int[] AspectRatio { get; set; }
 
         /// <summary>
         /// Gets or sets duration of video in milliseconds
         /// </summary>
-        [JsonProperty("duration_millis")]
+        [JsonPropertyName("duration_millis")]
         public int Duration { get; set; }
 
         /// <summary>
         /// Gets or sets video variants for different codecs, bitrates, etc.
         /// </summary>
-        [JsonProperty("variants")]
+        [JsonPropertyName("variants")]
         public TwitterMediaVideoVariants[] Variants { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoVariants.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoVariants.cs
index ad3b8915450..38301583bd5 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoVariants.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterMediaVideoVariants.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,19 +14,19 @@ public class TwitterMediaVideoVariants
         /// <summary>
         /// Gets or sets video bitrate in bits-per-second
         /// </summary>
-        [JsonProperty("bitrate")]
+        [JsonPropertyName("bitrate")]
         public int Bitrate { get; set; }
 
         /// <summary>
         /// Gets or sets the MIME type of the video
         /// </summary>
-        [JsonProperty("content_type")]
+        [JsonPropertyName("content_type")]
         public string ContentType { get; set; }
 
         /// <summary>
         /// Gets or sets the direct URL for the video variant
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
index 3cab762951d..7ad7f835c50 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
@@ -8,10 +8,9 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -79,17 +78,18 @@ public async Task ExecuteGetStreamAsync(Uri requestUri, TwitterOAuthTokens token
                 using (var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
                 {
                     response.ThrowIfNotValid();
-                    var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-
-                    using (var reader = new StreamReader(responseStream))
+                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
                     {
-                        while (!_abort && !reader.EndOfStream)
+                        using (var reader = new StreamReader(responseStream))
                         {
-                            var result = reader.ReadLine();
-
-                            if (!string.IsNullOrEmpty(result))
+                            while (!_abort && !reader.EndOfStream)
                             {
-                                callback?.Invoke(result);
+                                var result = reader.ReadLine();
+
+                                if (!string.IsNullOrEmpty(result))
+                                {
+                                    callback?.Invoke(result);
+                                }
                             }
                         }
                     }
@@ -139,7 +139,7 @@ public async Task<string> ExecutePostAsync(Uri requestUri, TwitterOAuthTokens to
         /// <returns>String result.</returns>
         public async Task<string> ExecutePostMultipartAsync(Uri requestUri, TwitterOAuthTokens tokens, string boundary, byte[] content, ISignatureManager signatureManager)
         {
-            JToken mediaId = null;
+            JsonElement mediaId = default;
 
             try
             {
@@ -160,10 +160,11 @@ public async Task<string> ExecutePostMultipartAsync(Uri requestUri, TwitterOAuth
                             using (var response = await client.SendAsync(request).ConfigureAwait(false))
                             {
                                 response.ThrowIfNotValid();
-                                string jsonResult = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-
-                                JObject jObj = JObject.Parse(jsonResult);
-                                mediaId = jObj["media_id_string"];
+                                using (var jsonResult = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                                {
+                                    var jObj = await JsonDocument.ParseAsync(jsonResult).ConfigureAwait(false);
+                                    mediaId = jObj.RootElement.GetProperty("media_id_string");
+                                }
                             }
                         }
                     }
@@ -182,7 +183,7 @@ private string ProcessErrors(string content)
         {
             if (content.StartsWith("{\"errors\":"))
             {
-                var errors = JsonConvert.DeserializeObject<TwitterErrors>(content);
+                var errors = JsonSerializer.Deserialize<TwitterErrors>(content);
 
                 throw new TwitterException { Errors = errors };
             }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestExtensions.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestExtensions.cs
index 71a29f45145..7d48701f2ea 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestExtensions.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequestExtensions.cs
@@ -2,16 +2,8 @@
 // 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.IO;
-using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterParser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterParser.cs
index 1fc118c2c1e..3404467d836 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterParser.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -28,12 +28,12 @@ IEnumerable<T> Toolkit.Parsers.IParser<T>.Parse(string data)
 
             try
             {
-                return JsonConvert.DeserializeObject<List<T>>(data);
+                return JsonSerializer.Deserialize<List<T>>(data);
             }
-            catch (JsonSerializationException)
+            catch (JsonException)
             {
                 List<T> items = new List<T>();
-                items.Add(JsonConvert.DeserializeObject<T>(data));
+                items.Add(JsonSerializer.Deserialize<T>(data));
                 return items;
             }
         }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlace.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlace.cs
index 516e74aa80a..0b5f451130b 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlace.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlace.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,49 +14,49 @@ public class TwitterPlace
         /// <summary>
         /// Gets or sets the ID of the place
         /// </summary>
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the URL of additional place metadata
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
 
         /// <summary>
         /// Gets or sets the place type.
         /// </summary>
-        [JsonProperty("place_type")]
+        [JsonPropertyName("place_type")]
         public string PlaceType { get; set; }
 
         /// <summary>
         /// Gets or sets the place name.
         /// </summary>
-        [JsonProperty("name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the full, human-readable place name.
         /// </summary>
-        [JsonProperty("full_name")]
+        [JsonPropertyName("full_name")]
         public string FullName { get; set; }
 
         /// <summary>
         /// Gets or sets the shortened country code (e.g. US) for the place.
         /// </summary>
-        [JsonProperty("country_code")]
+        [JsonPropertyName("country_code")]
         public string CountryCode { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the country for the place.
         /// </summary>
-        [JsonProperty("country")]
+        [JsonPropertyName("country")]
         public string Country { get; set; }
 
         /// <summary>
         ///  Gets or sets the bounding box coordinates of a location.
         /// </summary>
-        [JsonProperty("bounding_box")]
+        [JsonPropertyName("bounding_box")]
         public TwitterPlaceBoundingBox BoundingBox { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
index 9e20940bf28..fb39af14c3b 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPlaceBoundingBox.cs
@@ -3,8 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Globalization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -16,13 +15,13 @@ public class TwitterPlaceBoundingBox
         /// <summary>
         /// Gets or sets the bounding box coordinates of the tweet's geolocation data.
         /// </summary>
-        [JsonProperty("coordinates")]
+        [JsonPropertyName("coordinates")]
         public List<List<float[]>> Coordinates { get; set; }
 
         /// <summary>
         /// Gets or sets the coordinate type. Polygon for a bounding box, Point for an exact coordinate.
         /// </summary>
-        [JsonProperty("type")]
+        [JsonPropertyName("type")]
         public string Type { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPoll.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPoll.cs
index a632d269e38..24f65ee1cbe 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPoll.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPoll.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Globalization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -16,19 +16,19 @@ public class TwitterPoll
         /// <summary>
         /// Gets or sets poll questions.
         /// </summary>
-        [JsonProperty("options")]
+        [JsonPropertyName("options")]
         public TwitterPollOptions[] Options { get; set; }
 
         /// <summary>
         /// Gets or sets end timestamp as a string.
         /// </summary>
-        [JsonProperty("end_datetime")]
+        [JsonPropertyName("end_datetime")]
         public string EndDateTime { get; set; }
 
         /// <summary>
         /// Gets or sets duration of the poll in minutes.
         /// </summary>
-        [JsonProperty("duration_minutes")]
+        [JsonPropertyName("duration_minutes")]
         public string DurationMinutes { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPollOptions.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPollOptions.cs
index e7d27ab8a8b..af44d214905 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterPollOptions.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterPollOptions.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,13 +14,13 @@ public class TwitterPollOptions
         /// <summary>
         /// Gets or sets int value of the poll position.
         /// </summary>
-        [JsonProperty("position")]
+        [JsonPropertyName("position")]
         public int Position { get; set; }
 
         /// <summary>
         /// Gets or sets text of the poll question.
         /// </summary>
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterSearchParser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterSearchParser.cs
index 7a91992539d..263cddbdf46 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterSearchParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterSearchParser.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -25,7 +25,7 @@ public IEnumerable<Tweet> Parse(string data)
                 return null;
             }
 
-            var result = JsonConvert.DeserializeObject<TwitterSearchResult>(data);
+            var result = JsonSerializer.Deserialize<TwitterSearchResult>(data);
 
             return result.Statuses.ToList();
         }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamDeletedEvent.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamDeletedEvent.cs
index a0f0c3db63a..fa52090e83d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamDeletedEvent.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamDeletedEvent.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -15,14 +15,14 @@ public class TwitterStreamDeletedEvent : ITwitterResult
         /// Gets or sets the user id of the event. This is always the user who initiated the event.
         /// </summary>
         /// <value>The user Id.</value>
-        [JsonProperty(PropertyName = "user_id_str")]
+        [JsonPropertyName("user_id_str")]
         public string UserId { get; set; }
 
         /// <summary>
         /// Gets or sets the id of the event. This is the tweet that was affected.
         /// </summary>
         /// <value>The tweet Id.</value>
-        [JsonProperty(PropertyName = "id_str")]
+        [JsonPropertyName("id_str")]
         public string Id { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEvent.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEvent.cs
index d27be43828a..8bd3b68b2bc 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEvent.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterStreamEvent.cs
@@ -4,8 +4,7 @@
 
 using System;
 using System.Globalization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -18,8 +17,8 @@ public class TwitterStreamEvent : ITwitterResult
         /// Gets or sets the type of the event.
         /// </summary>
         /// <value>The type of the event.</value>
-        [JsonProperty(PropertyName = "event")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonPropertyName("event")]
+        [JsonConverter(typeof(JsonStringEnumConverter))]
         public TwitterStreamEventType EventType { get; set; }
 
         /// <summary>
@@ -44,7 +43,7 @@ public class TwitterStreamEvent : ITwitterResult
         /// Gets or sets the creation date.
         /// </summary>
         /// <value>The creation date.</value>
-        [JsonProperty(PropertyName = "created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterSymbol.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterSymbol.cs
index 9473ba97fc6..dcac308e6b1 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterSymbol.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterSymbol.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,13 +14,13 @@ public class TwitterSymbol
         /// <summary>
         /// Gets or sets indices of hashtag location in tweet string.
         /// </summary>
-        [JsonProperty("indices")]
+        [JsonPropertyName("indices")]
         public int[] Indices { get; set; }
 
         /// <summary>
         /// Gets or sets hashtag text, excluding #.
         /// </summary>
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrl.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrl.cs
index dae1bd7b778..ebadd1348bc 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrl.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrl.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,31 +14,31 @@ public class TwitterUrl
         /// <summary>
         /// Gets or sets DisplayUrl of the Url.
         /// </summary>
-        [JsonProperty("display_url")]
+        [JsonPropertyName("display_url")]
         public string DisplayUrl { get; set; }
 
         /// <summary>
         /// Gets or sets ExpandedUrl of the Url.
         /// </summary>
-        [JsonProperty("expanded_url")]
+        [JsonPropertyName("expanded_url")]
         public string ExpandedUrl { get; set; }
 
         /// <summary>
         /// Gets or sets indices position of the tweet.
         /// </summary>
-        [JsonProperty("indices")]
+        [JsonPropertyName("indices")]
         public int[] Indices { get; set; }
 
         /// <summary>
         /// Gets or sets unwound Url metadata position of the tweet.
         /// </summary>
-        [JsonProperty("unwound")]
+        [JsonPropertyName("unwound")]
         public TwitterUrlUnwound Unwound { get; set; }
 
         /// <summary>
         /// Gets or sets t.co Url of the tweet.
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
index 095e0aec6a5..2f202320621 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUrlUnwound.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,25 +14,25 @@ public class TwitterUrlUnwound
         /// <summary>
         /// Gets or sets fully unwound url.
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
 
         /// <summary>
         /// Gets or sets status of unwind; if anything but 200 the data's bad.
         /// </summary>
-        [JsonProperty("status")]
+        [JsonPropertyName("status")]
         public int Status { get; set; }
 
         /// <summary>
         /// Gets or sets HTML title for url.
         /// </summary>
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title { get; set; }
 
         /// <summary>
         /// Gets or sets description of link.
         /// </summary>
-        [JsonProperty("description")]
+        [JsonPropertyName("description")]
         public string Description { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
index b3484b95663..94219faa81a 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUser.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,194 +14,194 @@ public class TwitterUser
         /// <summary>
         /// Gets or sets user Id.
         /// </summary>
-        [JsonProperty("id_str")]
+        [JsonPropertyName("id_str")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets user name.
         /// </summary>
-        [JsonProperty("name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets user screen name.
         /// </summary>
-        [JsonProperty("screen_name")]
+        [JsonPropertyName("screen_name")]
         public string ScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets profile location.
         /// </summary>
-        [JsonProperty("location")]
+        [JsonPropertyName("location")]
         public string Location { get; set; }
 
         /// <summary>
         /// Gets or sets profile url.
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
 
         /// <summary>
         /// Gets or sets profile description.
         /// </summary>
-        [JsonProperty("description")]
+        [JsonPropertyName("description")]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether protected status of user.
         /// </summary>
-        [JsonProperty("protected")]
+        [JsonPropertyName("protected")]
         public bool Protected { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether account is verified (blue checkmark).
         /// </summary>
-        [JsonProperty("verified")]
+        [JsonPropertyName("verified")]
         public bool Verified { get; set; }
 
         /// <summary>
         /// Gets or sets followers count.
         /// </summary>
-        [JsonProperty("followers_count")]
+        [JsonPropertyName("followers_count")]
         public int FollowersCount { get; set; }
 
         /// <summary>
         /// Gets or sets count of accounts user is following.
         /// </summary>
-        [JsonProperty("friends_count")]
+        [JsonPropertyName("friends_count")]
         public int FriendsCount { get; set; }
 
         /// <summary>
         /// Gets or sets count of public lists user is a member of.
         /// </summary>
-        [JsonProperty("listed_count")]
+        [JsonPropertyName("listed_count")]
         public int ListedCount { get; set; }
 
         /// <summary>
         /// Gets or sets total count of tweets user has liked.
         /// </summary>
-        [JsonProperty("favourites_count")]
+        [JsonPropertyName("favourites_count")]
         public int FavoritesCount { get; set; }
 
         /// <summary>
         /// Gets or sets total count of tweets (including retweets) posted by user.
         /// </summary>
-        [JsonProperty("statuses_count")]
+        [JsonPropertyName("statuses_count")]
         public int StatusesCount { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether geotagging is enabled.
         /// This determines whether or not to geotag the user's posts.
         /// </summary>
-        [JsonProperty("geo_enabled")]
+        [JsonPropertyName("geo_enabled")]
         public bool GeoEnabled { get; set; }
 
         /// <summary>
         /// Gets or sets BCP 47 language code according to user's account settings.
         /// </summary>
-        [JsonProperty("lang")]
+        [JsonPropertyName("lang")]
         public string Lang { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether contributor mode is enabled.
         /// </summary>
-        [JsonProperty("contributors_enabled")]
+        [JsonPropertyName("contributors_enabled")]
         public bool ContributorsEnabled { get; set; }
 
         /// <summary>
         /// Gets or sets profile background color (web hex value).
         /// </summary>
-        [JsonProperty("profile_background_color")]
+        [JsonPropertyName("profile_background_color")]
         public string ProfileBackgroundColor { get; set; }
 
         /// <summary>
         /// Gets or sets profile background image url.
         /// </summary>
-        [JsonProperty("profile_background_image_url")]
+        [JsonPropertyName("profile_background_image_url")]
         public string ProfileBackgroundImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets profile background image url using https.
         /// </summary>
-        [JsonProperty("profile_background_image_url_https")]
+        [JsonPropertyName("profile_background_image_url_https")]
         public string ProfileBackgroundImageUrlHttps { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether profile background image is tiled.
         /// </summary>
-        [JsonProperty("profile_background_tile")]
+        [JsonPropertyName("profile_background_tile")]
         public bool ProfileBackgroundTile { get; set; }
 
         /// <summary>
         /// Gets or sets profile banner url.
         /// </summary>
-        [JsonProperty("profile_banner_url")]
+        [JsonPropertyName("profile_banner_url")]
         public string ProfileBannerUrl { get; set; }
 
         /// <summary>
         /// Gets or sets profile image url.
         /// </summary>
-        [JsonProperty("profile_image_url")]
+        [JsonPropertyName("profile_image_url")]
         public string ProfileImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets profile image url using https.
         /// </summary>
-        [JsonProperty("profile_image_url_https")]
+        [JsonPropertyName("profile_image_url_https")]
         public string ProfileImageUrlHttps { get; set; }
 
         /// <summary>
         /// Gets or sets profile link color (web hex value).
         /// </summary>
-        [JsonProperty("profile_link_color")]
+        [JsonPropertyName("profile_link_color")]
         public string ProfileLinkColor { get; set; }
 
         /// <summary>
         /// Gets or sets profile sidebar border color (web hex value).
         /// </summary>
-        [JsonProperty("profile_sidebar_border_color")]
+        [JsonPropertyName("profile_sidebar_border_color")]
         public string ProfileSidebarBorderColor { get; set; }
 
         /// <summary>
         /// Gets or sets profile sidebar fill color (web hex value).
         /// </summary>
-        [JsonProperty("profile_sidebar_fill_color")]
+        [JsonPropertyName("profile_sidebar_fill_color")]
         public string ProfileSidebarFillColor { get; set; }
 
         /// <summary>
         /// Gets or sets profile text color (web hex value).
         /// </summary>
-        [JsonProperty("profile_text_color")]
+        [JsonPropertyName("profile_text_color")]
         public string ProfileTextColor { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the user has selected to use their uploaded background image in their profile.
         /// </summary>
-        [JsonProperty("profile_use_background_image")]
+        [JsonPropertyName("profile_use_background_image")]
         public bool ProfileUseBackgroundImage { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not user is using the default profile theme and background.
         /// </summary>
-        [JsonProperty("default_profile")]
+        [JsonPropertyName("default_profile")]
         public bool DefaultProfile { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not the user is using the default profile image.
         /// </summary>
-        [JsonProperty("default_profile_image")]
+        [JsonPropertyName("default_profile_image")]
         public bool DefaultProfileImage { get; set; }
 
         /// <summary>
         /// Gets or sets "withheld in" countries.
         /// </summary>
-        [JsonProperty("withheld_in_countries")]
+        [JsonPropertyName("withheld_in_countries")]
         public string[] WithheldInCountries { get; set; }
 
         /// <summary>
         /// Gets or sets withheld scope (status or profile).
         /// </summary>
-        [JsonProperty("withheld_scope")]
+        [JsonPropertyName("withheld_scope")]
         public string WithheldScope { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserMention.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserMention.cs
index c8797dd9caa..aa7b6ac861a 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserMention.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserMention.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -14,7 +14,7 @@ public class TwitterUserMention : TwitterUser
         /// <summary>
         /// Gets or sets the start and end position of the user mention
         /// </summary>
-        [JsonProperty("indices")]
+        [JsonPropertyName("indices")]
         public int[] Indices { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
index e0148295af9..f1d5560184d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterUserStreamParser.cs
@@ -2,8 +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 Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Twitter
 {
@@ -24,55 +23,47 @@ public ITwitterResult Parse(string data)
                 return null;
             }
 
-            var obj = (JObject)JsonConvert.DeserializeObject(data);
+            var obj = JsonDocument.Parse(data);
 
-            var friends = obj.SelectToken("friends", false);
-            if (friends != null && friends.HasValues)
+            if (obj.RootElement.TryGetProperty("friends", out var friends) && friends.GetArrayLength() > 0)
             {
                 return null;
             }
 
-            var delete = obj.SelectToken("delete", false);
-            if (delete != null)
+            if (obj.RootElement.TryGetProperty("delete", out var delete))
             {
-                var deletedStatus = delete.SelectToken("status", false);
-                if (deletedStatus != null && deletedStatus.HasValues)
+                if (delete.TryGetProperty("status", out var deletedStatus) && deletedStatus.GetArrayLength() > 0)
                 {
-                    return JsonConvert.DeserializeObject<TwitterStreamDeletedEvent>(deletedStatus.ToString());
+                    return JsonSerializer.Deserialize<TwitterStreamDeletedEvent>(deletedStatus.ToString());
                 }
 
-                var deletedDirectMessage = delete.SelectToken("direct_message", false);
-                if (deletedDirectMessage != null && deletedDirectMessage.HasValues)
+                if (delete.TryGetProperty("direct_message", out var deletedDirectMessage) && deletedDirectMessage.GetArrayLength() > 0)
                 {
-                    return JsonConvert.DeserializeObject<TwitterStreamDeletedEvent>(deletedDirectMessage.ToString());
+                    return JsonSerializer.Deserialize<TwitterStreamDeletedEvent>(deletedDirectMessage.ToString());
                 }
             }
 
-            var events = obj.SelectToken("event", false);
-            if (events != null)
+            if (obj.RootElement.TryGetProperty("event", out var events))
             {
-                var targetobject = obj.SelectToken("target_object", false);
                 Tweet endtargetobject = null;
-                if (targetobject?.SelectToken("user", false) != null)
+                if (obj.RootElement.TryGetProperty("target_object", out var targetobject) && targetobject.TryGetProperty("user", out _))
                 {
-                    endtargetobject = JsonConvert.DeserializeObject<Tweet>(targetobject.ToString());
+                    endtargetobject = JsonSerializer.Deserialize<Tweet>(targetobject.ToString());
                 }
 
-                var endevent = JsonConvert.DeserializeObject<TwitterStreamEvent>(obj.ToString());
+                var endevent = JsonSerializer.Deserialize<TwitterStreamEvent>(obj.ToString());
                 endevent.TargetObject = endtargetobject;
                 return endevent;
             }
 
-            var user = obj.SelectToken("user", false);
-            if (user != null && user.HasValues)
+            if (obj.RootElement.TryGetProperty("user", out var user) && user.GetArrayLength() > 0)
             {
-                return JsonConvert.DeserializeObject<Tweet>(obj.ToString());
+                return JsonSerializer.Deserialize<Tweet>(obj.ToString());
             }
 
-            var directMessage = obj.SelectToken("direct_message", false);
-            if (directMessage != null && directMessage.HasValues)
+            if (obj.RootElement.TryGetProperty("direct_message", out var directMessage) && directMessage.GetArrayLength() > 0)
             {
-                return JsonConvert.DeserializeObject<TwitterDirectMessage>(directMessage.ToString());
+                return JsonSerializer.Deserialize<TwitterDirectMessage>(directMessage.ToString());
             }
 
             return null;
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
index 3dd6d59a8ac..101ca54c73e 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
@@ -8,12 +8,11 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Parsers;
 using Microsoft.Toolkit.Services.Core;
 using Microsoft.Toolkit.Services.OAuth;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 #if WINRT
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -235,15 +234,15 @@ private async Task<bool> ExchangeRequestTokenForAccessTokenAsync(string webAuthR
                 data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             }
 
-            JObject jObject = JObject.Parse(data);
+            var jObject = JsonDocument.Parse(data);
 
-            string accessToken = jObject["access_token"].ToObject<string>();
+            string accessToken = jObject.RootElement.GetProperty("access_token").GetString();
             if (string.IsNullOrEmpty(accessToken))
             {
                 throw new NullReferenceException("The accessToken is null.");
             }
 
-            long uid = jObject["uid"].ToObject<long>();
+            long uid = jObject.RootElement.GetProperty("uid").GetInt64();
 
             Uid = uid;
             _tokens.AccessToken = accessToken;
@@ -276,7 +275,7 @@ public async Task<WeiboUser> GetUserAsync(string screenName = null)
 
                 WeiboOAuthRequest request = new WeiboOAuthRequest();
                 rawResult = await request.ExecuteGetAsync(uri, _tokens);
-                return JsonConvert.DeserializeObject<WeiboUser>(rawResult);
+                return JsonSerializer.Deserialize<WeiboUser>(rawResult);
             }
             catch (UserNotFoundException)
             {
@@ -286,7 +285,7 @@ public async Task<WeiboUser> GetUserAsync(string screenName = null)
             {
                 if (!string.IsNullOrEmpty(rawResult))
                 {
-                    var error = JsonConvert.DeserializeObject<WeiboError>(rawResult);
+                    var error = JsonSerializer.Deserialize<WeiboError>(rawResult);
 
                     throw new WeiboException { Error = error };
                 }
@@ -327,7 +326,7 @@ public async Task<IEnumerable<TSchema>> GetUserTimeLineAsync<TSchema>(string scr
             {
                 if (!string.IsNullOrEmpty(rawResult))
                 {
-                    var errors = JsonConvert.DeserializeObject<WeiboError>(rawResult);
+                    var errors = JsonSerializer.Deserialize<WeiboError>(rawResult);
 
                     throw new WeiboException { Error = errors };
                 }
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboError.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboError.cs
index 8c078b8db10..0a426bc9cb1 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboError.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboError.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -14,13 +14,13 @@ public class WeiboError
         /// <summary>
         /// Gets or sets error code
         /// </summary>
-        [JsonProperty("error_code")]
+        [JsonPropertyName("error_code")]
         public int Code { get; set; }
 
         /// <summary>
         /// Gets or sets error message
         /// </summary>
-        [JsonProperty("error")]
+        [JsonPropertyName("error")]
         public string Message { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboGeoInfo.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboGeoInfo.cs
index e247a2f9da6..d7a19d136ec 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboGeoInfo.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboGeoInfo.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Services.Weibo
 {
@@ -14,13 +14,13 @@ public class WeiboGeoInfo
         /// <summary>
         /// Gets the type of geographic information
         /// </summary>
-        [JsonProperty("type")]
+        [JsonPropertyName("type")]
         public string Type { get; internal set; }
 
         /// <summary>
         /// Gets the coordinates
         /// </summary>
-        [JsonProperty("coordinates")]
+        [JsonPropertyName("coordinates")]
         public double[] Coordinates { get; internal set; }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboImage.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboImage.cs
index d8c33c241e2..dcb56e4b04e 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboImage.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboImage.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -14,19 +14,19 @@ public class WeiboImage
         /// <summary>
         /// Gets or sets the url of the attached image in thumbnail size.
         /// </summary>
-        [JsonProperty("thumbnail_pic")]
+        [JsonPropertyName("thumbnail_pic")]
         public string ThumbnailImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the url of the attached image in medium size.
         /// </summary>
-        [JsonProperty("bmiddle_pic")]
+        [JsonPropertyName("bmiddle_pic")]
         public string MediumImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the url of the attached image in original size.
         /// </summary>
-        [JsonProperty("original_pic")]
+        [JsonPropertyName("original_pic")]
         public string OriginalImageUrl { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
index 45ce1d25575..011c9d8bc44 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
@@ -7,9 +7,9 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Services.OAuth;
-using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -97,7 +97,10 @@ public async Task<WeiboStatus> ExecutePostAsync(Uri requestUri, WeiboOAuthTokens
                     {
                         if (response.StatusCode == HttpStatusCode.OK)
                         {
-                            return JsonConvert.DeserializeObject<WeiboStatus>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
+                            using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                            {
+                                return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
+                            }
                         }
                         else
                         {
@@ -153,7 +156,10 @@ public async Task<WeiboStatus> ExecutePostMultipartAsync(Uri requestUri, WeiboOA
                                 {
                                     if (response.StatusCode == HttpStatusCode.OK)
                                     {
-                                        return JsonConvert.DeserializeObject<WeiboStatus>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
+                                        using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                                        {
+                                            return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
+                                        }
                                     }
                                     else
                                     {
@@ -180,10 +186,15 @@ private string ProcessError(string content)
         {
             if (content.StartsWith("{\"error\":"))
             {
-                WeiboError error = JsonConvert.DeserializeObject<WeiboError>(content, new JsonSerializerSettings()
+                WeiboError error;
+                try
                 {
-                    Error = (sender, args) => throw new JsonException("Invalid Weibo error response!", args.ErrorContext.Error)
-                });
+                    error = JsonSerializer.Deserialize<WeiboError>(content);
+                }
+                catch (JsonException e)
+                {
+                    throw new JsonException("Invalid Weibo error response!", e);
+                }
 
                 throw new WeiboException { Error = error };
             }
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequestExtensions.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequestExtensions.cs
index 7f7cbb31d76..0a49a6bd2a2 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequestExtensions.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequestExtensions.cs
@@ -2,16 +2,8 @@
 // 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.IO;
-using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboParser.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboParser.cs
index cb3d998308d..7691ea269ad 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboParser.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -28,12 +28,12 @@ IEnumerable<T> Toolkit.Parsers.IParser<T>.Parse(string data)
 
             try
             {
-                return JsonConvert.DeserializeObject<List<T>>(data);
+                return JsonSerializer.Deserialize<List<T>>(data);
             }
-            catch (JsonSerializationException)
+            catch (JsonException)
             {
                 List<T> items = new List<T>();
-                items.Add(JsonConvert.DeserializeObject<T>(data));
+                items.Add(JsonSerializer.Deserialize<T>(data));
                 return items;
             }
         }
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatus.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatus.cs
index a3c26c3de9e..7e8c06a8f7f 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatus.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatus.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Globalization;
+using System.Text.Json.Serialization;
 using Microsoft.Toolkit.Services.Services.Weibo;
-using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -17,7 +17,7 @@ public class WeiboStatus : Toolkit.Parsers.SchemaBase
         /// <summary>
         /// Gets or sets time item was created.
         /// </summary>
-        [JsonProperty("created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
         /// <summary>
@@ -40,13 +40,13 @@ public DateTime CreationDate
         /// <summary>
         /// Gets or sets item Id.
         /// </summary>
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets text of the status (handles both 140 and 280 characters)
         /// </summary>
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
 
         /// <summary>
@@ -54,85 +54,85 @@ public DateTime CreationDate
         /// (true when Weibo status is longer than 140 characters)
         /// This entity may be deprecated - it never seems to be set to true.
         /// </summary>
-        [JsonProperty("truncated")]
+        [JsonPropertyName("truncated")]
         public bool IsTruncated { get; set; }
 
         /// <summary>
         /// Gets or sets status source (client or website used)
         /// </summary>
-        [JsonProperty("source")]
+        [JsonPropertyName("source")]
         public string Source { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_screen_name
         /// </summary>
-        [JsonProperty("in_reply_to_screen_name")]
+        [JsonPropertyName("in_reply_to_screen_name")]
         public string InReplyToScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_status_id
         /// </summary>
-        [JsonProperty("in_reply_to_status_id")]
+        [JsonPropertyName("in_reply_to_status_id")]
         public string InReplyToStatusId { get; set; }
 
         /// <summary>
         /// Gets or sets in_reply_to_user_id
         /// </summary>
-        [JsonProperty("in_reply_to_user_id")]
+        [JsonPropertyName("in_reply_to_user_id")]
         public string InReplyToUserId { get; set; }
 
         /// <summary>
         /// Gets or sets user who posted the status.
         /// </summary>
-        [JsonProperty("user")]
+        [JsonPropertyName("user")]
         public WeiboUser User { get; set; }
 
         /// <summary>
         /// Gets or sets the Reposted Weibo status
         /// </summary>
-        [JsonProperty("retweeted_status")]
+        [JsonPropertyName("retweeted_status")]
         public WeiboStatus RepostedStatus { get; set; }
 
         /// <summary>
         /// Gets or sets the repost count
         /// </summary>
-        [JsonProperty("reposts_count")]
+        [JsonPropertyName("reposts_count")]
         public int RepostCount { get; set; }
 
         /// <summary>
         /// Gets or sets the comment count
         /// </summary>
-        [JsonProperty("comments_count")]
+        [JsonPropertyName("comments_count")]
         public int CommentCount { get; set; }
 
         /// <summary>
         /// Gets or sets the url of the attached image in thumbnail size.
         /// </summary>
-        [JsonProperty("thumbnail_pic")]
+        [JsonPropertyName("thumbnail_pic")]
         public string ThumbnailImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the url of the attached image in medium size.
         /// </summary>
-        [JsonProperty("bmiddle_pic")]
+        [JsonPropertyName("bmiddle_pic")]
         public string MediumImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the url of the attached image in original size.
         /// </summary>
-        [JsonProperty("original_pic")]
+        [JsonPropertyName("original_pic")]
         public string OriginalImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets attached images array of the weibo.
         /// </summary>
-        [JsonProperty("pic_urls")]
+        [JsonPropertyName("pic_urls")]
         public WeiboImage[] AttachedImages { get; set; }
 
         /// <summary>
         /// Gets or sets the geographic information.
         /// </summary>
-        [JsonProperty("geo")]
+        [JsonPropertyName("geo")]
         public WeiboGeoInfo GeographicInfo { get; set; }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatusParser.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatusParser.cs
index 09f0ae084f9..cdeac82859a 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatusParser.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboStatusParser.cs
@@ -2,14 +2,8 @@
 // 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 Microsoft.Toolkit.Services.Weibo;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -30,14 +24,14 @@ public IEnumerable<WeiboStatus> Parse(string data)
                 return null;
             }
 
-            JObject rawObject = JObject.Parse(data);
+            var rawObject = JsonDocument.Parse(data);
 
-            IList<JToken> rawStatuses = rawObject["statuses"].Children().ToList();
+            var rawStatuses = rawObject.RootElement.GetProperty("statuses");
 
             IList<WeiboStatus> statuses = new List<WeiboStatus>();
-            foreach (JToken result in rawStatuses)
+            foreach (var rawStatus in rawStatuses.EnumerateArray())
             {
-                WeiboStatus searchResult = result.ToObject<WeiboStatus>();
+                WeiboStatus searchResult = JsonSerializer.Deserialize<WeiboStatus>(rawStatus.ToString());
                 statuses.Add(searchResult);
             }
 
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
index 82e55fdeae1..242ca0058e7 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboUser.cs
@@ -2,7 +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 Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.Weibo
 {
@@ -14,79 +14,79 @@ public class WeiboUser
         /// <summary>
         /// Gets or sets user Id.
         /// </summary>
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets user  name.
         /// </summary>
-        [JsonProperty("name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets user screen name.
         /// </summary>
-        [JsonProperty("screen_name")]
+        [JsonPropertyName("screen_name")]
         public string ScreenName { get; set; }
 
         /// <summary>
         /// Gets or sets profile location.
         /// </summary>
-        [JsonProperty("location")]
+        [JsonPropertyName("location")]
         public string Location { get; set; }
 
         /// <summary>
         /// Gets or sets profile url.
         /// </summary>
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
 
         /// <summary>
         /// Gets or sets profile description.
         /// </summary>
-        [JsonProperty("description")]
+        [JsonPropertyName("description")]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets profile image url.
         /// </summary>
-        [JsonProperty("profile_image_url")]
+        [JsonPropertyName("profile_image_url")]
         public string ProfileImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets high resolution profile image url.
         /// </summary>
-        [JsonProperty("avatar_large")]
+        [JsonPropertyName("avatar_large")]
         public string HighResolutionProfileImageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets followers count.
         /// </summary>
-        [JsonProperty("followers_count")]
+        [JsonPropertyName("followers_count")]
         public int FollowersCount { get; set; }
 
         /// <summary>
         /// Gets or sets count of accounts user is following.
         /// </summary>
-        [JsonProperty("friends_count")]
+        [JsonPropertyName("friends_count")]
         public int FriendsCount { get; set; }
 
         /// <summary>
         /// Gets or sets total count of statuses user has liked.
         /// </summary>
-        [JsonProperty("favourites_count")]
+        [JsonPropertyName("favourites_count")]
         public int FavoritesCount { get; set; }
 
         /// <summary>
         /// Gets or sets total count of Weibo statuses (including reposted statuses) posted by user.
         /// </summary>
-        [JsonProperty("statuses_count")]
+        [JsonPropertyName("statuses_count")]
         public int StatusesCount { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether account is verified (blue checkmark).
         /// </summary>
-        [JsonProperty("verified")]
+        [JsonPropertyName("verified")]
         public bool Verified { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj b/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
index e2726cf8cc5..8cacd579958 100644
--- a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
+++ b/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
@@ -53,11 +53,6 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="Pack">
     <!-- No-op to avoid build error when packing solution from commandline -->
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/GitHub.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/GitHub.cs
index d1322f0595d..9a8996727ea 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/GitHub.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/GitHub.cs
@@ -5,8 +5,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Windows.Web.Http;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.Data
@@ -31,7 +31,7 @@ public static async Task<List<GitHubRelease>> GetPublishedReleases()
 
                         var uri = $"{_root}/repos/{_repoOwner}/{_repoName}/releases";
                         var result = await client.GetStringAsync(new Uri(uri));
-                        _releases = JsonConvert.DeserializeObject<List<GitHubRelease>>(result).Take(5).ToList();
+                        _releases = JsonSerializer.Deserialize<List<GitHubRelease>>(result).Take(5).ToList();
                     }
                 }
                 catch (Exception)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/PhotosDataSource.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/PhotosDataSource.cs
index 90eceab697e..a3350c0eca4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/PhotosDataSource.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/PhotosDataSource.cs
@@ -7,8 +7,8 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml.Data;
@@ -88,7 +88,7 @@ private static async Task<IEnumerable<PhotoDataItem>> GetPhotosAsync(bool online
 
         private static IEnumerable<PhotoDataItem> Parse(string jsonData)
         {
-            return JsonConvert.DeserializeObject<IList<PhotoDataItem>>(jsonData);
+            return JsonSerializer.Deserialize<IList<PhotoDataItem>>(jsonData);
         }
 
         private static void CheckCacheState(bool online)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 6426c03d171..b872d4720f9 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -124,8 +124,8 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.1</Version>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
+    <PackageReference Include="System.Text.Json">
+      <Version>4.7.2</Version>
     </PackageReference>
     <PackageReference Include="NotificationsVisualizerLibrary">
       <Version>1.0.5</Version>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
index e96bac72291..a016bccc80d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
@@ -3,30 +3,30 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
 {
     public class GitHubRelease
     {
-        [JsonProperty("published_at")]
+        [JsonPropertyName("published_at")]
         public DateTime Published { get; set; }
 
-        [JsonProperty("body")]
+        [JsonPropertyName("body")]
         public string Body { get; set; }
 
-        [JsonProperty("tag_name")]
+        [JsonPropertyName("tag_name")]
         public string Tag { get; set; }
 
-        [JsonProperty("name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
         public string FullName => $"Version {Name.Replace("v", string.Empty)} notes";
 
-        [JsonProperty("draft")]
+        [JsonPropertyName("draft")]
         public bool IsDraft { get; set; }
 
-        [JsonProperty("html_url")]
+        [JsonPropertyName("html_url")]
         public string Url { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLink.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLink.cs
index c87d92569ba..05090247425 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLink.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLink.cs
@@ -2,16 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
 {
     public class LandingPageLink
     {
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title { get; set; }
 
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLinks.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLinks.cs
index c8fa3afd73f..79297e977ec 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLinks.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageLinks.cs
@@ -2,19 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
 {
     public class LandingPageLinks
     {
-        [JsonProperty("new-section-title")]
+        [JsonPropertyName("new-section-title")]
         public string NewSectionTitle { get; set; }
 
-        [JsonProperty("new-samples")]
+        [JsonPropertyName("new-samples")]
         public string[] NewSamples { get; set; }
 
-        [JsonProperty("resources")]
+        [JsonPropertyName("resources")]
         public LandingPageResource[] Resources { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageResource.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageResource.cs
index 177044e23c3..64fddf52a8b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageResource.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/LandingPageResource.cs
@@ -2,19 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
 {
     public class LandingPageResource
     {
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title { get; set; }
 
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public string ID { get; set; }
 
-        [JsonProperty("links")]
+        [JsonPropertyName("links")]
         public LandingPageLink[] Links { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index d9aeb0c36ba..d8fef271b2c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -12,6 +12,8 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Graph.Converters;
@@ -22,7 +24,7 @@
 using Microsoft.Toolkit.Uwp.UI.Animations;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Media;
-using Newtonsoft.Json;
+using Microsoft.UI.Xaml;
 using Windows.Foundation.Metadata;
 using Windows.Storage;
 using Windows.Storage.Streams;
@@ -747,7 +749,7 @@ private static async Task<string> GetDocsSHA()
                         {
                             var raw = await response.Content.ReadAsStringAsync();
                             Debug.WriteLine(raw);
-                            var json = JsonConvert.DeserializeObject<GitRef>(raw);
+                            var json = JsonSerializer.Deserialize<GitRef>(raw);
                             return json?.RefObject?.Sha;
                         }
                     }
@@ -762,13 +764,13 @@ private static async Task<string> GetDocsSHA()
 
         public class GitRef
         {
-            [JsonProperty("object")]
+            [JsonPropertyName("object")]
             public GitRefObject RefObject { get; set; }
         }
 
         public class GitRefObject
         {
-            [JsonProperty("sha")]
+            [JsonPropertyName("sha")]
             public string Sha { get; set; }
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
index 45700de0b3a..901bea050e8 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
@@ -4,11 +4,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Helpers;
-using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
 {
@@ -56,8 +57,10 @@ public static async Task<List<SampleCategory>> GetCategoriesAsync()
                 List<SampleCategory> allCategories;
                 using (var jsonStream = await StreamHelper.GetPackagedFileStreamAsync("SamplePages/samples.json"))
                 {
-                    var jsonString = await jsonStream.ReadTextAsync();
-                    allCategories = JsonConvert.DeserializeObject<List<SampleCategory>>(jsonString);
+                    allCategories = await JsonSerializer.DeserializeAsync<List<SampleCategory>>(jsonStream.AsStream(), new JsonSerializerOptions
+                    {
+                        ReadCommentHandling = JsonCommentHandling.Skip
+                    });
                 }
 
                 // Check API
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml.cs
index a36dd63aa1d..2040485db8b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml.cs
@@ -5,12 +5,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Animations;
-using Newtonsoft.Json;
 using Windows.ApplicationModel;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -202,8 +204,7 @@ private async Task UpdateSections()
             {
                 using (var jsonStream = await StreamHelper.GetPackagedFileStreamAsync("landingPageLinks.json"))
                 {
-                    var jsonString = await jsonStream.ReadTextAsync();
-                    var links = JsonConvert.DeserializeObject<LandingPageLinks>(jsonString);
+                    var links = await JsonSerializer.DeserializeAsync<LandingPageLinks>(jsonStream.AsStream());
                     var packageVersion = Package.Current.Id.Version;
 
                     var resource = links.Resources.FirstOrDefault(item => item.ID == "app");
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
index c3313a47588..e85542823fc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
@@ -3,11 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.UI;
+using Microsoft.Toolkit.Uwp.SampleApp.Enums;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
-using Microsoft.Toolkit.Uwp.SampleApp.Enums;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
index cb35082fd6f..79326c89497 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Windows.Input;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs
index 024053f55fb..c957626067e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs
@@ -2,9 +2,9 @@
 // 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.Text.Json;
+using System.Text.Json.Serialization;
 using Microsoft.Toolkit.Parsers.Markdown;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
@@ -35,7 +35,13 @@ private void UpdateMDResult()
             var document = new MarkdownDocument();
             document.Parse(RawMarkdown.Text);
 
-            var json = JsonConvert.SerializeObject(document, Formatting.Indented, new StringEnumConverter());
+            var jsonSerializerOptions = new JsonSerializerOptions
+            {
+                WriteIndented = true
+            };
+            jsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+
+            var json = JsonSerializer.Serialize(document, typeof(MarkdownDocument), jsonSerializerOptions);
             MarkdownResult.Text = json;
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Translator Service/MicrosoftTranslatorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Translator Service/MicrosoftTranslatorPage.xaml.cs
index a6b1d4d492d..d6bedd74ad4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Translator Service/MicrosoftTranslatorPage.xaml.cs	
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Translator Service/MicrosoftTranslatorPage.xaml.cs	
@@ -47,13 +47,18 @@ private async void GetLanguages_OnClick(object sender, RoutedEventArgs e)
 
             Languages.ItemsSource = null;
 
-            _translatorClient.SubscriptionKey = TranslatorServiceKey.Text;
-            var languages = await _translatorClient.GetLanguageNamesAsync("en");
-
-            Languages.ItemsSource = languages;
-            Languages.SelectedIndex = 0;
+            try
+            {
+                _translatorClient.SubscriptionKey = TranslatorServiceKey.Text;
+                var languages = await _translatorClient.GetLanguageNamesAsync("en");
 
-            SampleController.Current.DisplayWaitRing = false;
+                Languages.ItemsSource = languages;
+                Languages.SelectedIndex = 0;
+            }
+            finally
+            {
+                SampleController.Current.DisplayWaitRing = false;
+            }
         }
 
         private async void Translate_OnClick(object sender, RoutedEventArgs e)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json b/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
index 611ac435f58..da4679187e2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
@@ -84,10 +84,6 @@
           "title": "Version",
           "url": "http://aka.ms/uwptoolkit"
         },
-        {
-          "title": "Newtonsoft Json (Dependency)",
-          "url": "http://www.newtonsoft.com/json"
-        },
         {
           "title": "ColorCode-Universal (Dependency)",
           "url": "https://github.com/WilliamABradley/ColorCode-Universal"
diff --git a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
index b8407c5f573..1478526a750 100644
--- a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
+++ b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
@@ -10,9 +10,6 @@
   <ItemGroup>
     <PackageReference Include="winsdkfb" Version="0.12.20161020.4" />
 
-    <!-- This is here to prevent a conflict in certain circumstances -->
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml b/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
index 154280e96c9..db9172549d9 100644
--- a/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
+++ b/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
   <Library Name="Microsoft.Toolkit.Uwp.Services">
+    <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
   </Library>
 </Directives>
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
index a53679b9a4a..62a9d27413a 100644
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
+++ b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
@@ -4,9 +4,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Windows.Foundation.Collections;
 using winsdkfb;
 using winsdkfb.Graph;
@@ -58,7 +58,7 @@ public FacebookRequestSource(FacebookDataConfig config, string fields, string li
 
             _propertySet = new PropertySet { { "fields", _fields }, { "limit", _limit } };
 
-            _factory = new FBJsonClassFactory(s => JsonConvert.DeserializeObject(s, typeof(T)));
+            _factory = new FBJsonClassFactory(s => JsonSerializer.Deserialize(s, typeof(T)));
 
             // FBPaginatedArray does not allow us to set page size per request so we must go with first supplied - see https://github.com/Microsoft/winsdkfb/issues/221
             _paginatedArray = new FBPaginatedArray(_config.Query, _propertySet, _factory);
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
index 20ba5566eef..b9ec2c6a4b7 100644
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
+++ b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
@@ -6,8 +6,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.Foundation.Metadata;
@@ -275,7 +275,10 @@ public async Task<FacebookPicture> GetUserPictureInfoAsync()
         {
             if (Provider.LoggedIn)
             {
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookDataHost<FacebookPicture>>);
+                var factory = new FBJsonClassFactory((s) =>
+                {
+                    return JsonSerializer.Deserialize<FacebookDataHost<FacebookPicture>>(s);
+                });
 
                 PropertySet propertySet = new PropertySet { { "redirect", "0" } };
                 var singleValue = new FBSingleValue("/me/picture", propertySet, factory);
@@ -368,7 +371,10 @@ public async Task<FacebookPhoto> GetPhotoByPhotoIdAsync(string photoId)
         {
             if (Provider.LoggedIn)
             {
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPhoto>);
+                var factory = new FBJsonClassFactory((s) =>
+                {
+                    return JsonSerializer.Deserialize<FacebookPhoto>(s);
+                });
 
                 PropertySet propertySet = new PropertySet { { "fields", "images" } };
                 var singleValue = new FBSingleValue($"/{photoId}", propertySet, factory);
@@ -405,7 +411,10 @@ public async Task<bool> PostToFeedAsync(string link)
                 var parameters = new PropertySet { { "link", link } };
 
                 string path = FBSession.ActiveSession.User.Id + "/feed";
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPost>);
+                var factory = new FBJsonClassFactory((s) =>
+                {
+                    return JsonSerializer.Deserialize<FacebookPost>(s);
+                });
 
                 var singleValue = new FBSingleValue(path, parameters, factory);
                 var result = await singleValue.PostAsync();
@@ -487,7 +496,10 @@ public async Task<string> PostPictureToFeedAsync(string title, string pictureNam
                 };
 
                 string path = FBSession.ActiveSession.User.Id + "/photos";
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPicture>);
+                var factory = new FBJsonClassFactory((s) =>
+                {
+                    return JsonSerializer.Deserialize<FacebookPicture>(s);
+                });
 
                 var singleValue = new FBSingleValue(path, parameters, factory);
                 var result = await singleValue.PostAsync();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
index 18f75ee78d6..da628f5e6ef 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
@@ -5,11 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.UI.Composition;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using Windows.Foundation;
 using Windows.Graphics;
 using Windows.Storage;
@@ -79,9 +78,10 @@ internal void ClearAll(Rect viewPort)
         internal string GetSerializedList()
         {
             var exportModel = new InkCanvasExportModel { DrawableList = _drawableList, Version = 1 };
-            return JsonConvert.SerializeObject(exportModel, Formatting.Indented, new JsonSerializerSettings
+            return JsonSerializer.Serialize(exportModel, new JsonSerializerOptions
             {
-                TypeNameHandling = TypeNameHandling.Auto
+                // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
+                WriteIndented = true,
             });
         }
 
@@ -92,16 +92,22 @@ internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
             _undoCommands.Clear();
             _redoCommands.Clear();
 
-            var token = JToken.Parse(json);
+            var token = JsonDocument.Parse(json);
             List<IDrawable> newList;
-            if (token is JArray)
+            if (token.RootElement.ValueKind == JsonValueKind.Array)
             {
                 // first sin, because of creating a file without versioning so we have to be able to import without breaking changes.
-                newList = JsonConvert.DeserializeObject<List<IDrawable>>(json, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
+                newList = JsonSerializer.Deserialize<List<IDrawable>>(json, new JsonSerializerOptions
+                {
+                    // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
+                });
             }
             else
             {
-                newList = JsonConvert.DeserializeObject<InkCanvasExportModel>(json, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto }).DrawableList;
+                newList = JsonSerializer.Deserialize<InkCanvasExportModel>(json, new JsonSerializerOptions
+                {
+                    // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
+                }).DrawableList;
             }
 
             foreach (var drawable in newList)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
index 3a3bc724076..e739e3591bf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
@@ -6,8 +6,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using Microsoft.Graphics.Canvas;
-using Newtonsoft.Json;
 using Windows.Foundation;
 using Windows.UI.Input.Inking;
 using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
index dcd0255cb8a..da5a62f68e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.Serialization;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 using Windows.UI.Input.Inking;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Windows.Toolkit.UI.Controls.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
similarity index 68%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Windows.Toolkit.UI.Controls.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
index 69e67475b53..890b5155e78 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Windows.Toolkit.UI.Controls.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
   <Library Name="Microsoft.Toolkit.Uwp.UI.Controls">
+    <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
   </Library>
 </Directives>
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/JsonObjectSerializer.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/JsonObjectSerializer.cs
index 8ce982ddfc0..3f1d52f6fbd 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/JsonObjectSerializer.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/JsonObjectSerializer.cs
@@ -2,14 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Uwp.Helpers
 {
     internal class JsonObjectSerializer : IObjectSerializer
     {
-        public string Serialize<T>(T value) => JsonConvert.SerializeObject(value);
+        public string Serialize<T>(T value) => JsonSerializer.Serialize(value);
 
-        public T Deserialize<T>(string value) => JsonConvert.DeserializeObject<T>(value);
+        public T Deserialize<T>(string value) => JsonSerializer.Deserialize<T>(value);
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
index 2a6a6fd40d3..445fb25bbf1 100644
--- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
+++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+
+    <PackageReference Include="System.Text.Json" Version="4.7.2" />
     
     <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
 
diff --git a/Microsoft.Toolkit.Uwp/Properties/Microsoft.Toolkit.Uwp.rd.xml b/Microsoft.Toolkit.Uwp/Properties/Microsoft.Toolkit.Uwp.rd.xml
new file mode 100644
index 00000000000..c852cb37baa
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp/Properties/Microsoft.Toolkit.Uwp.rd.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="Microsoft.Toolkit.Uwp">
+    <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
+  </Library>
+</Directives>
diff --git a/Microsoft.Toolkit.Uwp/Properties/Microsoft.Windows.Toolkit.rd.xml b/Microsoft.Toolkit.Uwp/Properties/Microsoft.Windows.Toolkit.rd.xml
deleted file mode 100644
index 2f2bb20c525..00000000000
--- a/Microsoft.Toolkit.Uwp/Properties/Microsoft.Windows.Toolkit.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    http://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Microsoft.Toolkit.Uwp">
-
-  	<!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs
index 71e459be102..0099a77ff49 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_StorageHelper.cs
@@ -4,8 +4,8 @@
 
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
 using System;
+using System.Text.Json;
 using UnitTests.UI;
 
 namespace UnitTests.Helpers
@@ -24,7 +24,7 @@ public void Test_StorageHelper_LegacyIntTest()
             int input = 42;
 
             // simulate previous version by generating json and manually inserting it as string
-            string jsonInput = JsonConvert.SerializeObject(input);
+            string jsonInput = JsonSerializer.Serialize(input);
 
             storageHelper.Save<string>(key, jsonInput);
 
@@ -43,7 +43,7 @@ public void Test_StorageHelper_LegacyDateTest()
             DateTime input = new DateTime(2017, 12, 25);
 
             // simulate previous version by generating json and manually inserting it as string
-            string jsonInput = JsonConvert.SerializeObject(input);
+            string jsonInput = JsonSerializer.Serialize(input);
 
             storageHelper.Save<string>(key, jsonInput);
 
@@ -62,7 +62,7 @@ public void Test_StorageHelper_LegacyPersonTest()
             Person input = new Person() { Name = "Joe Bloggs", Age = 42 };
 
             // simulate previous version by generating json and manually inserting it as string
-            string jsonInput = JsonConvert.SerializeObject(input);
+            string jsonInput = JsonSerializer.Serialize(input);
 
             storageHelper.Save<string>(key, jsonInput);
 
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 0b40d7f34d8..c4b252d01f0 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -125,6 +125,9 @@
     <PackageReference Include="System.Xml.XPath.XmlDocument">
       <Version>4.3.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>4.7.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\Test_AdaptiveHeightValueConverter.cs" />

From 580eda54ca88389ae9240467af37726143775cd0 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 7 Aug 2020 15:45:04 +0200
Subject: [PATCH 358/595] Improved a comment, fixed a typo

---
 .../Enumerables/SpanEnumerable{T}.cs                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
index 3648a5e5140..23cbffac668 100644
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
@@ -78,12 +78,12 @@ public readonly Item Current
                 ref T r0 = ref MemoryMarshal.GetReference(this.span);
                 ref T ri = ref Unsafe.Add(ref r0, this.index);
 
-                // On .NET Standard 2.1 we can save 4 bytes by piggybacking
-                // the current index in the length of the wrapped span.
-                // We're going to use the first item as the target reference,
-                // and the length as a host for the current original offset.
-                // This is not possible on .NET Standard 2.1 as we lack
-                // the API to create spans from arbitrary references.
+                // On .NET Standard 2.1 and .NET Core (or on any target that offers runtime
+                // support for the Span<T> types), we can save 4 bytes by piggybacking the
+                // current index in the length of the wrapped span. We're going to use the
+                // first item as the target reference, and the length as a host for the
+                // current original offset. This is not possible on eg. .NET Standard 2.0,
+                // as we lack the API to create Span<T>-s from arbitrary references.
                 return new Item(ref ri, this.index);
 #else
                 return new Item(this.span, this.index);

From a081b30fcc3c32e03bed48911368098f93454d33 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 8 Aug 2020 01:49:11 +0200
Subject: [PATCH 359/595] Added missing volatile field modifier

---
 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index facc027ae6e..7546d684da8 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -51,7 +51,7 @@ public sealed class Ioc : IServiceProvider
         /// <summary>
         /// The <see cref="ServiceProvider"/> instance to use, if initialized.
         /// </summary>
-        private ServiceProvider? serviceProvider;
+        private volatile ServiceProvider? serviceProvider;
 
         /// <inheritdoc/>
         object? IServiceProvider.GetService(Type serviceType)

From 48b1f543355c370222e40d0a545626d7dc07e9d2 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 7 Aug 2020 17:25:01 -0700
Subject: [PATCH 360/595] Updated InfiniteCanvas to use new .Net
 JsonSerializer.

---
 ...initeCanvasVirtualDrawingSurface.Render.cs |  28 ++---
 .../InfiniteCanvas/Drawables/IDrawable.cs     |   7 ++
 .../InfiniteCanvas/Drawables/InkDrawable.cs   |  35 ++++--
 .../InfiniteCanvas/Drawables/TextDrawable.cs  |  42 ++++++++
 .../JsonConverters/IDrawableConverter.cs      | 100 ++++++++++++++++++
 .../JsonConverters/Matrix3x2Converter.cs      |  76 +++++++++++++
 .../JsonConverters/SerializableStroke.cs      |  18 ++--
 .../SerializableStrokeConverter.cs            |  31 ++++++
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   1 +
 9 files changed, 307 insertions(+), 31 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
index da628f5e6ef..9f7d238a1f7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
@@ -78,11 +78,21 @@ internal void ClearAll(Rect viewPort)
         internal string GetSerializedList()
         {
             var exportModel = new InkCanvasExportModel { DrawableList = _drawableList, Version = 1 };
-            return JsonSerializer.Serialize(exportModel, new JsonSerializerOptions
+            return JsonSerializer.Serialize(exportModel, GetJsonSerializerOptions());
+        }
+
+        private JsonSerializerOptions GetJsonSerializerOptions()
+        {
+            var jsonSerializerOptions = new JsonSerializerOptions
             {
-                // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
-                WriteIndented = true,
-            });
+                WriteIndented = true
+            };
+
+            // This will be needed until These two issues are fixed:
+            // https://github.com/dotnet/runtime/issues/30083
+            // https://github.com/dotnet/runtime/issues/29937
+            jsonSerializerOptions.Converters.Add(new IDrawableConverter());
+            return jsonSerializerOptions;
         }
 
         internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
@@ -97,17 +107,11 @@ internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
             if (token.RootElement.ValueKind == JsonValueKind.Array)
             {
                 // first sin, because of creating a file without versioning so we have to be able to import without breaking changes.
-                newList = JsonSerializer.Deserialize<List<IDrawable>>(json, new JsonSerializerOptions
-                {
-                    // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
-                });
+                newList = JsonSerializer.Deserialize<List<IDrawable>>(json, GetJsonSerializerOptions());
             }
             else
             {
-                newList = JsonSerializer.Deserialize<InkCanvasExportModel>(json, new JsonSerializerOptions
-                {
-                    // TODO: Is this supported? -> TypeNameHandling = TypeNameHandling.Auto
-                }).DrawableList;
+                newList = JsonSerializer.Deserialize<InkCanvasExportModel>(json, GetJsonSerializerOptions()).DrawableList;
             }
 
             foreach (var drawable in newList)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs
index ed9cc2756ea..a20aa9ec18c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.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.Text.Json;
 using Microsoft.Graphics.Canvas;
 using Windows.Foundation;
 
@@ -13,6 +14,12 @@ internal interface IDrawable
 
         bool IsVisible(Rect viewPort);
 
+        void WriteJson(Utf8JsonWriter writer);
+
+        void ReadProperty(string propertyName, ref Utf8JsonReader reader);
+
+        void OnDeserialized();
+
         bool IsActive { get; set; }
 
         Rect Bounds { get; set; }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
index e739e3591bf..3dac970475e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Graphics.Canvas;
 using Windows.Foundation;
@@ -19,6 +19,9 @@ internal class InkDrawable : IDrawable
         [JsonIgnore]
         public IReadOnlyList<InkStroke> Strokes { get; set; }
 
+        [JsonPropertyName("$type")]
+        public string Type => IDrawableConverter.GetDiscriminator(GetType());
+
         public List<SerializableStroke> SerializableStrokeList { get; set; }
 
         public Rect Bounds { get; set; }
@@ -27,6 +30,10 @@ internal class InkDrawable : IDrawable
 
         internal static readonly InkStrokeBuilder StrokeBuilder = new InkStrokeBuilder();
 
+        public InkDrawable()
+        {
+        }
+
         public InkDrawable(IReadOnlyList<InkStroke> strokes)
         {
             if (strokes == null || !strokes.Any())
@@ -83,8 +90,7 @@ private static InkPoint MapPointToToSessionBounds(InkPoint point, Rect sessionBo
             return new InkPoint(new Point(point.Position.X - sessionBounds.X, point.Position.Y - sessionBounds.Y), point.Pressure, point.TiltX, point.TiltY, point.Timestamp);
         }
 
-        [OnSerializing]
-        internal void OnSerializingMethod(StreamingContext context)
+        public void WriteJson(Utf8JsonWriter writer)
         {
             SerializableStrokeList = new List<SerializableStroke>(Strokes.Count);
             foreach (var stroke in Strokes)
@@ -103,10 +109,15 @@ internal void OnSerializingMethod(StreamingContext context)
                 serializableStroke.PointTransform = stroke.PointTransform;
                 SerializableStrokeList.Add(serializableStroke);
             }
+
+            var options = new JsonSerializerOptions();
+            options.Converters.Add(new SerializableStrokeConverter());
+            JsonSerializer.Serialize(writer, this, options);
+
+            SerializableStrokeList = null;
         }
 
-        [OnDeserialized]
-        internal void OnDeserializedMethod(StreamingContext context)
+        public void OnDeserialized()
         {
             var finalStrokeList = new List<InkStroke>(SerializableStrokeList.Count);
 
@@ -121,10 +132,18 @@ internal void OnDeserializedMethod(StreamingContext context)
             SerializableStrokeList = null;
         }
 
-        [OnSerialized]
-        internal void OnSerializedMethod(StreamingContext context)
+        public void ReadProperty(string propertyName, ref Utf8JsonReader reader)
         {
-            SerializableStrokeList = null;
+            switch (propertyName)
+            {
+                case "SerializableStrokeList":
+                    var options = new JsonSerializerOptions();
+                    options.Converters.Add(new SerializableStrokeConverter());
+                    SerializableStrokeList = JsonSerializer.Deserialize<List<SerializableStroke>>(ref reader, options);
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
index fbb2450e2ee..24dbbf4fee3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
@@ -2,6 +2,8 @@
 // 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.Text.Json;
+using System.Text.Json.Serialization;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Text;
 using Windows.Foundation;
@@ -13,6 +15,9 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class TextDrawable : IDrawable
     {
+        [JsonPropertyName("$type")]
+        public string Type => IDrawableConverter.GetDiscriminator(GetType());
+
         public string Text { get; set; }
 
         public Rect Bounds { get; set; }
@@ -27,6 +32,10 @@ internal class TextDrawable : IDrawable
 
         public bool IsItalic { get; set; }
 
+        public TextDrawable()
+        {
+        }
+
         public TextDrawable(double left, double top, double width, double height, float fontSize, string text, Color textColor, bool isBold, bool isItalic)
         {
             Bounds = new Rect(left, top, width, height);
@@ -76,5 +85,38 @@ public float HorizontalMarginBasedOnFont
                 return ((100 - FontSize) / 10) + 5;
             }
         }
+
+        public void WriteJson(Utf8JsonWriter writer)
+        {
+            JsonSerializer.Serialize(writer, this);
+        }
+
+        public void OnDeserialized()
+        {
+        }
+
+        public void ReadProperty(string propertyName, ref Utf8JsonReader reader)
+        {
+            switch (propertyName)
+            {
+                case "Text":
+                    Text = reader.GetString();
+                    break;
+                case "FontSize":
+                    FontSize = reader.GetSingle();
+                    break;
+                case "TextColor":
+                    TextColor = JsonSerializer.Deserialize<Color>(ref reader);
+                    break;
+                case "IsBold":
+                    IsBold = reader.GetBoolean();
+                    break;
+                case "IsItalic":
+                    IsItalic = reader.GetBoolean();
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
new file mode 100644
index 00000000000..911f3fb6c77
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
@@ -0,0 +1,100 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+using Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    internal class IDrawableConverter : JsonConverter<IDrawable>
+    {
+        public IDrawableConverter()
+        {
+        }
+
+        public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert);
+
+        public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType != JsonTokenType.StartObject)
+            {
+                throw new JsonException();
+            }
+
+            reader.Read();
+            if (reader.TokenType != JsonTokenType.PropertyName)
+            {
+                throw new JsonException();
+            }
+
+            string propertyName = reader.GetString();
+            if (propertyName != "$type")
+            {
+                throw new JsonException();
+            }
+
+            reader.Read();
+            if (reader.TokenType != JsonTokenType.String)
+            {
+                throw new JsonException();
+            }
+
+            var typeDiscriminator = reader.GetString();
+            IDrawable drawable;
+            if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)))
+            {
+                drawable = new InkDrawable();
+            }
+            else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)))
+            {
+                drawable = new TextDrawable();
+            }
+            else
+            {
+                throw new JsonException();
+            }
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.EndObject)
+                {
+                    drawable.OnDeserialized();
+                    return drawable;
+                }
+
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    propertyName = reader.GetString();
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "IsActive":
+                            drawable.IsActive = reader.GetBoolean();
+                            break;
+                        case "Bounds":
+                            drawable.Bounds = JsonSerializer.Deserialize<Rect>(ref reader);
+                            break;
+                        default:
+                            drawable.ReadProperty(propertyName, ref reader);
+                            break;
+                    }
+                }
+            }
+
+            throw new JsonException();
+        }
+
+        public override void Write(Utf8JsonWriter writer, IDrawable drawable, JsonSerializerOptions options)
+        {
+            drawable.WriteJson(writer);
+        }
+
+        internal static string GetDiscriminator(Type type)
+        {
+            return $"{type.FullName}, {type.Assembly.GetName().Name}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
new file mode 100644
index 00000000000..c74e26889bb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
@@ -0,0 +1,76 @@
+// 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.Numerics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    internal class Matrix3x2Converter : JsonConverter<Matrix3x2>
+    {
+        public override Matrix3x2 Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType != JsonTokenType.StartObject)
+            {
+                throw new JsonException();
+            }
+
+            string propertyName;
+            Matrix3x2 matrix = default;
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.EndObject)
+                {
+                    return matrix;
+                }
+
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    propertyName = reader.GetString();
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "M11":
+                            matrix.M11 = reader.GetSingle();
+                            break;
+                        case "M12":
+                            matrix.M12 = reader.GetSingle();
+                            break;
+                        case "M21":
+                            matrix.M21 = reader.GetSingle();
+                            break;
+                        case "M22":
+                            matrix.M22 = reader.GetSingle();
+                            break;
+                        case "M31":
+                            matrix.M31 = reader.GetSingle();
+                            break;
+                        case "M32":
+                            matrix.M32 = reader.GetSingle();
+                            break;
+                    }
+                }
+            }
+
+            throw new JsonException();
+        }
+
+        public override void Write(Utf8JsonWriter writer, Matrix3x2 value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+
+            writer.WriteNumber("M11", value.M11);
+            writer.WriteNumber("M12", value.M12);
+            writer.WriteNumber("M21", value.M21);
+            writer.WriteNumber("M22", value.M22);
+            writer.WriteNumber("M31", value.M31);
+            writer.WriteNumber("M32", value.M32);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
index da5a62f68e6..e6869730c39 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 using System.Numerics;
-using System.Runtime.Serialization;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Windows.UI.Input.Inking;
 
@@ -29,8 +29,7 @@ internal class SerializableStroke
 
         public Matrix3x2 PointTransform { get; set; }
 
-        [OnSerializing]
-        internal void OnSerializingMethod(StreamingContext context)
+        internal void Write(Utf8JsonWriter writer, JsonSerializerOptions options)
         {
             SerializableFinalPointList = new List<SerializablePoint>(FinalPointList.Count);
             foreach (var point in FinalPointList)
@@ -60,10 +59,13 @@ internal void OnSerializingMethod(StreamingContext context)
                     DrawAsHighlighter = DrawingAttributesIgnored.DrawAsHighlighter
                 };
             }
+
+            JsonSerializer.Serialize(writer, this, options);
+
+            SerializableFinalPointList = null;
         }
 
-        [OnDeserialized]
-        internal void OnDeserializedMethod(StreamingContext context)
+        internal void OnDeserialized()
         {
             var finalPointList = new List<InkPoint>(SerializableFinalPointList.Count);
 
@@ -108,11 +110,5 @@ internal void OnDeserializedMethod(StreamingContext context)
             SerializableFinalPointList = null;
             SerializableDrawingAttributesKind = null;
         }
-
-        [OnSerialized]
-        internal void OnSerializedMethod(StreamingContext context)
-        {
-            SerializableFinalPointList = null;
-        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs
new file mode 100644
index 00000000000..186c7390c3b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs
@@ -0,0 +1,31 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    internal class SerializableStrokeConverter : JsonConverter<SerializableStroke>
+    {
+        public override SerializableStroke Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var matrixOptions = new JsonSerializerOptions();
+            matrixOptions.Converters.Add(new Matrix3x2Converter());
+            SerializableStroke serializableStroke = JsonSerializer.Deserialize<SerializableStroke>(ref reader, matrixOptions);
+
+            serializableStroke.OnDeserialized();
+
+            return serializableStroke;
+        }
+
+        public override void Write(Utf8JsonWriter writer, SerializableStroke value, JsonSerializerOptions options)
+        {
+            var matrixOptions = new JsonSerializerOptions();
+            matrixOptions.Converters.Add(new Matrix3x2Converter());
+            value.Write(writer, matrixOptions);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 0785dd2fd3d..676f3004803 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -43,6 +43,7 @@
     <PackageTags>UWP Toolkit Windows Controls XAML Range WrapPanel Adaptive Markdown BladeView Blade CameraPreview Camera Carousel DockPanel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader StaggeredPanel Staggered Tile Tokenizing TextBox UniformGrid Uniform Grid</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 1360f91b6b73496ed23d3c1b89b9ae4378e37b4f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 8 Aug 2020 17:26:30 +0200
Subject: [PATCH 361/595] Minor optimization to the MessengerExtensions type

---
 .../Messaging/MessengerExtensions.cs          | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index ea07f57ac85..a344b76a4f3 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -17,9 +17,37 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     public static partial class MessengerExtensions
     {
         /// <summary>
-        /// The <see cref="MethodInfo"/> instance associated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
+        /// A class that acts as a container to load the <see cref="MethodInfo"/> instance linked to
+        /// the <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/> method.
+        /// This class is needed to avoid forcing the initialization code in the static constructor to run as soon as
+        /// the <see cref="MessengerExtensions"/> type is referenced, even if that is done just to use methods
+        /// that do not actually require this <see cref="MethodInfo"/> instance to be available.
+        /// We're effectively using this type to leverage the lazy loading of static constructors done by the runtime.
         /// </summary>
-        private static readonly MethodInfo RegisterIRecipientMethodInfo;
+        private static class MethodInfos
+        {
+            /// <summary>
+            /// Initializes static members of the <see cref="MethodInfos"/> class.
+            /// </summary>
+            static MethodInfos()
+            {
+                RegisterIRecipient = (
+                    from methodInfo in typeof(MessengerExtensions).GetMethods()
+                    where methodInfo.Name == nameof(Register) &&
+                          methodInfo.IsGenericMethod &&
+                          methodInfo.GetGenericArguments().Length == 2
+                    let parameters = methodInfo.GetParameters()
+                    where parameters.Length == 3 &&
+                          parameters[1].ParameterType.IsGenericType &&
+                          parameters[1].ParameterType.GetGenericTypeDefinition() == typeof(IRecipient<>)
+                    select methodInfo).First();
+            }
+
+            /// <summary>
+            /// The <see cref="MethodInfo"/> instance associated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
+            /// </summary>
+            public static readonly MethodInfo RegisterIRecipient;
+        }
 
         /// <summary>
         /// A class that acts as a static container to associate a <see cref="ConditionalWeakTable{TKey,TValue}"/> instance to each
@@ -39,23 +67,6 @@ public static readonly ConditionalWeakTable<Type, Action<IMessenger, object, TTo
                 = new ConditionalWeakTable<Type, Action<IMessenger, object, TToken>[]>();
         }
 
-        /// <summary>
-        /// Initializes static members of the <see cref="MessengerExtensions"/> class.
-        /// </summary>
-        static MessengerExtensions()
-        {
-            RegisterIRecipientMethodInfo = (
-                from methodInfo in typeof(MessengerExtensions).GetMethods()
-                where methodInfo.Name == nameof(Register) &&
-                      methodInfo.IsGenericMethod &&
-                      methodInfo.GetGenericArguments().Length == 2
-                let parameters = methodInfo.GetParameters()
-                where parameters.Length == 3 &&
-                      parameters[1].ParameterType.IsGenericType &&
-                      parameters[1].ParameterType.GetGenericTypeDefinition() == typeof(IRecipient<>)
-                select methodInfo).First();
-        }
-
         /// <summary>
         /// Checks whether or not a given recipient has already been registered for a message.
         /// </summary>
@@ -110,7 +121,7 @@ from interfaceType in type.GetInterfaces()
                     where interfaceType.IsGenericType &&
                           interfaceType.GetGenericTypeDefinition() == typeof(IRecipient<>)
                     let messageType = interfaceType.GenericTypeArguments[0]
-                    let registrationMethod = RegisterIRecipientMethodInfo.MakeGenericMethod(messageType, typeof(TToken))
+                    let registrationMethod = MethodInfos.RegisterIRecipient.MakeGenericMethod(messageType, typeof(TToken))
                     let registrationAction = GetRegistrationAction(type, registrationMethod)
                     select registrationAction).ToArray();
             }

From d0e0cfa4da2c9df0c7e4b8c2bf3f3a7948ccfa98 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 11 Aug 2020 18:38:13 +0200
Subject: [PATCH 362/595] Updated Microsoft.Toolkit.Mvvm .csproj info

---
 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index c76cef22f3e..12b2a288d8a 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -4,16 +4,16 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
-    <Title>Windows Community Toolkit Mvvm .NET Standard</Title>
+    <Title>Windows Community Toolkit MVVM .NET Standard</Title>
     <Description>
-      This package includes Mvvm .NET Standard code only helpers such as:
+      This package includes MVVM .NET Standard code only helpers such as:
       - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface.
       - ObservableRecipient: a base class for observable objects with support for the IMessenger service.
       - RelayCommand: a simple delegate command implementing the ICommand interface.
       - Messenger: a messaging system to exchange messages through different loosely-coupled objects.
       - Ioc: a helper class to configure dependency injection service containers.
     </Description>
-    <PackageTags>UWP Toolkit Windows Mvvm observable Ioc dependency injection services extensions helpers</PackageTags>
+    <PackageTags>UWP Toolkit Windows MVVM MVVMToolkit observable Ioc dependency injection services extensions helpers</PackageTags>
   </PropertyGroup>
 
   <!-- .NET Standard 2.0 doesn't have the Span<T> type -->

From 932450c03ae71191e3eec92798cd472df62e32c3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 11 Aug 2020 18:49:53 +0200
Subject: [PATCH 363/595] Improved package description

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 12b2a288d8a..1540806c5d7 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <Title>Windows Community Toolkit MVVM .NET Standard</Title>
     <Description>
-      This package includes MVVM .NET Standard code only helpers such as:
+      This package includes a .NET Standard MVVM library with helpers such as:
       - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface.
       - ObservableRecipient: a base class for observable objects with support for the IMessenger service.
       - RelayCommand: a simple delegate command implementing the ICommand interface.

From b5c02726c966b833939ff20a73b0aa32523debe5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 11 Aug 2020 18:55:29 +0200
Subject: [PATCH 364/595] Updated package title

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 1540806c5d7..25371e3abc3 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
-    <Title>Windows Community Toolkit MVVM .NET Standard</Title>
+    <Title>Windows Community Toolkit MVVM Toolkit</Title>
     <Description>
       This package includes a .NET Standard MVVM library with helpers such as:
       - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface.

From 759d09b5d8b329ffffe9ec107b5ac7274f11adaf Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 12 Aug 2020 13:36:40 +0200
Subject: [PATCH 365/595] Fixed a build error, minor refactoring

---
 .../ThrowHelper.Guard.Comparable.Generic.cs          | 12 ++++++++++++
 .../Diagnostics/Internals/ThrowHelper.Guard.cs       | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs
index 030ede72c30..11b06a99890 100644
--- a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.Comparable.Generic.cs
@@ -62,6 +62,18 @@ internal static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target,
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) must not be equal to {target.ToAssertString()}, was {value.ToAssertString()}");
         }
 
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsBitwiseEqualTo{T}"/> fails.
+        /// </summary>
+        /// <typeparam name="T">The type of input values being compared.</typeparam>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        [DoesNotReturn]
+        internal static void ThrowArgumentExceptionForBitwiseEqualTo<T>(T value, T target, string name)
+            where T : unmanaged
+        {
+            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsLessThan{T}"/> fails.
         /// </summary>
diff --git a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
index 0ba836dc488..fda9336b0fe 100644
--- a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
+++ b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.cs
@@ -152,18 +152,6 @@ internal static void ThrowArgumentExceptionForIsNotAssignableToType(object value
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}");
         }
 
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsBitwiseEqualTo{T}"/> fails.
-        /// </summary>
-        /// <typeparam name="T">The type of input values being compared.</typeparam>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForsBitwiseEqualTo<T>(T value, T target, string name)
-            where T : unmanaged
-        {
-            ThrowArgumentException(name, $"Parameter {name.ToAssertString()} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>");
-        }
-
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsReferenceEqualTo{T}"/> fails.
         /// </summary>

From c54bf01c172da3f22bda71d53cce446f81ccf398 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 12 Aug 2020 17:52:17 +0200
Subject: [PATCH 366/595] Enabled shared object[] pool for Messenger

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 9c27badd255..ef99fe971b3 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -222,7 +222,7 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
             where TToken : IEquatable<TToken>
         {
             bool lockTaken = false;
-            IDictionarySlim<Recipient, IDictionarySlim<TToken>>[]? maps = null;
+            object[]? maps = null;
             int i = 0;
 
             // We use an explicit try/finally block here instead of the lock syntax so that we can use a single
@@ -243,11 +243,16 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                     return;
                 }
 
-                // Copy the candidate mappings for the target recipient to a local
-                // array, as we can't modify the contents of the set while iterating it.
-                // The rented buffer is oversized and will also include mappings for
-                // handlers of messages that are registered through a different token.
-                maps = ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Rent(set!.Count);
+                // Copy the candidate mappings for the target recipient to a local array, as we can't modify the
+                // contents of the set while iterating it. The rented buffer is oversized and will also include
+                // mappings for handlers of messages that are registered through a different token. Note that
+                // we're using just an object array to minimize the number of total rented buffers, that would
+                // just remain in the shared pool unused, other than when they are rented here. Instead, we're
+                // using a type that would possibly also be used by the users of the library, which increases
+                // the opportunities to reuse existing buffers for both. When we need to reference an item
+                // stored in the buffer with the type we know it will have, we use Unsafe.As<T> to avoid the
+                // expensive type check in the cast, since we already know the assignment will be valid.
+                maps = ArrayPool<object>.Shared.Rent(set!.Count);
 
                 foreach (IMapping item in set)
                 {
@@ -265,8 +270,10 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                 // without having to know the concrete type in advance, and without having
                 // to deal with reflection: we can just check if the type of the closed interface
                 // matches with the token type currently in use, and operate on those instances.
-                foreach (IDictionarySlim<Recipient, IDictionarySlim<TToken>> map in maps.AsSpan(0, i))
+                foreach (object obj in maps.AsSpan(0, i))
                 {
+                    var map = Unsafe.As<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>(obj);
+
                     // We don't need whether or not the map contains the recipient, as the
                     // sequence of maps has already been copied from the set containing all
                     // the mappings for the target recipients: it is guaranteed to be here.
@@ -324,7 +331,7 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                 {
                     maps.AsSpan(0, i).Clear();
 
-                    ArrayPool<IDictionarySlim<Recipient, IDictionarySlim<TToken>>>.Shared.Return(maps);
+                    ArrayPool<object>.Shared.Return(maps);
                 }
             }
         }
@@ -382,7 +389,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            Action<TMessage>[] entries;
+            object[] entries;
             int i = 0;
 
             lock (this.recipientsMap)
@@ -398,7 +405,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // inside one of the currently existing handlers. We can use memory pooling
                 // to reuse arrays, to minimize the average memory usage. In practice,
                 // we usually just need to pay the small overhead of copying the items.
-                entries = ArrayPool<Action<TMessage>>.Shared.Rent(mapping!.TotalHandlersCount);
+                entries = ArrayPool<object>.Shared.Rent(mapping!.TotalHandlersCount);
 
                 // Copy the handlers to the local collection.
                 // Both types being enumerate expose a struct enumerator,
@@ -431,7 +438,9 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // Invoke all the necessary handlers on the local copy of entries
                 foreach (var entry in entries.AsSpan(0, i))
                 {
-                    entry(message);
+                    // We're doing an unsafe cast to skip the type checks again.
+                    // See the comments in the UnregisterALl method for more info.
+                    Unsafe.As<Action<TMessage>>(entry)(message);
                 }
             }
             finally
@@ -440,7 +449,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // lasting memory leaks due to leftover references being stored in the pool.
                 entries.AsSpan(0, i).Clear();
 
-                ArrayPool<Action<TMessage>>.Shared.Return(entries);
+                ArrayPool<object>.Shared.Return(entries);
             }
 
             return message;

From 72b6520a9cc32a485873638ac05230180d94e5ba Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 12 Aug 2020 17:59:17 +0200
Subject: [PATCH 367/595] Minor performance improvement

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs        | 12 +++++++++++-
 Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index ef99fe971b3..45a1031c4eb 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -6,6 +6,7 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.Collections.Extensions;
 
@@ -407,6 +408,8 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // we usually just need to pay the small overhead of copying the items.
                 entries = ArrayPool<object>.Shared.Rent(mapping!.TotalHandlersCount);
 
+                ref object entriesRef = ref MemoryMarshal.GetReference(entries.AsSpan());
+
                 // Copy the handlers to the local collection.
                 // Both types being enumerate expose a struct enumerator,
                 // so we're not actually allocating the enumerator here.
@@ -427,7 +430,14 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                         // Only select the ones with a matching token
                         if (pairsEnumerator.Key.Equals(token))
                         {
-                            entries[i++] = pairsEnumerator.Value;
+                            unsafe
+                            {
+                                // We spend quite a bit of time in this busy loop as we go through all
+                                // the existing mappings and registrations to find the handlers we're
+                                // interested in. We can save some time by skipping the bounds checks
+                                // when indexing the array (as the size is already verified anyway).
+                                Unsafe.Add(ref entriesRef, (IntPtr)(void*)(uint)i++) = pairsEnumerator.Value;
+                            }
                         }
                     }
                 }
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 25371e3abc3..05c24469bfe 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Title>Windows Community Toolkit MVVM Toolkit</Title>
     <Description>
       This package includes a .NET Standard MVVM library with helpers such as:

From 30452cf0bbf627f12825cf50bbd31b0e526b9abe Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Wed, 12 Aug 2020 14:47:17 -0700
Subject: [PATCH 368/595] Fix Notifications library for C++ apps (#3423)

* Remove System.ValueTuple

It was seemingly added for no reason with the ToastContentBuilder code: https://github.com/windows-toolkit/WindowsCommunityToolkit/commit/9c38f71016e4ff33558937f69ed07fc2669bdc23

Nothing there uses Tuple, so not sure why it was added...

* Revert "Remove System.ValueTuple"

This reverts commit 5ad4fa825e9ff3ef216492c9f8c8eb7a77b4bc66.

* Exclude ValueTuple from C++
---
 .../Microsoft.Toolkit.Uwp.Notifications.csproj                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index e62e7d57b1e..1c08ba0f600 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -52,7 +52,8 @@
     <None Include="Microsoft.Toolkit.Uwp.Notifications.targets" Pack="true" PackagePath="build\native" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!--Native (C++) doesn't need System.ValueTuple (plus it's incompatible with this package)-->
+  <ItemGroup Condition=" '$(TargetFramework)' != 'native' ">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   

From 6ecdc053a98f79f3471c4c15e4e938d1ab686426 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 13 Aug 2020 01:26:26 +0200
Subject: [PATCH 369/595] Fixed a typo and tweaked a comment

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 45a1031c4eb..4e5e780d4dc 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -432,10 +432,10 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                         {
                             unsafe
                             {
-                                // We spend quite a bit of time in this busy loop as we go through all
-                                // the existing mappings and registrations to find the handlers we're
-                                // interested in. We can save some time by skipping the bounds checks
-                                // when indexing the array (as the size is already verified anyway).
+                                // We spend quite a bit of time in these two busy loops as we go through all the
+                                // existing mappings and registrations to find the handlers we're interested in.
+                                // We can manually offset here to skip the bounds checks in this inner loop when
+                                // indexing the array (the size is already verified and guaranteed to be enough).
                                 Unsafe.Add(ref entriesRef, (IntPtr)(void*)(uint)i++) = pairsEnumerator.Value;
                             }
                         }
@@ -449,7 +449,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 foreach (var entry in entries.AsSpan(0, i))
                 {
                     // We're doing an unsafe cast to skip the type checks again.
-                    // See the comments in the UnregisterALl method for more info.
+                    // See the comments in the UnregisterAll method for more info.
                     Unsafe.As<Action<TMessage>>(entry)(message);
                 }
             }

From 910de59d76522b1022b5221b36132b08f26a3377 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 12 Aug 2020 19:53:00 -0700
Subject: [PATCH 370/595] Converted GazeInteraction project for C++ to C#.

---
 GazeInputTest/GazeInputTest.csproj            |   4 +-
 GazeInputTest/Properties/AssemblyInfo.cs      |  10 +-
 .../ComboBoxItemGazeTargetItem.cs             |  36 +
 .../DwellInvokedRoutedEventArgs.cs            |  24 +
 .../DwellInvokedRoutedEventArgs.h             |  28 -
 .../DwellProgressEventArgs.cs                 |  36 +
 .../DwellProgressEventArgs.h                  |  43 -
 .../DwellProgressState.cs                     |  32 +
 .../DwellProgressState.h                      |  34 -
 .../ExpandCollapsePatternGazeTargetItem.cs    |  35 +
 .../GazeCursor.cpp                            |  80 --
 .../GazeCursor.cs                             | 163 ++++
 .../GazeCursor.h                              |  89 --
 .../GazeElement.cs                            |  47 +
 .../GazeElement.h                             |  54 --
 .../GazeEventArgs.cpp                         |   5 -
 .../GazeEventArgs.cs                          |  37 +
 .../GazeEventArgs.h                           |  26 -
 .../GazeFeedbackPopupFactory.cpp              |  43 -
 .../GazeFeedbackPopupFactory.cs               |  49 +
 .../GazeFeedbackPopupFactory.h                |  24 -
 .../GazeFilterArgs.cs                         |  35 +
 .../GazeHidParsers.cpp                        | 152 ---
 .../GazeHidParsers.h                          |  74 --
 .../GazeHidParsers/GazeHidParsersHelpers.cs   |  34 +
 .../GazeHidParsers/GazeHidPosition.cs         |  27 +
 .../GazeHidParsers/GazeHidPositionParser.cs   |  78 ++
 .../GazeHidParsers/GazeHidPositions.cs        |  32 +
 .../GazeHidParsers/GazeHidPositionsParser.cs  |  48 +
 .../GazeHidParsers/GazeHidRotationParser.cs   |  78 ++
 .../GazeHidUsages.cs                          |  66 ++
 .../GazeHidUsages.h                           |  59 --
 .../GazeHistoryItem.cs                        |  17 +
 .../GazeHistoryItem.h                         |  19 -
 .../GazeInput.cpp                             | 187 ----
 .../GazeInput.cs                              | 432 +++++++++
 .../GazeInput.h                               | 251 -----
 .../GazePointer.cpp                           | 774 ---------------
 .../GazePointer.cs                            | 918 ++++++++++++++++++
 .../GazePointer.h                             | 243 -----
 .../GazePointerProxy.cpp                      | 139 ---
 .../GazePointerProxy.cs                       | 184 ++++
 .../GazePointerProxy.h                        |  82 --
 .../GazeSettingsHelper.cpp                    |  70 --
 .../GazeSettingsHelper.cs                     |  73 ++
 .../GazeSettingsHelper.h                      |  26 -
 .../GazeStats.cpp                             |  47 -
 .../GazeStats.cs                              | 105 ++
 .../GazeStats.h                               |  55 --
 .../GazeTargetItem.cpp                        | 304 ------
 .../GazeTargetItem.cs                         | 239 +++++
 .../GazeTargetItem.h                          | 103 --
 .../IGazeFilter.cs                            |  17 +
 .../IGazeFilter.h                             |  66 --
 .../Interaction.cs                            |  27 +
 .../Interaction.h                             |  30 -
 .../InvokePatternGazeTargetItem.cs            |  25 +
 .../LowpassFilter.cs                          |  37 +
 ....Toolkit.UWP.Input.GazeInteraction.targets |  13 -
 ....Toolkit.UWP.Input.GazeInteraction.vcxproj | 331 -------
 ...t.Toolkit.Uwp.Input.GazeInteraction.csproj |  12 +
 .../NonInvokeGazeTargetItem.cs                |  25 +
 .../NullFilter.cs                             |  22 +
 .../OneEuroFilter.cpp                         | 114 ---
 .../OneEuroFilter.cs                          | 134 +++
 .../OneEuroFilter.h                           |  65 --
 .../PivotItemGazeTargetItem.cs                |  37 +
 .../PointerState.cs                           |  46 +
 .../PointerState.h                            |  48 -
 .../SelectionItemPatternGazeTargetItem.cs     |  25 +
 .../StateChangedEventArgs.cs                  |  35 +
 .../StateChangedEventArgs.h                   |  42 -
 .../TogglePatternGazeTargetItem.cs            |  25 +
 .../pch.cpp                                   |   4 -
 .../pch.h                                     |  54 --
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   4 +-
 Windows Community Toolkit.sln                 | 236 +----
 ...t.Toolkit.Uwp.Input.GazeInteraction.nuspec |  43 -
 build/build.cake                              |  33 -
 79 files changed, 3322 insertions(+), 4078 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/ComboBoxItemGazeTargetItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/ExpandCollapsePatternGazeTargetItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFilterArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.cpp
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidParsersHelpers.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPosition.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionParser.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositions.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionsParser.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidRotationParser.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.h
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/InvokePatternGazeTargetItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/LowpassFilter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.targets
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/NonInvokeGazeTargetItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/NullFilter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cpp
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/PivotItemGazeTargetItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/SelectionItemPatternGazeTargetItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.h
 create mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/TogglePatternGazeTargetItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.cpp
 delete mode 100644 Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.h
 delete mode 100644 build/Microsoft.Toolkit.Uwp.Input.GazeInteraction.nuspec

diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
index 7735a9bb1a5..e7b88ec77ab 100644
--- a/GazeInputTest/GazeInputTest.csproj
+++ b/GazeInputTest/GazeInputTest.csproj
@@ -157,8 +157,8 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj">
-      <Project>{a5e98964-45b1-442d-a07a-298a3221d81e}</Project>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">
+      <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/GazeInputTest/Properties/AssemblyInfo.cs b/GazeInputTest/Properties/AssemblyInfo.cs
index 4d6a9b7872f..ac358b76a12 100644
--- a/GazeInputTest/Properties/AssemblyInfo.cs
+++ b/GazeInputTest/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("GazeInputTest")]
@@ -20,13 +20,13 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyVersion("1.0.0.0")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
+// [assembly: AssemblyVersion("1.0.0.0")]
+// [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ComboBoxItemGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ComboBoxItemGazeTargetItem.cs
new file mode 100644
index 00000000000..e9f1aa85931
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ComboBoxItemGazeTargetItem.cs
@@ -0,0 +1,36 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class ComboBoxItemGazeTargetItem : GazeTargetItem
+    {
+        internal ComboBoxItemGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(TargetElement);
+            var comboBoxItemAutomationPeer = peer as ComboBoxItemAutomationPeer;
+            var comboBoxItem = (ComboBoxItem)comboBoxItemAutomationPeer.Owner;
+
+            AutomationPeer ancestor = comboBoxItemAutomationPeer;
+            var comboBoxAutomationPeer = ancestor as ComboBoxAutomationPeer;
+            while (comboBoxAutomationPeer == null)
+            {
+                ancestor = ancestor.Navigate(AutomationNavigationDirection.Parent) as AutomationPeer;
+                comboBoxAutomationPeer = ancestor as ComboBoxAutomationPeer;
+            }
+
+            comboBoxItem.IsSelected = true;
+            comboBoxAutomationPeer.Collapse();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
new file mode 100644
index 00000000000..5ee2c572dd8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
@@ -0,0 +1,24 @@
+// 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 Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// This parameter is passed to the GazeElement::Invoked event and allows
+    /// the application to prevent default invocation when the user dwells on a control
+    /// </summary>
+    public class DwellInvokedRoutedEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library prevents invoking the control when the user dwells on a control
+        /// </summary>
+        public bool Handled { get; set; }
+
+        internal DwellInvokedRoutedEventArgs()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.h
deleted file mode 100644
index 7ef31be8bb5..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This parameter is passed to the GazeElement::Invoked event and allows 
-/// the application to prevent default invocation when the user dwells on a control
-/// </summary>
-public ref class DwellInvokedRoutedEventArgs : public RoutedEventArgs
-{
-public:
-
-    /// <summary>
-    /// The application should set this value to true to prevent invoking the control when the user dwells on a control
-    /// </summary>
-    property bool Handled;
-
-internal:
-
-    DwellInvokedRoutedEventArgs()
-    {
-    }
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
new file mode 100644
index 00000000000..f614f58d4cb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
@@ -0,0 +1,36 @@
+// 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 Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// This parameter is passed to the GazeElement.DwellProgressFeedback event. The event is fired to inform the application of the user's progress towards completing dwelling on a control
+    /// </summary>
+    public class DwellProgressEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets an enum that reflects the current state of dwell progress
+        /// </summary>
+        public DwellProgressState State { get; }
+
+        /// <summary>
+        /// Gets a value between 0 and 1 that reflects the fraction of progress towards completing dwell
+        /// </summary>
+        public double Progress { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library suppresses default animation for dwell feedback on the control
+        /// </summary>
+        public bool Handled { get; set; }
+
+        internal DwellProgressEventArgs(DwellProgressState state, TimeSpan elapsedDuration, TimeSpan triggerDuration)
+        {
+            State = state;
+            Progress = ((double)elapsedDuration.Ticks) / triggerDuration.Ticks;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.h
deleted file mode 100644
index 86c5b2ef5eb..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "DwellProgressState.h"
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This parameter is passed to the GazeElement.DwellProgressFeedback event. The event is fired to inform the application of the user's progress towards completing dwelling on a control
-/// </summary>
-public ref class DwellProgressEventArgs : public RoutedEventArgs
-{
-public:
-
-    /// <summary>
-    /// An enum that reflects the current state of dwell progress
-    /// </summary>
-    property DwellProgressState State { DwellProgressState get() { return _state; }}
-
-    /// <summary>
-    /// A value between 0 and 1 that reflects the fraction of progress towards completing dwell
-    /// </summary>
-    property double Progress { double get() { return _progress; }}
-
-    /// <summary>
-    /// A parameter for the application to set to true if it handles the event. If this parameter is set to true, the library suppresses default animation for dwell feedback on the control
-    /// </summary>
-    property bool Handled;
-
-internal:
-	DwellProgressEventArgs(DwellProgressState state, TimeSpan elapsedDuration, TimeSpan triggerDuration)
-	{
-        _state = state;
-        _progress = ((double)elapsedDuration.Duration) / triggerDuration.Duration;
-	}
-private:
-    DwellProgressState _state;
-    double _progress;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.cs
new file mode 100644
index 00000000000..79c6275a23f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.cs
@@ -0,0 +1,32 @@
+// 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.Input.GazeInteraction
+{
+    /// <summary>
+    /// An enum that reflects the current state of progress towards dwell when a user is focused on a control
+    /// </summary>
+    public enum DwellProgressState
+    {
+        /// <summary>
+        /// User is not looking at the control
+        /// </summary>
+        Idle,
+
+        /// <summary>
+        /// Gaze has entered control but we're not yet showing progress.
+        /// </summary>
+        Fixating,
+
+        /// <summary>
+        /// User is continuing to focus on a control with an intent to dwell and invoke
+        /// </summary>
+        Progressing,
+
+        /// <summary>
+        /// User has completed dwelling on a control
+        /// </summary>
+        Complete
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.h
deleted file mode 100644
index a60c0c54d9b..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressState.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// An enum that reflects the current state of progress towards dwell when a user is focused on a control
-/// </summary>
-public enum class DwellProgressState
-{
-    /// <summary>
-    /// User is not looking at the control
-    /// </summary>
-    Idle,
-
-    /// <summary>
-    /// Gaze has entered control but we're not yet showing progress.
-    /// </summary>
-    Fixating,
-
-    /// <summary>
-    /// User is continuing to focus on a control with an intent to dwell and invoke
-    /// </summary>
-    Progressing,
-
-    /// <summary>
-    /// User has completed dwelling on a control
-    /// </summary>
-    Complete
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ExpandCollapsePatternGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ExpandCollapsePatternGazeTargetItem.cs
new file mode 100644
index 00000000000..cd6e5c58d9f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/ExpandCollapsePatternGazeTargetItem.cs
@@ -0,0 +1,35 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class ExpandCollapsePatternGazeTargetItem : GazeTargetItem
+    {
+        internal ExpandCollapsePatternGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(TargetElement);
+            var provider = peer.GetPattern(PatternInterface.ExpandCollapse) as IExpandCollapseProvider;
+            switch (provider.ExpandCollapseState)
+            {
+                case ExpandCollapseState.Collapsed:
+                    provider.Expand();
+                    break;
+
+                case ExpandCollapseState.Expanded:
+                    provider.Collapse();
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cpp
deleted file mode 100644
index b8498d2dc22..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeCursor.h"
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-GazeCursor::GazeCursor()
-{
-    _gazePopup = ref new Popup();
-    _gazePopup->IsHitTestVisible = false;
-
-    auto gazeCursor = ref new Shapes::Ellipse();
-    gazeCursor->Fill = ref new SolidColorBrush(Colors::IndianRed);
-    gazeCursor->VerticalAlignment = Windows::UI::Xaml::VerticalAlignment::Top;
-    gazeCursor->HorizontalAlignment = Windows::UI::Xaml::HorizontalAlignment::Left;
-    gazeCursor->Width = 2 * CursorRadius;
-    gazeCursor->Height = 2 * CursorRadius;
-	gazeCursor->Margin = Thickness(-CursorRadius, -CursorRadius, 0, 0);
-    gazeCursor->IsHitTestVisible = false;
-
-    _gazePopup->Child = gazeCursor;
-}
-
-void GazeCursor::CursorRadius::set(int value)
-{
-    _cursorRadius = value;
-	auto gazeCursor = CursorElement;
-	if (gazeCursor != nullptr)
-	{
-		gazeCursor->Width = 2 * _cursorRadius;
-		gazeCursor->Height = 2 * _cursorRadius;
-		gazeCursor->Margin = Thickness(-_cursorRadius, -_cursorRadius, 0, 0);
-	}
-}
-
-void GazeCursor::IsCursorVisible::set(bool value)
-{
-    _isCursorVisible = value;
-    SetVisibility();
-}
-
-void GazeCursor::IsGazeEntered::set(bool value)
-{
-    _isGazeEntered = value;
-    SetVisibility();
-}
-
-void GazeCursor::LoadSettings(ValueSet^ settings)
-{
-    if (settings->HasKey("GazeCursor.CursorRadius"))
-    {
-        CursorRadius = (int)(settings->Lookup("GazeCursor.CursorRadius"));
-    }
-    if (settings->HasKey("GazeCursor.CursorVisibility"))
-    {
-        IsCursorVisible = (bool)(settings->Lookup("GazeCursor.CursorVisibility"));
-    }
-}
-
-void GazeCursor::SetVisibility()
-{
-    auto isOpen = _isCursorVisible && _isGazeEntered;
-    if (_gazePopup->IsOpen != isOpen)
-    {
-        _gazePopup->IsOpen = isOpen;
-    }
-    else if (isOpen)
-    {
-        auto topmost = VisualTreeHelper::GetOpenPopups(Window::Current)->First()->Current;
-        if (_gazePopup != topmost)
-        {
-            _gazePopup->IsOpen = false;
-            _gazePopup->IsOpen = true;
-        }
-    }
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
new file mode 100644
index 00000000000..ab16c42a4a4
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
@@ -0,0 +1,163 @@
+// 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.Linq;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class GazeCursor
+    {
+        private const int DEFAULT_CURSOR_RADIUS = 5;
+        private const bool DEFAULT_CURSOR_VISIBILITY = true;
+
+        public void LoadSettings(ValueSet settings)
+        {
+            if (settings.ContainsKey("GazeCursor.CursorRadius"))
+            {
+                CursorRadius = (int)settings["GazeCursor.CursorRadius"];
+            }
+
+            if (settings.ContainsKey("GazeCursor.CursorVisibility"))
+            {
+                IsCursorVisible = (bool)settings["GazeCursor.CursorVisibility"];
+            }
+        }
+
+        public int CursorRadius
+        {
+            get
+            {
+                return _cursorRadius;
+            }
+
+            set
+            {
+                _cursorRadius = value;
+                var gazeCursor = CursorElement;
+                if (gazeCursor != null)
+                {
+                    gazeCursor.Width = 2 * _cursorRadius;
+                    gazeCursor.Height = 2 * _cursorRadius;
+                    gazeCursor.Margin = new Thickness(-_cursorRadius, -_cursorRadius, 0, 0);
+                }
+            }
+        }
+
+        public bool IsCursorVisible
+        {
+            get
+            {
+                return _isCursorVisible;
+            }
+
+            set
+            {
+                _isCursorVisible = value;
+                SetVisibility();
+            }
+        }
+
+        public bool IsGazeEntered
+        {
+            get
+            {
+                return _isGazeEntered;
+            }
+
+            set
+            {
+                _isGazeEntered = value;
+                SetVisibility();
+            }
+        }
+
+        public Point Position
+        {
+            get
+            {
+                return _cursorPosition;
+            }
+
+            set
+            {
+                _cursorPosition = value;
+                _gazePopup.HorizontalOffset = value.X;
+                _gazePopup.VerticalOffset = value.Y;
+                SetVisibility();
+            }
+        }
+
+        public UIElement PopupChild
+        {
+            get
+            {
+                return _gazePopup.Child;
+            }
+
+            set
+            {
+                _gazePopup.Child = value;
+            }
+        }
+
+        public FrameworkElement CursorElement
+        {
+            get
+            {
+                return _gazePopup.Child as FrameworkElement;
+            }
+        }
+
+        internal GazeCursor()
+        {
+            _gazePopup = new Popup
+            {
+                IsHitTestVisible = false
+            };
+
+            var gazeCursor = new Windows.UI.Xaml.Shapes.Ellipse
+            {
+                Fill = new SolidColorBrush(Colors.IndianRed),
+                VerticalAlignment = VerticalAlignment.Top,
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Width = 2 * CursorRadius,
+                Height = 2 * CursorRadius,
+                Margin = new Thickness(-CursorRadius, -CursorRadius, 0, 0),
+                IsHitTestVisible = false
+            };
+
+            _gazePopup.Child = gazeCursor;
+        }
+
+        private void SetVisibility()
+        {
+            var isOpen = _isCursorVisible && _isGazeEntered;
+            if (_gazePopup.IsOpen != isOpen)
+            {
+                _gazePopup.IsOpen = isOpen;
+            }
+            else if (isOpen)
+            {
+                var topmost = VisualTreeHelper.GetOpenPopups(Window.Current).First();
+                if (_gazePopup != topmost)
+                {
+                    _gazePopup.IsOpen = false;
+                    _gazePopup.IsOpen = true;
+                }
+            }
+        }
+
+        private readonly Popup _gazePopup;
+        private Point _cursorPosition = default;
+        private int _cursorRadius = DEFAULT_CURSOR_RADIUS;
+        private bool _isCursorVisible = DEFAULT_CURSOR_VISIBILITY;
+        private bool _isGazeEntered;
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.h
deleted file mode 100644
index db92c5a229d..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-private ref class GazeCursor sealed
-{
-private:
-    const int DEFAULT_CURSOR_RADIUS = 5;
-    const bool DEFAULT_CURSOR_VISIBILITY = true;
-
-public:
-    void LoadSettings(ValueSet^ settings);
-    property int CursorRadius
-    {
-        int get() { return _cursorRadius; }
-        void set(int value);
-    }
-
-    property bool IsCursorVisible
-    {
-        bool get() { return _isCursorVisible; }
-        void set(bool value);
-    }
-
-    property bool IsGazeEntered
-    {
-        bool get() { return _isGazeEntered; }
-        void set(bool value);
-    }
-
-    property Point Position
-    {
-        Point get()
-        {
-            return _cursorPosition;
-        }
-
-        void set(Point value)
-        {
-            _cursorPosition = value;
-            _gazePopup->HorizontalOffset = value.X;
-            _gazePopup->VerticalOffset = value.Y;
-            SetVisibility();
-        }
-    }
-
-	property UIElement^ PopupChild
-	{
-		UIElement^ get()
-		{
-			return _gazePopup->Child;
-		}
-		void set(UIElement^ value)
-		{
-			_gazePopup->Child = value;
-		}
-	}
-
-	property FrameworkElement^ CursorElement
-	{
-		FrameworkElement^ get()
-		{
-			return dynamic_cast<FrameworkElement^>(_gazePopup->Child);
-		}
-	}
-
-internal:
-    GazeCursor();
-
-private:
-    void SetVisibility();
-
-    Popup^              _gazePopup;
-    Point               _cursorPosition = {};
-    int                 _cursorRadius = DEFAULT_CURSOR_RADIUS;
-    bool                _isCursorVisible = DEFAULT_CURSOR_VISIBILITY;
-    bool _isGazeEntered;
-
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.cs
new file mode 100644
index 00000000000..44a68306589
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.cs
@@ -0,0 +1,47 @@
+// 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 Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// Surrogate object attached to controls allowing subscription to per-control gaze events.
+    /// </summary>
+    public class GazeElement : DependencyObject
+    {
+        /// <summary>
+        /// This event is fired when the state of the user's gaze on a control has changed
+        /// </summary>
+        public event EventHandler<StateChangedEventArgs> StateChanged;
+
+        /// <summary>
+        /// This event is fired when the user completed dwelling on a control and the control is about to be invoked by default. This event is fired to give the application an opportunity to prevent default invocation
+        /// </summary>
+        public event EventHandler<DwellInvokedRoutedEventArgs> Invoked;
+
+        /// <summary>
+        /// This event is fired to inform the application of the progress towards dwell
+        /// </summary>
+        public event EventHandler<DwellProgressEventArgs> DwellProgressFeedback;
+
+        internal void RaiseStateChanged(object sender, StateChangedEventArgs args)
+        {
+            StateChanged?.Invoke(sender, args);
+        }
+
+        internal void RaiseInvoked(object sender, DwellInvokedRoutedEventArgs args)
+        {
+            Invoked?.Invoke(sender, args);
+        }
+
+        internal bool RaiseProgressFeedback(object sender, DwellProgressState state, TimeSpan elapsedTime, TimeSpan triggerTime)
+        {
+            var args = new DwellProgressEventArgs(state, elapsedTime, triggerTime);
+            DwellProgressFeedback?.Invoke(sender, args);
+            return args.Handled;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.h
deleted file mode 100644
index cabd7df89d9..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeElement.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "DwellInvokedRoutedEventArgs.h"
-#include "DwellProgressEventArgs.h"
-#include "StateChangedEventArgs.h"
-
-using namespace Windows::Foundation;
-using namespace Windows::UI::Xaml;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// Surrogate object attached to controls allowing subscription to per-control gaze events.
-/// </summary>
-public ref class GazeElement sealed : public DependencyObject
-{
-public:
-
-    /// <summary>
-    /// This event is fired when the state of the user's gaze on a control has changed
-    /// </summary>
-    event EventHandler<StateChangedEventArgs^>^ StateChanged;
-
-    /// <summary>
-    /// This event is fired when the user completed dwelling on a control and the control is about to be invoked by default. This event is fired to give the application an opportunity to prevent default invocation
-    /// </summary>
-    event EventHandler<DwellInvokedRoutedEventArgs^>^ Invoked;
-
-    /// <summary>
-    /// This event is fired to inform the application of the progress towards dwell
-    /// </summary>
-    event EventHandler<DwellProgressEventArgs^>^ DwellProgressFeedback;
-
-internal:
-
-    void RaiseStateChanged(Object^ sender, StateChangedEventArgs^ args) { StateChanged(sender, args); }
-
-    void RaiseInvoked(Object^ sender, DwellInvokedRoutedEventArgs^ args)
-    {
-        Invoked(sender, args);
-    }
-
-    bool RaiseProgressFeedback(Object^ sender, DwellProgressState state, TimeSpan elapsedTime, TimeSpan triggerTime)
-    {
-        auto args = ref new DwellProgressEventArgs(state, elapsedTime, triggerTime);
-        DwellProgressFeedback(sender, args);
-        return args->Handled;
-    }
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cpp
deleted file mode 100644
index ee42274a31b..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeEventArgs.h"
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
new file mode 100644
index 00000000000..d32e207c3e4
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
@@ -0,0 +1,37 @@
+// 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 Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// EventArgs used to send Gaze events. See <see cref="GazePointer.GazeEvent"/>
+    /// </summary>
+    public class GazeEventArgs
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library prevents handling the events on that particular gaze event.
+        /// </summary>
+        public bool Handled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the location of the Gaze event
+        /// </summary>
+        public Point Location { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timestamp of the gaze event
+        /// </summary>
+        public TimeSpan Timestamp { get; set; }
+
+        internal void Set(Point location, TimeSpan timestamp)
+        {
+            Handled = false;
+            Location = location;
+            Timestamp = timestamp;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.h
deleted file mode 100644
index 75f635d4aae..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-public ref struct GazeEventArgs sealed
-{
-    property bool Handled;
-    property Point Location;
-    property TimeSpan Timestamp;
-
-    GazeEventArgs()
-    {
-    }
-
-    void Set(Point location, TimeSpan timestamp)
-    {
-        Handled = false;
-        Location = location;
-        Timestamp = timestamp;
-    }
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cpp
deleted file mode 100644
index 8311455240f..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeFeedbackPopupFactory.h"
-#include "GazeInput.h"
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-Popup^ GazeFeedbackPopupFactory::Get()
-{
-    Popup^ popup;
-    ::Windows::UI::Xaml::Shapes::Rectangle^ rectangle;
-
-    if (s_cache->Size != 0)
-    {
-        popup = s_cache->GetAt(0);
-        s_cache->RemoveAt(0);
-
-        rectangle = safe_cast<::Windows::UI::Xaml::Shapes::Rectangle^>(popup->Child);
-    }
-    else
-    {
-        popup = ref new Popup();
-
-        rectangle = ref new ::Windows::UI::Xaml::Shapes::Rectangle();
-        rectangle->IsHitTestVisible = false;
-
-        popup->Child = rectangle;
-    }
-
-    rectangle->StrokeThickness = GazeInput::DwellStrokeThickness;
-
-    return popup;
-}
-
-void GazeFeedbackPopupFactory::Return(Popup^ popup)
-{
-    popup->IsOpen = false;
-    s_cache->Append(popup);
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cs
new file mode 100644
index 00000000000..e75146eabbb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.cs
@@ -0,0 +1,49 @@
+// 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.Collections.Generic;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class GazeFeedbackPopupFactory
+    {
+        private readonly List<Popup> _cache = new List<Popup>();
+
+        public Popup Get()
+        {
+            Popup popup;
+            Windows.UI.Xaml.Shapes.Rectangle rectangle;
+
+            if (_cache.Count != 0)
+            {
+                popup = _cache[0];
+                _cache.RemoveAt(0);
+
+                rectangle = popup.Child as Windows.UI.Xaml.Shapes.Rectangle;
+            }
+            else
+            {
+                popup = new Popup();
+
+                rectangle = new Windows.UI.Xaml.Shapes.Rectangle
+                {
+                    IsHitTestVisible = false
+                };
+
+                popup.Child = rectangle;
+            }
+
+            rectangle.StrokeThickness = GazeInput.DwellStrokeThickness;
+
+            return popup;
+        }
+
+        public void Return(Popup popup)
+        {
+            popup.IsOpen = false;
+            _cache.Add(popup);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.h
deleted file mode 100644
index 33b514e0b9e..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFeedbackPopupFactory.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-using namespace Platform::Collections;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-private ref class GazeFeedbackPopupFactory
-{
-private:
-
-    Vector<Popup^>^ s_cache = ref new Vector<Popup^>();
-
-public:
-
-    Popup^ Get();
-
-    void Return(Popup^ popup);
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFilterArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFilterArgs.cs
new file mode 100644
index 00000000000..9d0318f5ba9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeFilterArgs.cs
@@ -0,0 +1,35 @@
+// 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 Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// This struct encapsulates the location and timestamp associated with the user's gaze
+    /// and is used as an input and output parameter for the IGazeFilter.Update method
+    /// </summary>
+    internal struct GazeFilterArgs
+    {
+        /// <summary>
+        /// Gets the current point in the gaze stream
+        /// </summary>
+        public Point Location => _location;
+
+        /// <summary>
+        /// Gets the timestamp associated with the current point
+        /// </summary>
+        public TimeSpan Timestamp => _timestamp;
+
+        internal GazeFilterArgs(Point location, TimeSpan timestamp)
+        {
+            _location = location;
+            _timestamp = timestamp;
+        }
+
+        private Point _location;
+        private TimeSpan _timestamp;
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.cpp
deleted file mode 100644
index 628016c41df..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeHidParsers.h"
-
-using namespace Windows::Foundation::Collections;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-namespace GazeHidParsers {
-    static HidNumericControlDescription ^ GetGazeUsageFromCollectionId(
-        GazeDevicePreview ^ gazeDevice,
-        uint16 childUsageId,
-        uint16 parentUsageId)
-    {
-        IVectorView<HidNumericControlDescription ^> ^ numericControls = gazeDevice->GetNumericControlDescriptions(
-            (USHORT)GazeHidUsages::UsagePage_EyeHeadTracker, childUsageId);
-
-        for (unsigned int i = 0; i < numericControls->Size; i++)
-        {
-            auto parentCollections = numericControls->GetAt(i)->ParentCollections;
-            if (parentCollections->Size > 0 &&
-                parentCollections->GetAt(0)->UsagePage == (USHORT)GazeHidUsages::UsagePage_EyeHeadTracker &&
-                parentCollections->GetAt(0)->UsageId == parentUsageId)
-            {
-                return numericControls->GetAt(i);
-            }
-        }
-        return nullptr;
-    }
-
-#pragma region GazeHidPositionParser
-    GazeHidPositionParser::GazeHidPositionParser(GazeDevicePreview ^ gazeDevice, uint16 usage)
-    {
-        _usage = usage;
-
-        // Find all the position usages from the device's
-        // descriptor and store them for easy access
-        _X = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_PositionX, _usage);
-        _Y = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_PositionY, _usage);
-        _Z = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_PositionZ, _usage);
-    }
-
-    GazeHidPosition^ GazeHidPositionParser::GetPosition(HidInputReport ^ report)
-    {
-        GazeHidPosition^ result = nullptr;
-
-        if (_X != nullptr &&
-            _Y != nullptr &&
-            _Z != nullptr &&
-            _usage != 0x0000)
-        {
-            auto descX = report->GetNumericControlByDescription(_X);
-            auto descY = report->GetNumericControlByDescription(_Y);
-            auto descZ = report->GetNumericControlByDescription(_Z);
-
-            auto controlDescX = descX->ControlDescription;
-            auto controlDescY = descY->ControlDescription;
-            auto controlDescZ = descZ->ControlDescription;
-
-            if ((controlDescX->LogicalMaximum < descX->ScaledValue || controlDescX->LogicalMinimum > descX->ScaledValue) ||
-                (controlDescY->LogicalMaximum < descY->ScaledValue || controlDescY->LogicalMinimum > descY->ScaledValue) ||
-                (controlDescZ->LogicalMaximum < descZ->ScaledValue || controlDescZ->LogicalMinimum > descZ->ScaledValue))
-            {
-                // One of the values is outside of the valid range.
-            }
-            else
-            {
-                result = ref new GazeHidPosition();
-                result->X = descX->ScaledValue;
-                result->Y = descY->ScaledValue;
-                result->Z = descZ->ScaledValue;
-            }
-        }
-
-        return result;
-    }
-#pragma endregion GazeHidPositionParser
-
-#pragma region GazeHidRotationParser
-    GazeHidRotationParser::GazeHidRotationParser(GazeDevicePreview ^ gazeDevice, uint16 usage)
-    {
-        _usage = usage;
-
-        // Find all the rotation usages from the device's
-        // descriptor and store them for easy access
-        _X = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_RotationX, _usage);
-        _Y = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_RotationY, _usage);
-        _Z = GetGazeUsageFromCollectionId(gazeDevice, (USHORT)GazeHidUsages::Usage_RotationZ, _usage);
-    }
-
-    GazeHidPosition^ GazeHidRotationParser::GetRotation(HidInputReport ^ report)
-    {
-        GazeHidPosition^ result = nullptr;
-
-        if (_X != nullptr &&
-            _Y != nullptr &&
-            _Z != nullptr &&
-            _usage != 0x0000)
-        {
-            auto descX = report->GetNumericControlByDescription(_X);
-            auto descY = report->GetNumericControlByDescription(_Y);
-            auto descZ = report->GetNumericControlByDescription(_Z);
-
-            auto controlDescX = descX->ControlDescription;
-            auto controlDescY = descY->ControlDescription;
-            auto controlDescZ = descZ->ControlDescription;
-
-            if ((controlDescX->LogicalMaximum < descX->ScaledValue || controlDescX->LogicalMinimum > descX->ScaledValue) ||
-                (controlDescY->LogicalMaximum < descY->ScaledValue || controlDescY->LogicalMinimum > descY->ScaledValue) ||
-                (controlDescZ->LogicalMaximum < descZ->ScaledValue || controlDescZ->LogicalMinimum > descZ->ScaledValue))
-            {
-                // One of the values is outside of the valid range.
-            }
-            else
-            {
-                result = ref new GazeHidPosition();
-                result->X = descX->ScaledValue;
-                result->Y = descY->ScaledValue;
-                result->Z = descZ->ScaledValue;
-            }
-        }
-
-        return result;
-    }
-#pragma endregion GazeHidRotationParser
-
-#pragma region GazeHidPositionsParser
-    GazeHidPositionsParser::GazeHidPositionsParser(GazeDevicePreview ^ gazeDevice)
-    {
-        _leftEyePositionParser  = ref new GazeHidPositionParser(gazeDevice, (USHORT)GazeHidUsages::Usage_LeftEyePosition);
-        _rightEyePositionParser = ref new GazeHidPositionParser(gazeDevice, (USHORT)GazeHidUsages::Usage_RightEyePosition);
-        _headPositionParser     = ref new GazeHidPositionParser(gazeDevice, (USHORT)GazeHidUsages::Usage_HeadPosition);
-        _headRotationParser     = ref new GazeHidRotationParser(gazeDevice, (USHORT)GazeHidUsages::Usage_HeadDirectionPoint);
-    }
-
-    GazeHidPositions ^ GazeHidPositionsParser::GetGazeHidPositions(HidInputReport ^ report)
-    {
-        auto retval = ref new GazeHidPositions();
-
-        retval->LeftEyePosition  = _leftEyePositionParser->GetPosition(report);
-        retval->RightEyePosition = _rightEyePositionParser->GetPosition(report);
-        retval->HeadPosition     = _headPositionParser->GetPosition(report);
-        retval->HeadRotation     = _headRotationParser->GetRotation(report);
-
-        return retval;
-    }
-#pragma endregion GazeHidPositionsParser
-}
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.h
deleted file mode 100644
index f8b862ee40e..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "GazeHidUsages.h"
-
-using namespace Windows::Devices::HumanInterfaceDevice;
-using namespace Windows::Devices::Input::Preview;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-namespace GazeHidParsers {
-    public ref class GazeHidPosition sealed
-    {
-    public:
-        property long long X;
-        property long long Y;
-        property long long Z;
-    };
-
-    public ref class GazeHidPositions sealed
-    {
-    public:
-        property GazeHidPosition^ LeftEyePosition;
-        property GazeHidPosition^ RightEyePosition;
-        property GazeHidPosition^ HeadPosition;
-        property GazeHidPosition^ HeadRotation;
-    };
-
-    public ref class GazeHidPositionParser sealed
-    {
-    public:
-        GazeHidPositionParser(GazeDevicePreview ^ gazeDevice, uint16 usage);
-
-        GazeHidPosition^ GetPosition(HidInputReport ^ report);
-
-    private:
-        HidNumericControlDescription ^ _X = nullptr;
-        HidNumericControlDescription ^ _Y = nullptr;
-        HidNumericControlDescription ^ _Z = nullptr;
-        uint16 _usage                     = 0x0000;
-    };
-
-    public ref class GazeHidRotationParser sealed
-    {
-    public:
-        GazeHidRotationParser(GazeDevicePreview ^ gazeDevice, uint16 usage);
-
-        GazeHidPosition^ GetRotation(HidInputReport^ report);
-
-    private:
-        HidNumericControlDescription ^ _X = nullptr;
-        HidNumericControlDescription ^ _Y = nullptr;
-        HidNumericControlDescription ^ _Z = nullptr;
-        uint16 _usage                     = 0x0000;
-    };
-
-    public ref class GazeHidPositionsParser sealed
-    {
-    public:
-        GazeHidPositionsParser(GazeDevicePreview ^ gazeDevice);
-
-        GazeHidPositions^ GetGazeHidPositions(HidInputReport ^ report);
-
-    private:
-        GazeHidPositionParser ^ _leftEyePositionParser;
-        GazeHidPositionParser ^ _rightEyePositionParser;
-        GazeHidPositionParser ^ _headPositionParser;
-        GazeHidRotationParser ^ _headRotationParser;
-    };
-}
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidParsersHelpers.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidParsersHelpers.cs
new file mode 100644
index 00000000000..34781115470
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidParsersHelpers.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 Windows.Devices.HumanInterfaceDevice;
+using Windows.Devices.Input.Preview;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction.GazeHidParsers
+{
+    internal static class GazeHidParsersHelpers
+    {
+        public static HidNumericControlDescription GetGazeUsageFromCollectionId(
+            GazeDevicePreview gazeDevice,
+            ushort childUsageId,
+            ushort parentUsageId)
+        {
+            var numericControls = gazeDevice.GetNumericControlDescriptions(
+                (ushort)GazeHidUsages.UsagePage_EyeHeadTracker, childUsageId);
+
+            for (int i = 0; i < numericControls.Count; i++)
+            {
+                var parentCollections = numericControls[i].ParentCollections;
+                if (parentCollections.Count > 0 &&
+                    parentCollections[0].UsagePage == (ushort)GazeHidUsages.UsagePage_EyeHeadTracker &&
+                    parentCollections[0].UsageId == parentUsageId)
+                {
+                    return numericControls[i];
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPosition.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPosition.cs
new file mode 100644
index 00000000000..0da26a306f2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPosition.cs
@@ -0,0 +1,27 @@
+// 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.Input.GazeInteraction.GazeHidParsers
+{
+    /// <summary>
+    /// Represents one Hid position
+    /// </summary>
+    public class GazeHidPosition
+    {
+        /// <summary>
+        /// Gets or sets the X axis of this position
+        /// </summary>
+        public long X { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Y axis of this position
+        /// </summary>
+        public long Y { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Z axis of this position
+        /// </summary>
+        public long Z { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionParser.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionParser.cs
new file mode 100644
index 00000000000..e9e280089e9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionParser.cs
@@ -0,0 +1,78 @@
+// 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 Windows.Devices.HumanInterfaceDevice;
+using Windows.Devices.Input.Preview;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction.GazeHidParsers
+{
+    /// <summary>
+    /// Hid Position Parser
+    /// </summary>
+    public class GazeHidPositionParser
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GazeHidPositionParser"/> class.
+        /// </summary>
+        /// <param name="gazeDevice"><see cref="GazeDevicePreview"/> used to parse.</param>
+        /// <param name="usage">The <see cref="GazeHidUsages"/> used to parse.</param>
+        public GazeHidPositionParser(GazeDevicePreview gazeDevice, ushort usage)
+        {
+            _usage = usage;
+
+            // Find all the position usages from the device's
+            // descriptor and store them for easy access
+            _x = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_PositionX, _usage);
+            _y = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_PositionY, _usage);
+            _z = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_PositionZ, _usage);
+        }
+
+        /// <summary>
+        /// Parses the position from the report.
+        /// </summary>
+        /// <param name="report">A <see cref="HidInputReport"/> object used on the parsing.</param>
+        /// <returns>The parsed <see cref="GazeHidPositions"/> from the report.</returns>
+        public GazeHidPosition GetPosition(HidInputReport report)
+        {
+            GazeHidPosition result = null;
+
+            if (_x != null &&
+                _y != null &&
+                _z != null &&
+                _usage != 0x0000)
+            {
+                var descX = report.GetNumericControlByDescription(_x);
+                var descY = report.GetNumericControlByDescription(_y);
+                var descZ = report.GetNumericControlByDescription(_z);
+
+                var controlDescX = descX.ControlDescription;
+                var controlDescY = descY.ControlDescription;
+                var controlDescZ = descZ.ControlDescription;
+
+                if ((controlDescX.LogicalMaximum < descX.ScaledValue || controlDescX.LogicalMinimum > descX.ScaledValue) ||
+                    (controlDescY.LogicalMaximum < descY.ScaledValue || controlDescY.LogicalMinimum > descY.ScaledValue) ||
+                    (controlDescZ.LogicalMaximum < descZ.ScaledValue || controlDescZ.LogicalMinimum > descZ.ScaledValue))
+                {
+                    // One of the values is outside of the valid range.
+                }
+                else
+                {
+                    result = new GazeHidPosition
+                    {
+                        X = descX.ScaledValue,
+                        Y = descY.ScaledValue,
+                        Z = descZ.ScaledValue
+                    };
+                }
+            }
+
+            return result;
+        }
+
+        private readonly HidNumericControlDescription _x = null;
+        private readonly HidNumericControlDescription _y = null;
+        private readonly HidNumericControlDescription _z = null;
+        private readonly ushort _usage = 0x0000;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositions.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositions.cs
new file mode 100644
index 00000000000..66e8d0d6297
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositions.cs
@@ -0,0 +1,32 @@
+// 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.Input.GazeInteraction.GazeHidParsers
+{
+    /// <summary>
+    /// Represents the Hid positions
+    /// </summary>
+    public class GazeHidPositions
+    {
+        /// <summary>
+        /// Gets or sets the left eye position
+        /// </summary>
+        public GazeHidPosition LeftEyePosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the right eye position
+        /// </summary>
+        public GazeHidPosition RightEyePosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the head position
+        /// </summary>
+        public GazeHidPosition HeadPosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets the head rotation
+        /// </summary>
+        public GazeHidPosition HeadRotation { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionsParser.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionsParser.cs
new file mode 100644
index 00000000000..9c9765169b1
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidPositionsParser.cs
@@ -0,0 +1,48 @@
+// 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 Windows.Devices.HumanInterfaceDevice;
+using Windows.Devices.Input.Preview;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction.GazeHidParsers
+{
+    /// <summary>
+    /// Hid Positions Parser
+    /// </summary>
+    public class GazeHidPositionsParser
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GazeHidPositionsParser"/> class.
+        /// </summary>
+        /// <param name="gazeDevice"><see cref="GazeDevicePreview"/> used to parse.</param>
+        public GazeHidPositionsParser(GazeDevicePreview gazeDevice)
+        {
+            _leftEyePositionParser = new GazeHidPositionParser(gazeDevice, (ushort)GazeHidUsages.Usage_LeftEyePosition);
+            _rightEyePositionParser = new GazeHidPositionParser(gazeDevice, (ushort)GazeHidUsages.Usage_RightEyePosition);
+            _headPositionParser = new GazeHidPositionParser(gazeDevice, (ushort)GazeHidUsages.Usage_HeadPosition);
+            _headRotationParser = new GazeHidRotationParser(gazeDevice, (ushort)GazeHidUsages.Usage_HeadDirectionPoint);
+        }
+
+        /// <summary>
+        /// Parses the positions from the report.
+        /// </summary>
+        /// <param name="report">A <see cref="HidInputReport"/> object used on the parsing.</param>
+        /// <returns>The parsed <see cref="GazeHidPositions"/> from the report.</returns>
+        public GazeHidPositions GetGazeHidPositions(HidInputReport report)
+        {
+            return new GazeHidPositions
+            {
+                LeftEyePosition = this._leftEyePositionParser.GetPosition(report),
+                RightEyePosition = this._rightEyePositionParser.GetPosition(report),
+                HeadPosition = this._headPositionParser.GetPosition(report),
+                HeadRotation = this._headRotationParser.GetRotation(report)
+            };
+        }
+
+        private readonly GazeHidPositionParser _leftEyePositionParser;
+        private readonly GazeHidPositionParser _rightEyePositionParser;
+        private readonly GazeHidPositionParser _headPositionParser;
+        private readonly GazeHidRotationParser _headRotationParser;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidRotationParser.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidRotationParser.cs
new file mode 100644
index 00000000000..970c113f597
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidParsers/GazeHidRotationParser.cs
@@ -0,0 +1,78 @@
+// 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 Windows.Devices.HumanInterfaceDevice;
+using Windows.Devices.Input.Preview;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction.GazeHidParsers
+{
+    /// <summary>
+    /// Hid Rotation Parser
+    /// </summary>
+    public class GazeHidRotationParser
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GazeHidRotationParser"/> class.
+        /// </summary>
+        /// <param name="gazeDevice"><see cref="GazeDevicePreview"/> used to parse.</param>
+        /// <param name="usage">The <see cref="GazeHidUsages"/> used to parse.</param>
+        public GazeHidRotationParser(GazeDevicePreview gazeDevice, ushort usage)
+        {
+            _usage = usage;
+
+            // Find all the rotation usages from the device's
+            // descriptor and store them for easy access
+            _x = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_RotationX, _usage);
+            _y = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_RotationY, _usage);
+            _z = GazeHidParsersHelpers.GetGazeUsageFromCollectionId(gazeDevice, (ushort)GazeHidUsages.Usage_RotationZ, _usage);
+        }
+
+        /// <summary>
+        /// Parses the rotation from the report.
+        /// </summary>
+        /// <param name="report">A <see cref="HidInputReport"/> object used on the parsing.</param>
+        /// <returns>The parsed <see cref="GazeHidPosition"/> from the report.</returns>
+        public GazeHidPosition GetRotation(HidInputReport report)
+        {
+            GazeHidPosition result = null;
+
+            if (_x != null &&
+                _y != null &&
+                _z != null &&
+                _usage != 0x0000)
+            {
+                var descX = report.GetNumericControlByDescription(_x);
+                var descY = report.GetNumericControlByDescription(_y);
+                var descZ = report.GetNumericControlByDescription(_z);
+
+                var controlDescX = descX.ControlDescription;
+                var controlDescY = descY.ControlDescription;
+                var controlDescZ = descZ.ControlDescription;
+
+                if ((controlDescX.LogicalMaximum < descX.ScaledValue || controlDescX.LogicalMinimum > descX.ScaledValue) ||
+                    (controlDescY.LogicalMaximum < descY.ScaledValue || controlDescY.LogicalMinimum > descY.ScaledValue) ||
+                    (controlDescZ.LogicalMaximum < descZ.ScaledValue || controlDescZ.LogicalMinimum > descZ.ScaledValue))
+                {
+                    // One of the values is outside of the valid range.
+                }
+                else
+                {
+                    result = new GazeHidPosition
+                    {
+                        X = descX.ScaledValue,
+                        Y = descY.ScaledValue,
+                        Z = descZ.ScaledValue
+                    };
+                }
+            }
+
+            return result;
+        }
+
+        private readonly HidNumericControlDescription _x = null;
+        private readonly HidNumericControlDescription _y = null;
+        private readonly HidNumericControlDescription _z = null;
+        private readonly ushort _usage = 0x0000;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.cs
new file mode 100644
index 00000000000..c816bec131b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.cs
@@ -0,0 +1,66 @@
+// 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.Input.GazeInteraction
+{
+    /// <summary>
+    /// This enum specifies the various HID usages specified by the EyeHeadTracker HID specification
+    ///
+    /// https://www.usb.org/sites/default/files/hutrr74_-_usage_page_for_head_and_eye_trackers_0.pdf
+    /// </summary>
+    public enum GazeHidUsages
+    {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+        UsagePage_EyeHeadTracker = 0x0012,
+        Usage_EyeTracker = 0x0001,
+        Usage_HeadTracker = 0x0002,
+
+        // 0x0003-0x000F                    RESERVED
+        Usage_TrackingData = 0x0010,
+        Usage_Capabilities = 0x0011,
+        Usage_Configuration = 0x0012,
+        Usage_Status = 0x0013,
+        Usage_Control = 0x0014,
+
+        // 0x0015-0x001F                    RESERVED
+        Usage_Timestamp = 0x0020,
+        Usage_PositionX = 0x0021,
+        Usage_PositionY = 0x0022,
+        Usage_PositionZ = 0x0023,
+        Usage_GazePoint = 0x0024,
+        Usage_LeftEyePosition = 0x0025,
+        Usage_RightEyePosition = 0x0026,
+        Usage_HeadPosition = 0x0027,
+        Usage_HeadDirectionPoint = 0x0028,
+        Usage_RotationX = 0x0029,
+        Usage_RotationY = 0x002A,
+        Usage_RotationZ = 0x002B,
+
+        // 0x002C-0x00FF                    RESERVED
+        Usage_TrackerQuality = 0x0100,
+        Usage_MinimumTrackingDistance = 0x0101,
+        Usage_OptimumTrackingDistance = 0x0102,
+        Usage_MaximumTrackingDistance = 0x0103,
+        Usage_MaximumScreenPlaneWidth = 0x0104,
+        Usage_MaximumScreenPlaneHeight = 0x0105,
+
+        // 0x0106-0x01FF                    RESERVED
+        Usage_DisplayManufacturerId = 0x0200,
+        Usage_DisplayProductId = 0x0201,
+        Usage_DisplaySerialNumber = 0x0202,
+        Usage_DisplayManufacturerDate = 0x0203,
+        Usage_CalibratedScreenWidth = 0x0204,
+        Usage_CalibratedScreenHeight = 0x0205,
+
+        // 0x0206-0x02FF                    RESERVED
+        Usage_SamplingFrequency = 0x0300,
+        Usage_ConfigurationStatus = 0x0301,
+
+        // 0x0302-0x03FF                    RESERVED
+        Usage_DeviceModeRequest = 0x0400,
+
+        // 0x0401-0xFFFF                    RESERVED
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.h
deleted file mode 100644
index fd08d7a10b6..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHidUsages.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This enum specifies the various HID usages specified by the EyeHeadTracker HID specification
-///
-/// https://www.usb.org/sites/default/files/hutrr74_-_usage_page_for_head_and_eye_trackers_0.pdf
-/// </summary>
-public enum class GazeHidUsages
-{
-    UsagePage_EyeHeadTracker            = 0x0012,
-    Usage_EyeTracker                    = 0x0001,
-    Usage_HeadTracker                   = 0x0002,
-    // 0x0003-0x000F                    RESERVED
-    Usage_TrackingData                  = 0x0010,
-    Usage_Capabilities                  = 0x0011,
-    Usage_Configuration                 = 0x0012,
-    Usage_Status                        = 0x0013,
-    Usage_Control                       = 0x0014,
-    // 0x0015-0x001F                    RESERVED
-    Usage_Timestamp                     = 0x0020,
-    Usage_PositionX                     = 0x0021,
-    Usage_PositionY                     = 0x0022,
-    Usage_PositionZ                     = 0x0023,
-    Usage_GazePoint                     = 0x0024,
-    Usage_LeftEyePosition               = 0x0025,
-    Usage_RightEyePosition              = 0x0026,
-    Usage_HeadPosition                  = 0x0027,
-    Usage_HeadDirectionPoint            = 0x0028,
-    Usage_RotationX                     = 0x0029,
-    Usage_RotationY                     = 0x002A,
-    Usage_RotationZ                     = 0x002B,
-    // 0x002C-0x00FF                    RESERVED
-    Usage_TrackerQuality                = 0x0100,
-    Usage_MinimumTrackingDistance       = 0x0101,
-    Usage_OptimumTrackingDistance       = 0x0102,
-    Usage_MaximumTrackingDistance       = 0x0103,
-    Usage_MaximumScreenPlaneWidth       = 0x0104,
-    Usage_MaximumScreenPlaneHeight      = 0x0105,
-    // 0x0106-0x01FF                    RESERVED
-    Usage_DisplayManufacturerId         = 0x0200,
-    Usage_DisplayProductId              = 0x0201,
-    Usage_DisplaySerialNumber           = 0x0202,
-    Usage_DisplayManufacturerDate       = 0x0203,
-    Usage_CalibratedScreenWidth         = 0x0204,
-    Usage_CalibratedScreenHeight        = 0x0205,
-    // 0x0206-0x02FF                    RESERVED
-    Usage_SamplingFrequency             = 0x0300,
-    Usage_ConfigurationStatus           = 0x0301,
-    // 0x0302-0x03FF                    RESERVED
-    Usage_DeviceModeRequest             = 0x0400,
-    // 0x0401-0xFFFF                    RESERVED
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.cs
new file mode 100644
index 00000000000..4dfe51ba96c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.cs
@@ -0,0 +1,17 @@
+// 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;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal struct GazeHistoryItem
+    {
+        public GazeTargetItem HitTarget { get; set; }
+
+        public TimeSpan Timestamp { get; set; }
+
+        public TimeSpan Duration { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.h
deleted file mode 100644
index b1c1121bb4f..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeHistoryItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-using namespace Windows::Foundation;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-ref class GazeTargetItem;
-
-private ref struct GazeHistoryItem
-{
-    property GazeTargetItem^ HitTarget;
-    property TimeSpan Timestamp;
-    property TimeSpan Duration;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cpp
deleted file mode 100644
index 87f66b2cde2..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeInput.h"
-
-#include "GazeElement.h"
-#include "GazePointer.h"
-#include "GazePointerProxy.h"
-#include "GazeTargetItem.h"
-
-using namespace Platform;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-Brush^ GazeInput::DwellFeedbackEnterBrush::get()
-{
-    return GazePointer::Instance->_enterBrush;
-}
-
-void GazeInput::DwellFeedbackEnterBrush::set(Brush^ value)
-{
-    GazePointer::Instance->_enterBrush = value;
-}
-
-Brush^ GazeInput::DwellFeedbackProgressBrush::get()
-{
-    return GazePointer::Instance->_progressBrush;
-}
-
-void GazeInput::DwellFeedbackProgressBrush::set(Brush^ value)
-{
-    GazePointer::Instance->_progressBrush = value;
-}
-
-Brush^ GazeInput::DwellFeedbackCompleteBrush::get()
-{
-    return GazePointer::Instance->_completeBrush;
-}
-
-void GazeInput::DwellFeedbackCompleteBrush::set(Brush^ value)
-{
-    GazePointer::Instance->_completeBrush = value;
-}
-
-double GazeInput::DwellStrokeThickness::get()
-{
-    return GazePointer::Instance->_dwellStrokeThickness;
-}
-
-void GazeInput::DwellStrokeThickness::set(double value)
-{
-    GazePointer::Instance->_dwellStrokeThickness = value;
-}
-
-Interaction GazeInput::Interaction::get()
-{
-    return GazePointer::Instance->_interaction;
-}
-
-void GazeInput::Interaction::set(GazeInteraction::Interaction value)
-{
-    if (GazePointer::Instance->_interaction != value)
-    {
-        if (value == GazeInteraction::Interaction::Enabled)
-        {
-            GazePointer::Instance->AddRoot(0);
-        }
-        else if (GazePointer::Instance->_interaction == GazeInteraction::Interaction::Enabled)
-        {
-            GazePointer::Instance->RemoveRoot(0);
-        }
-
-        GazePointer::Instance->_interaction = value;
-    }
-}
-
-TimeSpan GazeInput::UnsetTimeSpan = { -1 };
-
-static void OnInteractionChanged(DependencyObject^ ob, DependencyPropertyChangedEventArgs^ args)
-{
-    auto element = safe_cast<FrameworkElement^>(ob);
-    auto interaction = safe_cast<Interaction>(args->NewValue);
-    GazePointerProxy::SetInteraction(element, interaction);
-}
-
-static void OnIsCursorVisibleChanged(DependencyObject^ ob, DependencyPropertyChangedEventArgs^ args)
-{
-    GazePointer::Instance->IsCursorVisible = safe_cast<bool>(args->NewValue);
-}
-
-static void OnCursorRadiusChanged(DependencyObject^ ob, DependencyPropertyChangedEventArgs^ args)
-{
-    GazePointer::Instance->CursorRadius = safe_cast<int>(args->NewValue);
-}
-
-static void OnIsSwitchEnabledChanged(DependencyObject^ ob, DependencyPropertyChangedEventArgs^ args)
-{
-    GazePointer::Instance->IsSwitchEnabled = safe_cast<bool>(args->NewValue);
-}
-
-static DependencyProperty^ s_interactionProperty = DependencyProperty::RegisterAttached("Interaction", Interaction::typeid, GazeInput::typeid,
-    ref new PropertyMetadata(Interaction::Inherited, ref new PropertyChangedCallback(&OnInteractionChanged)));
-static DependencyProperty^ s_isCursorVisibleProperty = DependencyProperty::RegisterAttached("IsCursorVisible", bool::typeid, GazeInput::typeid,
-    ref new PropertyMetadata(true, ref new PropertyChangedCallback(&OnIsCursorVisibleChanged)));
-static DependencyProperty^ s_cursorRadiusProperty = DependencyProperty::RegisterAttached("CursorRadius", int::typeid, GazeInput::typeid,
-    ref new PropertyMetadata(6, ref new PropertyChangedCallback(&OnCursorRadiusChanged)));
-static DependencyProperty^ s_gazeElementProperty = DependencyProperty::RegisterAttached("GazeElement", GazeElement::typeid, GazeInput::typeid, ref new PropertyMetadata(nullptr));
-static DependencyProperty^ s_fixationDurationProperty = DependencyProperty::RegisterAttached("FixationDuration", TimeSpan::typeid, GazeInput::typeid, ref new PropertyMetadata(GazeInput::UnsetTimeSpan));
-static DependencyProperty^ s_dwellDurationProperty = DependencyProperty::RegisterAttached("DwellDuration", TimeSpan::typeid, GazeInput::typeid, ref new PropertyMetadata(GazeInput::UnsetTimeSpan));
-static DependencyProperty^ s_repeatDelayDurationProperty = DependencyProperty::RegisterAttached("RepeatDelayDuration", TimeSpan::typeid, GazeInput::typeid, ref new PropertyMetadata(GazeInput::UnsetTimeSpan));
-static DependencyProperty^ s_dwellRepeatDurationProperty = DependencyProperty::RegisterAttached("DwellRepeatDuration", TimeSpan::typeid, GazeInput::typeid, ref new PropertyMetadata(GazeInput::UnsetTimeSpan));
-static DependencyProperty^ s_thresholdDurationProperty = DependencyProperty::RegisterAttached("ThresholdDuration", TimeSpan::typeid, GazeInput::typeid, ref new PropertyMetadata(GazeInput::UnsetTimeSpan));
-static DependencyProperty^ s_maxRepeatCountProperty = DependencyProperty::RegisterAttached("MaxDwellRepeatCount", int::typeid, GazeInput::typeid, ref new PropertyMetadata(safe_cast<Object^>(0)));
-static DependencyProperty^ s_isSwitchEnabledProperty = DependencyProperty::RegisterAttached("IsSwitchEnabled", bool::typeid, GazeInput::typeid,
-    ref new PropertyMetadata(false, ref new PropertyChangedCallback(&OnIsSwitchEnabledChanged)));
-
-DependencyProperty^ GazeInput::InteractionProperty::get() { return s_interactionProperty; }
-DependencyProperty^ GazeInput::IsCursorVisibleProperty::get() { return s_isCursorVisibleProperty; }
-DependencyProperty^ GazeInput::CursorRadiusProperty::get() { return s_cursorRadiusProperty; }
-DependencyProperty^ GazeInput::GazeElementProperty::get() { return s_gazeElementProperty; }
-DependencyProperty^ GazeInput::FixationDurationProperty::get() { return s_fixationDurationProperty; }
-DependencyProperty^ GazeInput::DwellDurationProperty::get() { return s_dwellDurationProperty; }
-DependencyProperty^ GazeInput::RepeatDelayDurationProperty::get() { return s_repeatDelayDurationProperty; }
-DependencyProperty^ GazeInput::DwellRepeatDurationProperty::get() { return s_dwellRepeatDurationProperty; }
-DependencyProperty^ GazeInput::ThresholdDurationProperty::get() { return s_thresholdDurationProperty; }
-DependencyProperty^ GazeInput::MaxDwellRepeatCountProperty::get() { return s_maxRepeatCountProperty; }
-DependencyProperty^ GazeInput::IsSwitchEnabledProperty::get() { return s_isSwitchEnabledProperty; }
-
-Interaction GazeInput::GetInteraction(UIElement^ element) { return safe_cast<GazeInteraction::Interaction>(element->GetValue(s_interactionProperty)); }
-bool GazeInput::GetIsCursorVisible(UIElement^ element) { return safe_cast<bool>(element->GetValue(s_isCursorVisibleProperty)); }
-int GazeInput::GetCursorRadius(UIElement^ element) { return safe_cast<int>(element->GetValue(s_cursorRadiusProperty)); }
-GazeElement^ GazeInput::GetGazeElement(UIElement^ element) { return safe_cast<GazeElement^>(element->GetValue(s_gazeElementProperty)); }
-TimeSpan GazeInput::GetFixationDuration(UIElement^ element) { return safe_cast<TimeSpan>(element->GetValue(s_fixationDurationProperty)); }
-TimeSpan GazeInput::GetDwellDuration(UIElement^ element) { return safe_cast<TimeSpan>(element->GetValue(s_dwellDurationProperty)); }
-TimeSpan GazeInput::GetRepeatDelayDuration(UIElement^ element) { return safe_cast<TimeSpan>(element->GetValue(s_repeatDelayDurationProperty)); }
-TimeSpan GazeInput::GetDwellRepeatDuration(UIElement^ element) { return safe_cast<TimeSpan>(element->GetValue(s_dwellRepeatDurationProperty)); }
-TimeSpan GazeInput::GetThresholdDuration(UIElement^ element) { return safe_cast<TimeSpan>(element->GetValue(s_thresholdDurationProperty)); }
-int GazeInput::GetMaxDwellRepeatCount(UIElement^ element) { return safe_cast<int>(element->GetValue(s_maxRepeatCountProperty)); }
-bool GazeInput::GetIsSwitchEnabled(UIElement^ element) { return safe_cast<bool>(element->GetValue(s_isSwitchEnabledProperty)); }
-
-void GazeInput::SetInteraction(UIElement^ element, GazeInteraction::Interaction value) { element->SetValue(s_interactionProperty, value); }
-void GazeInput::SetIsCursorVisible(UIElement^ element, bool value) { element->SetValue(s_isCursorVisibleProperty, value); }
-void GazeInput::SetCursorRadius(UIElement^ element, int value) { element->SetValue(s_cursorRadiusProperty, value); }
-void GazeInput::SetGazeElement(UIElement^ element, GazeElement^ value) { element->SetValue(s_gazeElementProperty, value); }
-void GazeInput::SetFixationDuration(UIElement^ element, TimeSpan span) { element->SetValue(s_fixationDurationProperty, span); }
-void GazeInput::SetDwellDuration(UIElement^ element, TimeSpan span) { element->SetValue(s_dwellDurationProperty, span); }
-void GazeInput::SetRepeatDelayDuration(UIElement^ element, TimeSpan span) { element->SetValue(s_repeatDelayDurationProperty, span); }
-void GazeInput::SetDwellRepeatDuration(UIElement^ element, TimeSpan span) { element->SetValue(s_dwellRepeatDurationProperty, span); }
-void GazeInput::SetThresholdDuration(UIElement^ element, TimeSpan span) { element->SetValue(s_thresholdDurationProperty, span); }
-void GazeInput::SetMaxDwellRepeatCount(UIElement^ element, int value) { element->SetValue(s_maxRepeatCountProperty, value); }
-void GazeInput::SetIsSwitchEnabled(UIElement^ element, bool value) { element->SetValue(s_isSwitchEnabledProperty, value); }
-
-GazePointer^ GazeInput::GetGazePointer(Page^ page)
-{
-    return GazePointer::Instance;
-}
-
-void GazeInput::Invoke(UIElement^ element)
-{
-    auto item = GazeTargetItem::GetOrCreate(element);
-    item->Invoke();
-}
-
-void GazeInput::LoadSettings(ValueSet^ settings)
-{
-    GazePointer::Instance->LoadSettings(settings);
-}
-
-bool GazeInput::IsDeviceAvailable::get()
-{
-    return GazePointer::Instance->IsDeviceAvailable;
-}
-
-EventRegistrationToken GazeInput::IsDeviceAvailableChanged::add(EventHandler<Object^>^ handler)
-{
-    return GazePointer::Instance->IsDeviceAvailableChanged += handler;
-}
-
-void GazeInput::IsDeviceAvailableChanged::remove(EventRegistrationToken token)
-{
-    GazePointer::Instance->IsDeviceAvailableChanged -= token;
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
new file mode 100644
index 00000000000..ae95ac6cadc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
@@ -0,0 +1,432 @@
+// 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 Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// Static class primarily providing access to attached properties controlling gaze behavior.
+    /// </summary>
+    [Windows.Foundation.Metadata.WebHostHidden]
+    public class GazeInput
+    {
+        /// <summary>
+        /// Gets the Interaction dependency property
+        /// </summary>
+        public static DependencyProperty InteractionProperty { get; } = DependencyProperty.RegisterAttached("Interaction", typeof(Interaction), typeof(GazeInput), new PropertyMetadata(Interaction.Inherited, new PropertyChangedCallback(OnInteractionChanged)));
+
+        private static void OnInteractionChanged(DependencyObject ob, DependencyPropertyChangedEventArgs args)
+        {
+            var element = ob as FrameworkElement;
+            var interaction = (Interaction)args.NewValue;
+            GazePointerProxy.SetInteraction(element, interaction);
+        }
+
+        /// <summary>
+        /// Gets the IsCursorVisible dependency property
+        /// </summary>
+        public static DependencyProperty IsCursorVisibleProperty { get; } = DependencyProperty.RegisterAttached("IsCursorVisible", typeof(bool), typeof(GazeInput), new PropertyMetadata(true, new PropertyChangedCallback(OnIsCursorVisibleChanged)));
+
+        private static void OnIsCursorVisibleChanged(DependencyObject ob, DependencyPropertyChangedEventArgs args)
+        {
+            GazePointer.Instance.IsCursorVisible = (bool)args.NewValue;
+        }
+
+        /// <summary>
+        /// Gets the CursorRadius dependency property
+        /// </summary>
+        public static DependencyProperty CursorRadiusProperty { get; } = DependencyProperty.RegisterAttached("CursorRadius", typeof(int), typeof(GazeInput), new PropertyMetadata(6, new PropertyChangedCallback(OnCursorRadiusChanged)));
+
+        private static void OnCursorRadiusChanged(DependencyObject ob, DependencyPropertyChangedEventArgs args)
+        {
+            GazePointer.Instance.CursorRadius = (int)args.NewValue;
+        }
+
+        /// <summary>
+        /// Gets the GazeElement dependency property
+        /// </summary>
+        public static DependencyProperty GazeElementProperty { get; } = DependencyProperty.RegisterAttached("GazeElement", typeof(GazeElement), typeof(GazeInput), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets the FixationDuration dependency property
+        /// </summary>
+        public static DependencyProperty FixationDurationProperty { get; } = DependencyProperty.RegisterAttached("FixationDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(UnsetTimeSpan));
+
+        /// <summary>
+        /// Gets the DwellDuration dependency property
+        /// </summary>
+        public static DependencyProperty DwellDurationProperty { get; } = DependencyProperty.RegisterAttached("DwellDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(UnsetTimeSpan));
+
+        /// <summary>
+        /// Gets the RepeatDelayDuration dependency property
+        /// </summary>
+        public static DependencyProperty RepeatDelayDurationProperty { get; } = DependencyProperty.RegisterAttached("RepeatDelayDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(UnsetTimeSpan));
+
+        /// <summary>
+        /// Gets the DwellRepeatDuration dependency property
+        /// </summary>
+        public static DependencyProperty DwellRepeatDurationProperty { get; } = DependencyProperty.RegisterAttached("DwellRepeatDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(UnsetTimeSpan));
+
+        /// <summary>
+        /// Gets the ThresholdDuration dependency property
+        /// </summary>
+        public static DependencyProperty ThresholdDurationProperty { get; } = DependencyProperty.RegisterAttached("ThresholdDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(GazeInput.UnsetTimeSpan));
+
+        /// <summary>
+        /// Gets the MaxDwellRepeatCount dependency property
+        /// </summary>
+        public static DependencyProperty MaxDwellRepeatCountProperty { get; } = DependencyProperty.RegisterAttached("MaxDwellRepeatCount", typeof(int), typeof(GazeInput), new PropertyMetadata(0));
+
+        /// <summary>
+        /// Gets the IsSwitchEnabled dependency property
+        /// </summary>
+        public static DependencyProperty IsSwitchEnabledProperty { get; } = DependencyProperty.RegisterAttached("IsSwitchEnabled", typeof(bool), typeof(GazeInput), new PropertyMetadata(false, new PropertyChangedCallback(OnIsSwitchEnabledChanged)));
+
+        private static void OnIsSwitchEnabledChanged(DependencyObject ob, DependencyPropertyChangedEventArgs args)
+        {
+            GazePointer.Instance.IsSwitchEnabled = (bool)args.NewValue;
+        }
+
+        /// <summary>
+        /// Gets or sets the brush to use when displaying the default indication that gaze entered a control
+        /// </summary>
+        public static Brush DwellFeedbackEnterBrush
+        {
+            get
+            {
+                return GazePointer.Instance.EnterBrush;
+            }
+
+            set
+            {
+                GazePointer.Instance.EnterBrush = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush to use when displaying the default animation for dwell press
+        /// </summary>
+        public static Brush DwellFeedbackProgressBrush
+        {
+            get
+            {
+                return GazePointer.Instance.ProgressBrush;
+            }
+
+            set
+            {
+                GazePointer.Instance.ProgressBrush = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush to use when displaying the default animation for dwell complete
+        /// </summary>
+        public static Brush DwellFeedbackCompleteBrush
+        {
+            get
+            {
+                return GazePointer.Instance.CompleteBrush;
+            }
+
+            set
+            {
+                GazePointer.Instance.CompleteBrush = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the thickness of the lines animated for dwell.
+        /// </summary>
+        public static double DwellStrokeThickness
+        {
+            get
+            {
+                return GazePointer.Instance.DwellStrokeThickness;
+            }
+
+            set
+            {
+                GazePointer.Instance.DwellStrokeThickness = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the interaction default
+        /// </summary>
+        public static Interaction Interaction
+        {
+            get
+            {
+                return GazePointer.Instance.Interaction;
+            }
+
+            set
+            {
+                if (GazePointer.Instance.Interaction != value)
+                {
+                    if (value == GazeInteraction.Interaction.Enabled)
+                    {
+                        GazePointer.Instance.AddRoot(0);
+                    }
+                    else if (GazePointer.Instance.Interaction == GazeInteraction.Interaction.Enabled)
+                    {
+                        GazePointer.Instance.RemoveRoot(0);
+                    }
+
+                    GazePointer.Instance.Interaction = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the status of gaze interaction over that particular XAML element.
+        /// </summary>
+        /// <returns>The status of gaze interaction over that particular XAML element.</returns>
+        public static Interaction GetInteraction(UIElement element)
+        {
+            return (Interaction)element.GetValue(InteractionProperty);
+        }
+
+        /// <summary>
+        /// Gets a boolean indicating whether cursor is shown while user is looking at the school.
+        /// </summary>
+        /// <returns>True the cursor is shown while user is looking at the school; otherwise, false.</returns>
+        public static bool GetIsCursorVisible(UIElement element)
+        {
+            return (bool)element.GetValue(IsCursorVisibleProperty);
+        }
+
+        /// <summary>
+        /// Gets the size of the gaze cursor radius.
+        /// </summary>
+        /// <returns>The size of the gaze cursor radius.</returns>
+        public static int GetCursorRadius(UIElement element)
+        {
+            return (int)element.GetValue(CursorRadiusProperty);
+        }
+
+        /// <summary>
+        /// Gets the GazeElement associated with an UIElement.
+        /// </summary>
+        /// <returns>The GazeElement associated with an UIElement.</returns>
+        public static GazeElement GetGazeElement(UIElement element)
+        {
+            return (GazeElement)element.GetValue(GazeElementProperty);
+        }
+
+        /// <summary>
+        /// Gets the duration for the control to transition from the Enter state to the Fixation state. At this point, a StateChanged event is fired with PointerState set to Fixation. This event should be used to control the earliest visual feedback the application needs to provide to the user about the gaze location. The default is 350ms.
+        /// </summary>
+        /// <returns>Duration for the control to transition from the Enter state to the Fixation state.</returns>
+        public static TimeSpan GetFixationDuration(UIElement element)
+        {
+            return (TimeSpan)element.GetValue(FixationDurationProperty);
+        }
+
+        /// <summary>
+        /// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
+        /// </summary>
+        /// <returns>The duration for the control to transition from the Fixation state to the Dwell state.</returns>
+        public static TimeSpan GetDwellDuration(UIElement element)
+        {
+            return (TimeSpan)element.GetValue(DwellDurationProperty);
+        }
+
+        /// <summary>
+        /// Gets the additional duration for the first repeat to occur. This prevents inadvertent repeated invocation.
+        /// </summary>
+        /// <returns>The additional duration for the first repeat to occur.</returns>
+        public static TimeSpan GetRepeatDelayDuration(UIElement element)
+        {
+            return (TimeSpan)element.GetValue(RepeatDelayDurationProperty);
+        }
+
+        /// <summary>
+        /// Gets the duration of repeated dwell invocations, should the user continue to dwell on the control. The first repeat will occur after an additional delay specified by RepeatDelayDuration. Subsequent repeats happen after every period of DwellRepeatDuration. A control is invoked repeatedly only if MaxDwellRepeatCount is set to greater than zero.
+        /// </summary>
+        /// <returns>The duration of repeated dwell invocations.</returns>
+        public static TimeSpan GetDwellRepeatDuration(UIElement element)
+        {
+            return (TimeSpan)element.GetValue(DwellRepeatDurationProperty);
+        }
+
+        /// <summary>
+        /// Gets the duration that controls when the PointerState moves to either the Enter state or the Exit state. When this duration has elapsed after the user's gaze first enters a control, the PointerState is set to Enter. And when this duration has elapsed after the user's gaze has left the control, the PointerState is set to Exit. In both cases, a StateChanged event is fired. The default is 50ms.
+        /// </summary>
+        /// <returns>The duration that controls when the PointerState moves to either the Enter state or the Exit state.</returns>
+        public static TimeSpan GetThresholdDuration(UIElement element)
+        {
+            return (TimeSpan)element.GetValue(ThresholdDurationProperty);
+        }
+
+        /// <summary>
+        /// Gets the maximum times the control will invoked repeatedly without the user's gaze having to leave and re-enter the control. The default value is zero which disables repeated invocation of a control. Developers can set a higher value to enable repeated invocation.
+        /// </summary>
+        /// <returns>The maximum times the control will invoked repeatedly without the user's gaze having to leave and re-enter the control.</returns>
+        public static int GetMaxDwellRepeatCount(UIElement element)
+        {
+            return (int)element.GetValue(MaxDwellRepeatCountProperty);
+        }
+
+        /// <summary>
+        /// Gets a boolean indicating whether gaze plus switch is enabled.
+        /// </summary>
+        /// <returns>A boolean indicating whether gaze plus switch is enabled.</returns>
+        public static bool GetIsSwitchEnabled(UIElement element)
+        {
+            return (bool)element.GetValue(IsSwitchEnabledProperty);
+        }
+
+        /// <summary>
+        /// Sets the status of gaze interaction over that particular XAML element.
+        /// </summary>
+        public static void SetInteraction(UIElement element, Interaction value)
+        {
+            element.SetValue(InteractionProperty, value);
+        }
+
+        /// <summary>
+        /// Sets a boolean indicating whether cursor is shown while user is looking at the school.
+        /// </summary>
+        public static void SetIsCursorVisible(UIElement element, bool value)
+        {
+            element.SetValue(IsCursorVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the size of the gaze cursor radius.
+        /// </summary>
+        public static void SetCursorRadius(UIElement element, int value)
+        {
+            element.SetValue(CursorRadiusProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the GazeElement associated with an UIElement.
+        /// </summary>
+        public static void SetGazeElement(UIElement element, GazeElement value)
+        {
+            element.SetValue(GazeElementProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the duration for the control to transition from the Enter state to the Fixation state. At this point, a StateChanged event is fired with PointerState set to Fixation. This event should be used to control the earliest visual feedback the application needs to provide to the user about the gaze location. The default is 350ms.
+        /// </summary>
+        public static void SetFixationDuration(UIElement element, TimeSpan span)
+        {
+            element.SetValue(FixationDurationProperty, span);
+        }
+
+        /// <summary>
+        /// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
+        /// </summary>
+        public static void SetDwellDuration(UIElement element, TimeSpan span)
+        {
+            element.SetValue(DwellDurationProperty, span);
+        }
+
+        /// <summary>
+        /// Sets the additional duration for the first repeat to occur.This prevents inadvertent repeated invocation.
+        /// </summary>
+        public static void SetRepeatDelayDuration(UIElement element, TimeSpan span)
+        {
+            element.SetValue(RepeatDelayDurationProperty, span);
+        }
+
+        /// <summary>
+        /// Sets the duration of repeated dwell invocations, should the user continue to dwell on the control. The first repeat will occur after an additional delay specified by RepeatDelayDuration. Subsequent repeats happen after every period of DwellRepeatDuration. A control is invoked repeatedly only if MaxDwellRepeatCount is set to greater than zero.
+        /// </summary>
+        public static void SetDwellRepeatDuration(UIElement element, TimeSpan span)
+        {
+            element.SetValue(DwellRepeatDurationProperty, span);
+        }
+
+        /// <summary>
+        /// Sets the duration that controls when the PointerState moves to either the Enter state or the Exit state. When this duration has elapsed after the user's gaze first enters a control, the PointerState is set to Enter. And when this duration has elapsed after the user's gaze has left the control, the PointerState is set to Exit. In both cases, a StateChanged event is fired. The default is 50ms.
+        /// </summary>
+        public static void SetThresholdDuration(UIElement element, TimeSpan span)
+        {
+            element.SetValue(ThresholdDurationProperty, span);
+        }
+
+        /// <summary>
+        /// Sets the maximum times the control will invoked repeatedly without the user's gaze having to leave and re-enter the control. The default value is zero which disables repeated invocation of a control. Developers can set a higher value to enable repeated invocation.
+        /// </summary>
+        public static void SetMaxDwellRepeatCount(UIElement element, int value)
+        {
+            element.SetValue(MaxDwellRepeatCountProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the boolean indicating whether gaze plus switch is enabled.
+        /// </summary>
+        public static void SetIsSwitchEnabled(UIElement element, bool value)
+        {
+            element.SetValue(IsSwitchEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the GazePointer object.
+        /// </summary>
+        /// <returns>The GazePointer associated with that particular page.</returns>
+        public static GazePointer GetGazePointer(Page page)
+        {
+            return GazePointer.Instance;
+        }
+
+        /// <summary>
+        /// Invoke the default action of the specified UIElement.
+        /// </summary>
+        public static void Invoke(UIElement element)
+        {
+            var item = GazeTargetItem.GetOrCreate(element);
+            item.Invoke();
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a gaze input device is available, and hence whether there is any possibility of gaze events occurring in the application.
+        /// </summary>
+        public static bool IsDeviceAvailable
+        {
+            get
+            {
+                return GazePointer.Instance.IsDeviceAvailable;
+            }
+        }
+
+        /// <summary>
+        /// Event triggered whenever IsDeviceAvailable changes value.
+        /// </summary>
+        public static event EventHandler<object> IsDeviceAvailableChanged
+        {
+            add
+            {
+                GazePointer.Instance.IsDeviceAvailableChanged += value;
+            }
+
+            remove
+            {
+                GazePointer.Instance.IsDeviceAvailableChanged -= value;
+            }
+        }
+
+        /// <summary>
+        /// Loads a settings collection into GazeInput.
+        /// Note: This must be loaded from a UI thread to be valid, since the GazeInput
+        /// instance is tied to the UI thread.
+        /// </summary>
+        public static void LoadSettings(ValueSet settings)
+        {
+            GazePointer.Instance.LoadSettings(settings);
+        }
+
+        internal static readonly TimeSpan UnsetTimeSpan = new TimeSpan(-1);
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
deleted file mode 100644
index 42ef822a8d9..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
+++ /dev/null
@@ -1,251 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "Interaction.h"
-
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-ref class GazeElement;
-ref class GazePointer;
-
-/// <summary>
-/// Static class primarily providing access to attached properties controlling gaze behavior.
-/// </summary>
-[Windows::Foundation::Metadata::WebHostHidden]
-public ref class GazeInput sealed
-{
-public:
-
-    /// <summary>
-    /// Identifyes the Interaction dependency property
-    /// </summary>
-    static property DependencyProperty^ InteractionProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifyes the IsCursorVisible dependency property
-    /// </summary>
-    static property DependencyProperty^ IsCursorVisibleProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifyes the CursorRadius dependency property
-    /// </summary>
-    static property DependencyProperty^ CursorRadiusProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifyes the GazeElement dependency property
-    /// </summary>
-    static property DependencyProperty^ GazeElementProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifyes the FixationDuration dependency property
-    /// </summary>
-    static property DependencyProperty^ FixationDurationProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifies the DwellDuration dependency property
-    /// </summary>
-    static property DependencyProperty^ DwellDurationProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifies the RepeatDelayDuration dependency property
-    /// </summary>
-    static property DependencyProperty^ RepeatDelayDurationProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifies the DwellRepeatDuration dependency property
-    /// </summary>
-    static property DependencyProperty^ DwellRepeatDurationProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifies the ThresholdDuration dependency property
-    /// </summary>
-    static property DependencyProperty^ ThresholdDurationProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifies the MaxDwellRepeatCount dependency property
-    /// </summary>
-    static property DependencyProperty^ MaxDwellRepeatCountProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Identifyes the IsSwitchEnabled dependency property
-    /// </summary>
-    static property DependencyProperty^ IsSwitchEnabledProperty { DependencyProperty^ get(); }
-
-    /// <summary>
-    /// Gets or sets the brush to use when displaying the default indication that gaze entered a control
-    /// </summary>
-    static property Brush^ DwellFeedbackEnterBrush { Brush^ get(); void set(Brush^ value); }
-
-    /// <summary>
-    /// Gets or sets the brush to use when displaying the default animation for dwell press
-    /// </summary>
-    static property Brush^ DwellFeedbackProgressBrush { Brush^ get(); void set(Brush^ value); }
-
-    /// <summary>
-    /// Gets or sets the brush to use when displaying the default animation for dwell complete
-    /// </summary>
-    static property Brush^ DwellFeedbackCompleteBrush { Brush^ get(); void set(Brush^ value); }
-
-    /// <summary>
-    /// Gets or sets the thickness of the lines animated for dwell.
-    /// </summary>
-    static property double DwellStrokeThickness { double get(); void set(double value); }
-
-    /// <summary>
-    /// Gets or sets the interaction default
-    /// </summary>
-    static property GazeInteraction::Interaction Interaction { GazeInteraction::Interaction get(); void set(GazeInteraction::Interaction value); }
-
-    /// <summary>
-    /// Gets the status of gaze interaction over that particular XAML element.
-    /// </summary>
-    static GazeInteraction::Interaction GetInteraction(UIElement^ element);
-
-    /// <summary>
-    /// Gets Boolean indicating whether cursor is shown while user is looking at the school.
-    /// </summary>
-    static bool GetIsCursorVisible(UIElement^ element);
-
-    /// <summary>
-    /// Gets the size of the gaze cursor radius.
-    /// </summary>
-    static int GetCursorRadius(UIElement^ element);
-    
-    /// <summary>
-    /// Gets the GazeElement associated with an UIElement.
-    /// </summary>
-    static GazeElement^ GetGazeElement(UIElement^ element);
-
-    /// <summary>
-    /// Gets the duration for the control to transition from the Enter state to the Fixation state. At this point, a StateChanged event is fired with PointerState set to Fixation. This event should be used to control the earliest visual feedback the application needs to provide to the user about the gaze location. The default is 350ms.
-    /// </summary>
-    static TimeSpan GetFixationDuration(UIElement^ element);
-
-    /// <summary>
-    /// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
-    /// </summary>
-    static TimeSpan GetDwellDuration(UIElement^ element);
-
-    /// <summary>
-    /// Gets the additional duration for the first repeat to occur.This prevents inadvertent repeated invocation.
-    /// </summary>
-    static TimeSpan GetRepeatDelayDuration(UIElement^ element);
-
-    /// <summary>
-    /// Gets the duration of repeated dwell invocations, should the user continue to dwell on the control. The first repeat will occur after an additional delay specified by RepeatDelayDuration. Subsequent repeats happen after every period of DwellRepeatDuration. A control is invoked repeatedly only if MaxDwellRepeatCount is set to greater than zero.
-    /// </summary>
-    static TimeSpan GetDwellRepeatDuration(UIElement^ element);
-    
-    /// <summary>
-    /// Gets the duration that controls when the PointerState moves to either the Enter state or the Exit state. When this duration has elapsed after the user's gaze first enters a control, the PointerState is set to Enter. And when this duration has elapsed after the user's gaze has left the control, the PointerState is set to Exit. In both cases, a StateChanged event is fired. The default is 50ms.
-    /// </summary>
-    static TimeSpan GetThresholdDuration(UIElement^ element);
-	
-    /// <summary>
-    /// Gets the maximum times the control will invoked repeatedly without the user's gaze having to leave and re-enter the control. The default value is zero which disables repeated invocation of a control. Developers can set a higher value to enable repeated invocation.
-    /// </summary>
-    static int GetMaxDwellRepeatCount(UIElement^ element);
-
-    /// <summary>
-    /// Gets the Boolean indicating whether gaze plus switch is enabled.
-    /// </summary>
-    static bool GetIsSwitchEnabled(UIElement^ element);
-
-    /// <summary>
-    /// Sets the status of gaze interaction over that particular XAML element.
-    /// </summary>
-    static void SetInteraction(UIElement^ element, GazeInteraction::Interaction value);
-    
-    /// <summary>
-    /// Sets Boolean indicating whether cursor is shown while user is looking at the school.
-    /// </summary>
-    static void SetIsCursorVisible(UIElement^ element, bool value);
-	
-    /// <summary>
-    /// Sets the size of the gaze cursor radius.
-    /// </summary>
-    static void SetCursorRadius(UIElement^ element, int value);
-
-    /// <summary>
-    /// Sets the GazeElement associated with an UIElement.
-    /// </summary>
-    static void SetGazeElement(UIElement^ element, GazeElement^ value);
-
-    /// <summary>
-    /// Sets the duration for the control to transition from the Enter state to the Fixation state. At this point, a StateChanged event is fired with PointerState set to Fixation. This event should be used to control the earliest visual feedback the application needs to provide to the user about the gaze location. The default is 350ms.
-    /// </summary>
-    static void SetFixationDuration(UIElement^ element, TimeSpan span);
-
-    /// <summary>
-    /// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
-    /// </summary>
-    static void SetDwellDuration(UIElement^ element, TimeSpan span);
-
-    /// <summary>
-    /// Sets the additional duration for the first repeat to occur.This prevents inadvertent repeated invocation.
-    /// </summary>
-    static void SetRepeatDelayDuration(UIElement^ element, TimeSpan span);
-
-    /// <summary>
-    /// Sets the duration of repeated dwell invocations, should the user continue to dwell on the control. The first repeat will occur after an additional delay specified by RepeatDelayDuration. Subsequent repeats happen after every period of DwellRepeatDuration. A control is invoked repeatedly only if MaxDwellRepeatCount is set to greater than zero.
-    /// </summary>
-    static void SetDwellRepeatDuration(UIElement^ element, TimeSpan span);
-
-    /// <summary>
-    /// Sets the duration that controls when the PointerState moves to either the Enter state or the Exit state. When this duration has elapsed after the user's gaze first enters a control, the PointerState is set to Enter. And when this duration has elapsed after the user's gaze has left the control, the PointerState is set to Exit. In both cases, a StateChanged event is fired. The default is 50ms.
-    /// </summary>
-    static void SetThresholdDuration(UIElement^ element, TimeSpan span);
-
-    /// <summary>
-    /// Sets the maximum times the control will invoked repeatedly without the user's gaze having to leave and re-enter the control. The default value is zero which disables repeated invocation of a control. Developers can set a higher value to enable repeated invocation.
-    /// </summary>
-    static void SetMaxDwellRepeatCount(UIElement^ element, int value);
-
-    /// <summary>
-    /// Sets the Boolean indicating whether gaze plus switch is enabled.
-    /// </summary>
-    static void SetIsSwitchEnabled(UIElement^ element, bool value);
-
-    /// <summary>
-    /// Gets the GazePointer object.
-    /// </summary>
-    static GazePointer^ GetGazePointer(Page^ page);
-
-    /// <summary>
-    /// Invoke the default action of the specified UIElement.
-    /// </summary>
-    static void Invoke(UIElement^ element);
-
-    /// <summary>
-    /// Reports whether a gaze input device is available, and hence whether there is any possibility of gaze events occurring in the application.
-    /// </summary>
-    static property bool IsDeviceAvailable { bool get(); }
-
-    /// <summary>
-    /// Event triggered whenever IsDeviceAvailable changes value.
-    /// </summary>
-    static event EventHandler<Object^>^ IsDeviceAvailableChanged
-    {
-        EventRegistrationToken add(EventHandler<Object^>^ handler);
-        void remove(EventRegistrationToken token);
-    }
-
-    /// <summary>
-    /// Loads a settings collection into GazeInput.
-    /// Note: This must be loaded from a UI thread to be valid, since the GazeInput
-    /// instance is tied to the UI thread.
-    /// </summary>
-    static void LoadSettings(ValueSet^ settings);
-
-internal:
-
-    static TimeSpan UnsetTimeSpan;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
deleted file mode 100644
index 9f4840bf23c..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-
-#include "GazePointer.h"
-
-#include "GazeElement.h"
-#include "GazeHistoryItem.h"
-#include "GazeTargetItem.h"
-#include "StateChangedEventArgs.h"
-
-using namespace Platform;
-using namespace Windows::Foundation;
-using namespace Windows::UI::Xaml::Automation::Peers;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-ref class NonInvokeGazeTargetItem sealed : GazeTargetItem
-{
-internal:
-
-    NonInvokeGazeTargetItem()
-        : GazeTargetItem(ref new Page())
-    {
-    }
-
-internal:
-
-    virtual property bool IsInvokable { bool get() override { return false; } }
-
-    void Invoke() override
-    {
-    }
-};
-
-GazePointer^ GazePointer::Instance::get()
-{
-    thread_local static GazePointer^ value;
-    if (value == nullptr)
-    {
-        value = ref new GazePointer();
-    }
-    return value;
-}
-
-void GazePointer::AddRoot(int proxyId)
-{
-    _roots->InsertAt(0, proxyId);
-
-    if (_roots->Size == 1)
-    {
-        _isShuttingDown = false;
-        InitializeGazeInputSource();
-    }
-}
-
-void GazePointer::RemoveRoot(int proxyId)
-{
-    unsigned int index = 0;
-    if (_roots->IndexOf(proxyId, &index))
-    {
-        _roots->RemoveAt(index);
-    }
-    else
-    {
-        assert(false);
-    }
-
-    if (_roots->Size == 0)
-    {
-        _isShuttingDown = true;
-        _gazeCursor->IsGazeEntered = false;
-        DeinitializeGazeInputSource();
-    }
-}
-
-GazePointer::GazePointer()
-{
-    _nonInvokeGazeTargetItem = ref new NonInvokeGazeTargetItem();
-
-    // Default to not filtering sample data
-    Filter = ref new NullFilter();
-
-    _gazeCursor = ref new GazeCursor();
-
-    // timer that gets called back if there gaze samples haven't been received in a while
-    _eyesOffTimer = ref new DispatcherTimer();
-    _eyesOffTimer->Tick += ref new EventHandler<Object^>(this, &GazePointer::OnEyesOff);
-
-    // provide a default of GAZE_IDLE_TIME microseconds to fire eyes off 
-    EyesOffDelay = GAZE_IDLE_TIME;
-
-    InitializeHistogram();
-
-    _devices = ref new Vector<GazeDevicePreview^>();
-    _watcher = GazeInputSourcePreview::CreateWatcher();
-    _watcher->Added += ref new TypedEventHandler<GazeDeviceWatcherPreview^, GazeDeviceWatcherAddedPreviewEventArgs^>(this, &GazePointer::OnDeviceAdded);
-    _watcher->Removed += ref new TypedEventHandler<GazeDeviceWatcherPreview^, GazeDeviceWatcherRemovedPreviewEventArgs^>(this, &GazePointer::OnDeviceRemoved);
-    _watcher->Start();
-}
-
-EventRegistrationToken GazePointer::GazeEvent::add(EventHandler<GazeEventArgs^>^ handler)
-{
-    _gazeEventCount++;
-    return _gazeEvent += handler;
-}
-
-void GazePointer::GazeEvent::remove(EventRegistrationToken token)
-{
-    _gazeEventCount--;
-    _gazeEvent -= token;
-}
-
-void GazePointer::GazeEvent::raise(Object^ sender, GazeEventArgs^ e)
-{
-    _gazeEvent(sender, e);
-}
-
-void GazePointer::OnDeviceAdded(GazeDeviceWatcherPreview^ sender, GazeDeviceWatcherAddedPreviewEventArgs^ args)
-{
-    _devices->Append(args->Device);
-
-    if (_devices->Size == 1)
-    {
-        IsDeviceAvailableChanged(nullptr, nullptr);
-
-        InitializeGazeInputSource();
-    }
-}
-
-void GazePointer::OnDeviceRemoved(GazeDeviceWatcherPreview^ sender, GazeDeviceWatcherRemovedPreviewEventArgs^ args)
-{
-    auto index = 0u;
-    while (index < _devices->Size && _devices->GetAt(index)->Id != args->Device->Id)
-    {
-        index++;
-    }
-
-    if (index < _devices->Size)
-    {
-        _devices->RemoveAt(index);
-    }
-    else
-    {
-        _devices->RemoveAt(0);
-    }
-
-    if (_devices->Size == 0)
-    {
-        IsDeviceAvailableChanged(nullptr, nullptr);
-    }
-}
-
-GazePointer::~GazePointer()
-{
-    _watcher->Added -= _deviceAddedToken;
-    _watcher->Removed -= _deviceRemovedToken;
-
-    if (_gazeInputSource != nullptr)
-    {
-        _gazeInputSource->GazeEntered -= _gazeEnteredToken;
-        _gazeInputSource->GazeMoved -= _gazeMovedToken;
-        _gazeInputSource->GazeExited -= _gazeExitedToken;
-    }
-}
-
-void GazePointer::LoadSettings(ValueSet^ settings)
-{
-    _gazeCursor->LoadSettings(settings);
-    Filter->LoadSettings(settings);
-
-    // TODO Add logic to protect against missing settings
-
-    if (settings->HasKey("GazePointer.FixationDelay"))
-    {
-        _defaultFixation = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.FixationDelay")));
-    }
-
-    if (settings->HasKey("GazePointer.DwellDelay"))
-    {
-        _defaultDwell = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.DwellDelay")));
-    }
-
-    if (settings->HasKey("GazePointer.DwellRepeatDelay"))
-    {
-        _defaultDwellRepeatDelay = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.DwellRepeatDelay")));
-    }
-
-    if (settings->HasKey("GazePointer.RepeatDelay"))
-    {
-        _defaultRepeatDelay = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.RepeatDelay")));
-    }
-
-    if (settings->HasKey("GazePointer.ThresholdDelay"))
-    {
-        _defaultThreshold = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.ThresholdDelay")));
-    }
-
-    // TODO need to set fixation and dwell for all elements
-    if (settings->HasKey("GazePointer.FixationDelay"))
-    {
-        SetElementStateDelay(_offScreenElement, PointerState::Fixation, TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.FixationDelay"))));
-    }
-    if (settings->HasKey("GazePointer.DwellDelay"))
-    {
-        SetElementStateDelay(_offScreenElement, PointerState::Dwell, TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.DwellDelay"))));
-    }
-
-    if (settings->HasKey("GazePointer.GazeIdleTime"))
-    {
-        EyesOffDelay = TimeSpanFromMicroseconds((int)(settings->Lookup("GazePointer.GazeIdleTime")));
-    }
-
-    if (settings->HasKey("GazePointer.IsSwitchEnabled"))
-    {
-        IsSwitchEnabled = (bool)(settings->Lookup("GazePointer.IsSwitchEnabled"));
-    }
-}
-
-void GazePointer::InitializeHistogram()
-{
-    _activeHitTargetTimes = ref new Vector<GazeTargetItem^>();
-
-    _offScreenElement = ref new UserControl();
-    SetElementStateDelay(_offScreenElement, PointerState::Fixation, _defaultFixation);
-    SetElementStateDelay(_offScreenElement, PointerState::Dwell, _defaultDwell);
-
-    _maxHistoryTime = DEFAULT_MAX_HISTORY_DURATION;    // maintain about 3 seconds of history (in microseconds)
-    _gazeHistory = ref new Vector<GazeHistoryItem^>();
-}
-
-void GazePointer::InitializeGazeInputSource()
-{
-    if (!_initialized)
-    {
-        if (_roots->Size != 0 && _devices->Size != 0)
-        {
-            if (_gazeInputSource == nullptr)
-            {
-                _gazeInputSource = GazeInputSourcePreview::GetForCurrentView();
-            }
-
-            if (_gazeInputSource != nullptr)
-            {
-                _gazeEnteredToken = _gazeInputSource->GazeEntered += ref new TypedEventHandler<
-                    GazeInputSourcePreview^, GazeEnteredPreviewEventArgs^>(this, &GazePointer::OnGazeEntered);
-                _gazeMovedToken = _gazeInputSource->GazeMoved += ref new TypedEventHandler<
-                    GazeInputSourcePreview^, GazeMovedPreviewEventArgs^>(this, &GazePointer::OnGazeMoved);
-                _gazeExitedToken = _gazeInputSource->GazeExited += ref new TypedEventHandler<
-                    GazeInputSourcePreview^, GazeExitedPreviewEventArgs^>(this, &GazePointer::OnGazeExited);
-
-                _initialized = true;
-            }
-        }
-    }
-}
-
-void GazePointer::DeinitializeGazeInputSource()
-{
-    if (_initialized)
-    {
-        _initialized = false;
-
-        _gazeInputSource->GazeEntered -= _gazeEnteredToken;
-        _gazeInputSource->GazeMoved -= _gazeMovedToken;
-        _gazeInputSource->GazeExited -= _gazeExitedToken;
-    }
-}
-
-static DependencyProperty^ GetProperty(PointerState state)
-{
-    switch (state)
-    {
-    case PointerState::Fixation: return GazeInput::FixationDurationProperty;
-    case PointerState::Dwell: return GazeInput::DwellDurationProperty;
-    case PointerState::DwellRepeat: return GazeInput::DwellRepeatDurationProperty;
-    case PointerState::Enter: return GazeInput::ThresholdDurationProperty;
-    case PointerState::Exit: return GazeInput::ThresholdDurationProperty;
-    default: return nullptr;
-    }
-}
-
-TimeSpan GazePointer::GetDefaultPropertyValue(PointerState state)
-{
-    switch (state)
-    {
-    case PointerState::Fixation: return _defaultFixation;
-    case PointerState::Dwell: return _defaultDwell;
-    case PointerState::DwellRepeat: return _defaultRepeatDelay;
-    case PointerState::Enter: return _defaultThreshold;
-    case PointerState::Exit: return _defaultThreshold;
-    default: throw ref new NotImplementedException();
-    }
-}
-
-void GazePointer::SetElementStateDelay(UIElement ^element, PointerState relevantState, TimeSpan stateDelay)
-{
-    auto property = GetProperty(relevantState);
-    element->SetValue(property, stateDelay);
-
-    // fix up _maxHistoryTime in case the new param exceeds the history length we are currently tracking
-    auto dwellTime = GetElementStateDelay(element, PointerState::Dwell);
-    auto repeatTime = GetElementStateDelay(element, PointerState::DwellRepeat);
-    _maxHistoryTime = 2 * max(dwellTime, repeatTime);
-}
-
-/// <summary>
-/// Find the parent to inherit properties from.
-/// </summary>
-static UIElement^ GetInheritenceParent(UIElement^ child)
-{
-    // The result value.
-    Object^ parent = nullptr;
-
-    // Get the automation peer...
-    auto peer = FrameworkElementAutomationPeer::FromElement(child);
-    if (peer != nullptr)
-    {
-        // ...if it exists, get the peer's parent...
-        auto peerParent = dynamic_cast<FrameworkElementAutomationPeer^>(peer->Navigate(AutomationNavigationDirection::Parent));
-        if (peerParent != nullptr)
-        {
-            // ...and if it has a parent, get the corresponding object.
-            parent = peerParent->Owner;
-        }
-    }
-
-    // If the above failed to find a parent...
-    if (parent == nullptr)
-    {
-        // ...use the visual parent.
-        parent = VisualTreeHelper::GetParent(child);
-    }
-
-    // Safely pun the value we found to a UIElement reference.
-    return dynamic_cast<UIElement^>(parent);
-}
-
-TimeSpan GazePointer::GetElementStateDelay(UIElement ^element, DependencyProperty^ property, TimeSpan defaultValue)
-{
-    UIElement^ walker = element;
-    Object^ valueAtWalker = walker->GetValue(property);
-
-    while (GazeInput::UnsetTimeSpan.Equals(valueAtWalker) && walker != nullptr)
-    {
-        walker = GetInheritenceParent(walker);
-
-        if (walker != nullptr)
-        {
-            valueAtWalker = walker->GetValue(property);
-        }
-    }
-
-    auto ticks = GazeInput::UnsetTimeSpan.Equals(valueAtWalker) ? defaultValue : safe_cast<TimeSpan>(valueAtWalker);
-
-    return ticks;
-}
-
-TimeSpan GazePointer::GetElementStateDelay(UIElement ^element, PointerState pointerState)
-{
-    auto property = GetProperty(pointerState);
-    auto defaultValue = GetDefaultPropertyValue(pointerState);
-    auto ticks = GetElementStateDelay(element, property, defaultValue);
-
-    switch (pointerState)
-    {
-    case PointerState::Dwell:
-    case PointerState::DwellRepeat:
-        _maxHistoryTime = max(_maxHistoryTime, 2 * ticks);
-        break;
-    }
-
-    return ticks;
-}
-
-void GazePointer::Reset()
-{
-    _activeHitTargetTimes->Clear();
-    _gazeHistory->Clear();
-
-    _maxHistoryTime = DEFAULT_MAX_HISTORY_DURATION;
-}
-
-GazeTargetItem^ GazePointer::GetHitTarget(Point gazePoint)
-{
-    GazeTargetItem^ invokable;
-
-    switch (Window::Current->CoreWindow->ActivationMode)
-    {
-    default:
-        if (!_isAlwaysActivated)
-        {
-            invokable = _nonInvokeGazeTargetItem;
-            break;
-        }
-
-    case CoreWindowActivationMode::ActivatedInForeground:
-    case CoreWindowActivationMode::ActivatedNotForeground:
-        auto elements = VisualTreeHelper::FindElementsInHostCoordinates(gazePoint, nullptr, false);
-        auto first = elements->First();
-        auto element = first->HasCurrent ? first->Current : nullptr;
-
-        invokable = nullptr;
-
-        if (element != nullptr)
-        {
-            invokable = GazeTargetItem::GetOrCreate(element);
-
-            while (element != nullptr && !invokable->IsInvokable)
-            {
-                element = dynamic_cast<UIElement^>(VisualTreeHelper::GetParent(element));
-
-                if (element != nullptr)
-                {
-                    invokable = GazeTargetItem::GetOrCreate(element);
-                }
-            }
-        }
-
-        if (element == nullptr || !invokable->IsInvokable)
-        {
-            invokable = _nonInvokeGazeTargetItem;
-        }
-        else
-        {
-            Interaction interaction;
-            do
-            {
-                interaction = GazeInput::GetInteraction(element);
-                if (interaction == Interaction::Inherited)
-                {
-                    element = GetInheritenceParent(element);
-                }
-            } while (interaction == Interaction::Inherited && element != nullptr);
-
-            if (interaction == Interaction::Inherited)
-            {
-                interaction = GazeInput::Interaction;
-            }
-
-            if (interaction != Interaction::Enabled)
-            {
-                invokable = _nonInvokeGazeTargetItem;
-            }
-        }
-        break;
-    }
-
-    return invokable;
-}
-
-void GazePointer::ActivateGazeTargetItem(GazeTargetItem^ target)
-{
-    unsigned int index;
-    if (!_activeHitTargetTimes->IndexOf(target, &index))
-    {
-        _activeHitTargetTimes->Append(target);
-
-        // calculate the time that the first DwellRepeat needs to be fired after. this will be updated every time a DwellRepeat is 
-        // fired to keep track of when the next one is to be fired after that.
-        auto nextStateTime = GetElementStateDelay(target->TargetElement, PointerState::Enter);
-
-        target->Reset(nextStateTime);
-    }
-}
-
-GazeTargetItem^ GazePointer::ResolveHitTarget(Point gazePoint, TimeSpan timestamp)
-{
-    // TODO: The existance of a GazeTargetItem should be used to indicate that
-    // the target item is invokable. The method of invokation should be stored
-    // within the GazeTargetItem when it is created and not recalculated when
-    // subsequently needed.
-
-    // create GazeHistoryItem to deal with this sample
-    auto target = GetHitTarget(gazePoint);
-    auto historyItem = ref new GazeHistoryItem();
-    historyItem->HitTarget = target;
-    historyItem->Timestamp = timestamp;
-    historyItem->Duration = TimeSpanZero;
-    assert(historyItem->HitTarget != nullptr);
-
-    // create new GazeTargetItem with a (default) total elapsed time of zero if one does not exist already.
-    // this ensures that there will always be an entry for target elements in the code below.
-    ActivateGazeTargetItem(target);
-    target->LastTimestamp = timestamp;
-
-    // find elapsed time since we got the last hit target
-    historyItem->Duration = timestamp - _lastTimestamp;
-    if (historyItem->Duration > MAX_SINGLE_SAMPLE_DURATION)
-    {
-        historyItem->Duration = MAX_SINGLE_SAMPLE_DURATION;
-    }
-    _gazeHistory->Append(historyItem);
-
-    // update the time this particular hit target has accumulated
-    target->DetailedTime += historyItem->Duration;
-
-    // drop the oldest samples from the list until we have samples only 
-    // within the window we are monitoring
-    //
-    // historyItem is the last item we just appended a few lines above. 
-    for (auto evOldest = _gazeHistory->GetAt(0);
-        historyItem->Timestamp - evOldest->Timestamp > _maxHistoryTime;
-        evOldest = _gazeHistory->GetAt(0))
-    {
-        _gazeHistory->RemoveAt(0);
-
-        // subtract the duration obtained from the oldest sample in _gazeHistory
-        auto targetItem = evOldest->HitTarget;
-        assert(targetItem->DetailedTime - evOldest->Duration >= TimeSpanZero);
-        targetItem->DetailedTime -= evOldest->Duration;
-        if (targetItem->ElementState != PointerState::PreEnter)
-        {
-            targetItem->OverflowTime += evOldest->Duration;
-        }
-    }
-
-    _lastTimestamp = timestamp;
-
-    // Return the most recent hit target 
-    // Intuition would tell us that we should return NOT the most recent
-    // hitTarget, but the one with the most accumulated time in 
-    // in the maintained history. But the effect of that is that
-    // the user will feel that they have clicked on the wrong thing
-    // when they are looking at something else.
-    // That is why we return the most recent hitTarget so that 
-    // when its dwell time has elapsed, it will be invoked
-    return target;
-}
-
-void GazePointer::OnEyesOff(Object ^sender, Object ^ea)
-{
-    _eyesOffTimer->Stop();
-
-    CheckIfExiting(_lastTimestamp + EyesOffDelay);
-    RaiseGazePointerEvent(nullptr, PointerState::Enter, EyesOffDelay);
-}
-
-void GazePointer::CheckIfExiting(TimeSpan curTimestamp)
-{
-    for (unsigned int index = 0; index < _activeHitTargetTimes->Size; index++)
-    {
-        auto targetItem = _activeHitTargetTimes->GetAt(index);
-        auto targetElement = targetItem->TargetElement;
-        auto exitDelay = GetElementStateDelay(targetElement, PointerState::Exit);
-
-        auto idleDuration = curTimestamp - targetItem->LastTimestamp;
-        if (targetItem->ElementState != PointerState::PreEnter && idleDuration > exitDelay)
-        {
-            targetItem->ElementState = PointerState::PreEnter;
-
-            // Transitioning to exit - clear the cached fixated element
-            _currentlyFixatedElement = nullptr;
-
-            RaiseGazePointerEvent(targetItem, PointerState::Exit, targetItem->ElapsedTime);
-            targetItem->GiveFeedback();
-
-            _activeHitTargetTimes->RemoveAt(index);
-
-            // remove all history samples referring to deleted hit target
-            for (unsigned i = 0; i < _gazeHistory->Size; )
-            {
-                auto hitTarget = _gazeHistory->GetAt(i)->HitTarget;
-                if (hitTarget->TargetElement == targetElement)
-                {
-                    _gazeHistory->RemoveAt(i);
-                }
-                else
-                {
-                    i++;
-                }
-            }
-
-            // return because only one element can be exited at a time and at this point
-            // we have done everything that we can do
-            return;
-        }
-    }
-}
-
-wchar_t *PointerStates[] = {
-    L"Exit",
-    L"PreEnter",
-    L"Enter",
-    L"Fixation",
-    L"Dwell",
-    L"DwellRepeat"
-};
-
-void GazePointer::RaiseGazePointerEvent(GazeTargetItem^ target, PointerState state, TimeSpan elapsedTime)
-{
-    auto control = target != nullptr ? target->TargetElement : nullptr;
-    //assert(target != _rootElement);
-    auto gpea = ref new StateChangedEventArgs(control, state, elapsedTime);
-    //auto buttonObj = dynamic_cast<Button ^>(target);
-    //if (buttonObj && buttonObj->Content)
-    //{
-    //    String^ buttonText = dynamic_cast<String^>(buttonObj->Content);
-    //    Debug::WriteLine(L"GPE: %s -> %s, %d", buttonText, PointerStates[(int)state], elapsedTime);
-    //}
-    //else
-    //{
-    //    Debug::WriteLine(L"GPE: 0x%08x -> %s, %d", target != nullptr ? target->GetHashCode() : 0, PointerStates[(int)state], elapsedTime);
-    //}
-
-    auto gazeElement = target != nullptr ? GazeInput::GetGazeElement(control) : nullptr;
-
-    if (gazeElement != nullptr)
-    {
-        gazeElement->RaiseStateChanged(control, gpea);
-    }
-
-    if (state == PointerState::Dwell)
-    {
-        auto handled = false;
-
-        if (gazeElement != nullptr)
-        {
-            auto args = ref new DwellInvokedRoutedEventArgs();
-            gazeElement->RaiseInvoked(control, args);
-            handled = args->Handled;
-        }
-
-        if (!handled)
-        {
-            target->Invoke();
-        }
-    }
-}
-
-void GazePointer::OnGazeEntered(GazeInputSourcePreview^ provider, GazeEnteredPreviewEventArgs^ args)
-{
-    //Debug::WriteLine(L"Entered at %ld", args->CurrentPoint->Timestamp);
-    _gazeCursor->IsGazeEntered = true;
-}
-
-void GazePointer::OnGazeMoved(GazeInputSourcePreview^ provider, GazeMovedPreviewEventArgs^ args)
-{
-    if (!_isShuttingDown)
-    {
-        auto intermediatePoints = args->GetIntermediatePoints();
-        for each(auto point in intermediatePoints)
-        {
-            auto position = point->EyeGazePosition;
-            if (position != nullptr)
-            {
-                _gazeCursor->IsGazeEntered = true;
-                ProcessGazePoint(TimeSpanFromMicroseconds(point->Timestamp), position->Value);
-            }
-            else
-            {
-                //Debug::WriteLine(L"Null position eaten at %ld", point->Timestamp);
-            }
-        }
-    }
-}
-
-void GazePointer::OnGazeExited(GazeInputSourcePreview^ provider, GazeExitedPreviewEventArgs^ args)
-{
-    //Debug::WriteLine(L"Exited at %ld", args->CurrentPoint->Timestamp);
-    _gazeCursor->IsGazeEntered = false;
-}
-
-void GazePointer::ProcessGazePoint(TimeSpan timestamp, Point position)
-{
-    auto ea = ref new GazeFilterArgs(position, timestamp);
-
-    auto fa = Filter->Update(ea);
-    _gazeCursor->Position = fa->Location;
-
-    if (_gazeEventCount != 0)
-    {
-        _gazeEventArgs->Set(fa->Location, timestamp);
-        GazeEvent(this, _gazeEventArgs);
-        if (_gazeEventArgs->Handled)
-        {
-            return;
-        }
-    }
-
-    auto targetItem = ResolveHitTarget(fa->Location, fa->Timestamp);
-    assert(targetItem != nullptr);
-
-    //Debug::WriteLine(L"ProcessGazePoint: %llu -> [%d, %d], %llu", hitTarget->GetHashCode(), (int)fa->Location.X, (int)fa->Location.Y, fa->Timestamp);
-
-    // check to see if any element in _hitTargetTimes needs an exit event fired.
-    // this ensures that all exit events are fired before enter event
-    CheckIfExiting(fa->Timestamp);
-
-    PointerState nextState = static_cast<PointerState>(static_cast<int>(targetItem->ElementState) + 1);
-
-    //Debug::WriteLine(L"%llu -> State=%d, Elapsed=%d, NextStateTime=%d", targetItem->TargetElement, targetItem->ElementState, targetItem->ElapsedTime, targetItem->NextStateTime);
-
-    if (targetItem->ElapsedTime > targetItem->NextStateTime)
-    {
-        auto prevStateTime = targetItem->NextStateTime;
-
-        // prevent targetItem from ever actually transitioning into the DwellRepeat state so as
-        // to continuously emit the DwellRepeat event
-        if (nextState != PointerState::DwellRepeat)
-        {
-            targetItem->ElementState = nextState;
-            nextState = static_cast<PointerState>(static_cast<int>(nextState) + 1);     // nextState++
-            targetItem->NextStateTime += GetElementStateDelay(targetItem->TargetElement, nextState);
-
-            if (targetItem->ElementState == PointerState::Dwell)
-            {
-                targetItem->NextStateTime += GetElementStateDelay(targetItem->TargetElement, GazeInput::RepeatDelayDurationProperty, _defaultDwellRepeatDelay);
-            }
-        }
-        else
-        {
-            // move the NextStateTime by one dwell period, while continuing to stay in Dwell state
-            targetItem->NextStateTime += GetElementStateDelay(targetItem->TargetElement, PointerState::DwellRepeat);
-        }
-
-        if (targetItem->ElementState == PointerState::Dwell)
-        {
-            targetItem->RepeatCount++;
-            if (targetItem->MaxDwellRepeatCount < targetItem->RepeatCount)
-            {
-                targetItem->NextStateTime = TimeSpan{ MAXINT64 };
-            }
-        }
-
-        if (targetItem->ElementState == PointerState::Fixation)
-        {
-            // Cache the fixated item
-            _currentlyFixatedElement = targetItem;
-
-            // We are about to transition into the Dwell state
-            // If switch input is enabled, make sure dwell never completes
-            // via eye gaze
-            if (_isSwitchEnabled)
-            {
-                // Don't allow the next state (Dwell) to progress
-                targetItem->NextStateTime = TimeSpan{ MAXINT64 };
-            }
-        }
-
-        RaiseGazePointerEvent(targetItem, targetItem->ElementState, targetItem->ElapsedTime);
-    }
-
-    targetItem->GiveFeedback();
-
-    _eyesOffTimer->Start();
-    _lastTimestamp = fa->Timestamp;
-}
-
-/// <summary>
-/// When in switch mode, will issue a click on the currently fixated element
-/// </summary>
-void GazePointer::Click()
-{
-    if (_isSwitchEnabled &&
-        _currentlyFixatedElement != nullptr)
-    {
-        _currentlyFixatedElement->Invoke();
-    }
-}
-
-/// <summary>
-/// Run device calibration.
-/// </summary>
-IAsyncOperation<bool>^ GazePointer::RequestCalibrationAsync()
-{
-    return _devices->Size == 1 ?
-        _devices->GetAt(0)->RequestCalibrationAsync() :
-        concurrency::create_async([] { return false; });
-}
-
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
new file mode 100644
index 00000000000..1a84b5cb640
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
@@ -0,0 +1,918 @@
+// 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.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.Devices.Input.Preview;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// Class of singleton object coordinating gaze input.
+    /// </summary>
+    public class GazePointer
+    {
+        // units in microseconds
+        private static readonly TimeSpan DEFAULT_FIXATION_DELAY = new TimeSpan(3500000);
+        private static readonly TimeSpan DEFAULT_DWELL_DELAY = new TimeSpan(4000000);
+        private static readonly TimeSpan DEFAULT_DWELL_REPEAT_DELAY = new TimeSpan(4000000);
+        private static readonly TimeSpan DEFAULT_REPEAT_DELAY = new TimeSpan(4000000);
+        private static readonly TimeSpan DEFAULT_THRESHOLD_DELAY = new TimeSpan(500000);
+        private static readonly TimeSpan DEFAULT_MAX_HISTORY_DURATION = new TimeSpan(30000000);
+        private static readonly TimeSpan MAX_SINGLE_SAMPLE_DURATION = new TimeSpan(1000000);
+
+        private static readonly TimeSpan GAZE_IDLE_TIME = new TimeSpan(250000000);
+
+        /// <summary>
+        /// Finalizes an instance of the <see cref="GazePointer"/> class.
+        /// </summary>
+        ~GazePointer()
+        {
+            _watcher.Added -= OnDeviceAdded;
+            _watcher.Removed -= OnDeviceRemoved;
+
+            if (_gazeInputSource != null)
+            {
+                _gazeInputSource.GazeEntered -= OnGazeEntered;
+                _gazeInputSource.GazeMoved -= OnGazeMoved;
+                _gazeInputSource.GazeExited -= OnGazeExited;
+            }
+        }
+
+        /// <summary>
+        /// Loads a settings collection into GazePointer.
+        /// </summary>
+        public void LoadSettings(ValueSet settings)
+        {
+            _gazeCursor.LoadSettings(settings);
+            Filter.LoadSettings(settings);
+
+            // TODO Add logic to protect against missing settings
+            if (settings.ContainsKey("GazePointer.FixationDelay"))
+            {
+                _defaultFixation = new TimeSpan((int)settings["GazePointer.FixationDelay"] * 10);
+            }
+
+            if (settings.ContainsKey("GazePointer.DwellDelay"))
+            {
+                _defaultDwell = new TimeSpan((int)settings["GazePointer.DwellDelay"] * 10);
+            }
+
+            if (settings.ContainsKey("GazePointer.DwellRepeatDelay"))
+            {
+                _defaultDwellRepeatDelay = new TimeSpan((int)settings["GazePointer.DwellRepeatDelay"] * 10);
+            }
+
+            if (settings.ContainsKey("GazePointer.RepeatDelay"))
+            {
+                _defaultRepeatDelay = new TimeSpan((int)settings["GazePointer.RepeatDelay"] * 10);
+            }
+
+            if (settings.ContainsKey("GazePointer.ThresholdDelay"))
+            {
+                _defaultThreshold = new TimeSpan((int)settings["GazePointer.ThresholdDelay"] * 10);
+            }
+
+            // TODO need to set fixation and dwell for all elements
+            if (settings.ContainsKey("GazePointer.FixationDelay"))
+            {
+                SetElementStateDelay(_offScreenElement, PointerState.Fixation, new TimeSpan((int)settings["GazePointer.FixationDelay"] * 10));
+            }
+
+            if (settings.ContainsKey("GazePointer.DwellDelay"))
+            {
+                SetElementStateDelay(_offScreenElement, PointerState.Dwell, new TimeSpan((int)settings["GazePointer.DwellDelay"] * 10));
+            }
+
+            if (settings.ContainsKey("GazePointer.GazeIdleTime"))
+            {
+                EyesOffDelay = new TimeSpan((int)settings["GazePointer.GazeIdleTime"] * 10);
+            }
+
+            if (settings.ContainsKey("GazePointer.IsSwitchEnabled"))
+            {
+                IsSwitchEnabled = (bool)settings["GazePointer.IsSwitchEnabled"];
+            }
+        }
+
+        /// <summary>
+        /// When in switch mode, will issue a click on the currently fixated element
+        /// </summary>
+        public void Click()
+        {
+            if (IsSwitchEnabled &&
+                _currentlyFixatedElement != null)
+            {
+                _currentlyFixatedElement.Invoke();
+            }
+        }
+
+        /// <summary>
+        /// Run device calibration.
+        /// </summary>
+        /// <returns>Task that returns true, if calibration completes successfully; otherwise, false.</returns>
+        public Task<bool> RequestCalibrationAsync()
+        {
+            return _devices.Count == 1 ?
+                _devices[0].RequestCalibrationAsync().AsTask() :
+                Task.FromResult(false);
+        }
+
+        /// <summary>
+        /// Event handler for Gaze related events, of with a <see cref="GazeEventArgs"/> object.
+        /// </summary>
+        public event EventHandler<GazeEventArgs> GazeEvent
+        {
+            add
+            {
+                _gazeEventCount++;
+                _gazeEvent += value;
+            }
+
+            remove
+            {
+                _gazeEventCount--;
+                _gazeEvent -= value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the UIElement representing the cursor.
+        /// </summary>
+        public UIElement CursorElement
+        {
+            get { return _gazeCursor.PopupChild; }
+            set { _gazeCursor.PopupChild = value; }
+        }
+
+        private EventHandler<GazeEventArgs> _gazeEvent;
+
+        private int _gazeEventCount = 0;
+
+        internal Brush EnterBrush { get; set; } = null;
+
+        internal Brush ProgressBrush { get; set; } = new SolidColorBrush(Colors.Green);
+
+        internal Brush CompleteBrush { get; set; } = new SolidColorBrush(Colors.Red);
+
+        internal double DwellStrokeThickness { get; set; } = 2;
+
+        internal Interaction Interaction { get; set; } = Interaction.Disabled;
+
+        internal GazeTargetItem NonInvokeGazeTargetItem { get; }
+
+        internal GazeFeedbackPopupFactory GazeFeedbackPopupFactory { get; } = new GazeFeedbackPopupFactory();
+
+        internal void Reset()
+        {
+            _activeHitTargetTimes.Clear();
+            _gazeHistory.Clear();
+
+            _maxHistoryTime = DEFAULT_MAX_HISTORY_DURATION;
+        }
+
+        internal void SetElementStateDelay(UIElement element, PointerState relevantState, TimeSpan stateDelay)
+        {
+            var property = GetProperty(relevantState);
+            element.SetValue(property, stateDelay);
+
+            // fix up _maxHistoryTime in case the new param exceeds the history length we are currently tracking
+            var dwellTime = GetElementStateDelay(element, PointerState.Dwell);
+            var repeatTime = GetElementStateDelay(element, PointerState.DwellRepeat);
+            _maxHistoryTime = new TimeSpan(2 * Math.Max(dwellTime.Ticks, repeatTime.Ticks));
+        }
+
+        /// <summary>
+        /// Find the parent to inherit properties from.
+        /// </summary>
+        private static UIElement GetInheritenceParent(UIElement child)
+        {
+            // The result value.
+            object parent = null;
+
+            // Get the automation peer...
+            var peer = FrameworkElementAutomationPeer.FromElement(child);
+            if (peer != null)
+            {
+                // ...if it exists, get the peer's parent...
+                var peerParent = peer.Navigate(AutomationNavigationDirection.Parent) as FrameworkElementAutomationPeer;
+                if (peerParent != null)
+                {
+                    // ...and if it has a parent, get the corresponding object.
+                    parent = peerParent.Owner;
+                }
+            }
+
+            // If the above failed to find a parent...
+            if (parent == null)
+            {
+                // ...use the visual parent.
+                parent = VisualTreeHelper.GetParent(child);
+            }
+
+            // Safely pun the value we found to a UIElement reference.
+            return parent as UIElement;
+        }
+
+        internal TimeSpan GetElementStateDelay(UIElement element, DependencyProperty property, TimeSpan defaultValue)
+        {
+            UIElement walker = element;
+            object valueAtWalker = walker.GetValue(property);
+
+            while (GazeInput.UnsetTimeSpan.Equals(valueAtWalker) && walker != null)
+            {
+                walker = GetInheritenceParent(walker);
+
+                if (walker != null)
+                {
+                    valueAtWalker = walker.GetValue(property);
+                }
+            }
+
+            var ticks = GazeInput.UnsetTimeSpan.Equals(valueAtWalker) ? defaultValue : (TimeSpan)valueAtWalker;
+
+            return ticks;
+        }
+
+        internal TimeSpan GetElementStateDelay(UIElement element, PointerState pointerState)
+        {
+            var property = GetProperty(pointerState);
+            var defaultValue = GetDefaultPropertyValue(pointerState);
+            var ticks = GetElementStateDelay(element, property, defaultValue);
+
+            switch (pointerState)
+            {
+                case PointerState.Dwell:
+                case PointerState.DwellRepeat:
+                    _maxHistoryTime = new TimeSpan(Math.Max(_maxHistoryTime.Ticks, 2 * ticks.Ticks));
+                    break;
+            }
+
+            return ticks;
+        }
+
+        // Provide a configurable delay for when the EyesOffDelay event is fired
+        // GOTCHA: this value requires that _eyesOffTimer is instantiated so that it
+        // can update the timer interval
+        internal TimeSpan EyesOffDelay
+        {
+            get
+            {
+                return _eyesOffDelay;
+            }
+
+            set
+            {
+                _eyesOffDelay = value;
+
+                // convert GAZE_IDLE_TIME units (microseconds) to 100-nanosecond units used
+                // by TimeSpan struct
+                _eyesOffTimer.Interval = EyesOffDelay;
+            }
+        }
+
+        // Pluggable filter for eye tracking sample data. This defaults to being set to the
+        // NullFilter which performs no filtering of input samples.
+        internal IGazeFilter Filter { get; set; }
+
+        internal bool IsCursorVisible
+        {
+            get { return _gazeCursor.IsCursorVisible; }
+            set { _gazeCursor.IsCursorVisible = value; }
+        }
+
+        internal int CursorRadius
+        {
+            get { return _gazeCursor.CursorRadius; }
+            set { _gazeCursor.CursorRadius = value; }
+        }
+
+        internal bool IsSwitchEnabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this GazePointer should always be activated or not.
+        /// </summary>
+        public bool IsAlwaysActivated { get; set; }
+
+        private static GazePointer _instance = null;
+
+        internal static GazePointer Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new GazePointer();
+                }
+
+                return _instance;
+            }
+        }
+
+        internal void AddRoot(int proxyId)
+        {
+            _roots.Insert(0, proxyId);
+
+            if (_roots.Count == 1)
+            {
+                _isShuttingDown = false;
+                InitializeGazeInputSource();
+            }
+        }
+
+        internal void RemoveRoot(int proxyId)
+        {
+            int index;
+            if ((index = _roots.IndexOf(proxyId)) != -1)
+            {
+                _roots.RemoveAt(index);
+            }
+            else
+            {
+                Debug.Assert(false, "Invalid proxyId when trying to remove a Root from the GazeProxy");
+            }
+
+            if (_roots.Count == 0)
+            {
+                _isShuttingDown = true;
+                _gazeCursor.IsGazeEntered = false;
+                DeinitializeGazeInputSource();
+            }
+        }
+
+        internal bool IsDeviceAvailable
+        {
+            get
+            {
+                return _devices.Count != 0;
+            }
+        }
+
+        internal event EventHandler<object> IsDeviceAvailableChanged;
+
+        private GazePointer()
+        {
+            NonInvokeGazeTargetItem = new NonInvokeGazeTargetItem();
+
+            // Default to not filtering sample data
+            Filter = new NullFilter();
+
+            _gazeCursor = new GazeCursor();
+
+            // timer that gets called back if there gaze samples haven't been received in a while
+            _eyesOffTimer = new DispatcherTimer();
+            _eyesOffTimer.Tick += OnEyesOff;
+
+            // provide a default of GAZE_IDLE_TIME microseconds to fire eyes off
+            EyesOffDelay = GAZE_IDLE_TIME;
+
+            InitializeHistogram();
+
+            _devices = new List<GazeDevicePreview>();
+            _watcher = GazeInputSourcePreview.CreateWatcher();
+            _watcher.Added += OnDeviceAdded;
+            _watcher.Removed += OnDeviceRemoved;
+            _watcher.Start();
+        }
+
+        private bool _initialized;
+        private bool _isShuttingDown;
+
+        private static DependencyProperty GetProperty(PointerState state)
+        {
+            switch (state)
+            {
+                case PointerState.Fixation: return GazeInput.FixationDurationProperty;
+                case PointerState.Dwell: return GazeInput.DwellDurationProperty;
+                case PointerState.DwellRepeat: return GazeInput.DwellRepeatDurationProperty;
+                case PointerState.Enter: return GazeInput.ThresholdDurationProperty;
+                case PointerState.Exit: return GazeInput.ThresholdDurationProperty;
+                default: return null;
+            }
+        }
+
+        private TimeSpan GetDefaultPropertyValue(PointerState state)
+        {
+            switch (state)
+            {
+                case PointerState.Fixation: return _defaultFixation;
+                case PointerState.Dwell: return _defaultDwell;
+                case PointerState.DwellRepeat: return _defaultRepeatDelay;
+                case PointerState.Enter: return _defaultThreshold;
+                case PointerState.Exit: return _defaultThreshold;
+                default: throw new NotImplementedException();
+            }
+        }
+
+        private void InitializeHistogram()
+        {
+            _activeHitTargetTimes = new List<GazeTargetItem>();
+
+            _offScreenElement = new UserControl();
+            SetElementStateDelay(_offScreenElement, PointerState.Fixation, _defaultFixation);
+            SetElementStateDelay(_offScreenElement, PointerState.Dwell, _defaultDwell);
+
+            _maxHistoryTime = DEFAULT_MAX_HISTORY_DURATION;    // maintain about 3 seconds of history (in microseconds)
+            _gazeHistory = new List<GazeHistoryItem>();
+        }
+
+        private void InitializeGazeInputSource()
+        {
+            if (!_initialized)
+            {
+                if (_roots.Count != 0 && _devices.Count != 0)
+                {
+                    if (_gazeInputSource == null)
+                    {
+                        _gazeInputSource = GazeInputSourcePreview.GetForCurrentView();
+                    }
+
+                    if (_gazeInputSource != null)
+                    {
+                        _gazeInputSource.GazeEntered += OnGazeEntered;
+                        _gazeInputSource.GazeMoved += OnGazeMoved;
+                        _gazeInputSource.GazeExited += OnGazeExited;
+
+                        _initialized = true;
+                    }
+                }
+            }
+        }
+
+        private void DeinitializeGazeInputSource()
+        {
+            if (_initialized)
+            {
+                _initialized = false;
+
+                _gazeInputSource.GazeEntered -= OnGazeEntered;
+                _gazeInputSource.GazeMoved -= OnGazeMoved;
+                _gazeInputSource.GazeExited -= OnGazeExited;
+            }
+        }
+
+        private void ActivateGazeTargetItem(GazeTargetItem target)
+        {
+            if (_activeHitTargetTimes.IndexOf(target) == -1)
+            {
+                _activeHitTargetTimes.Add(target);
+
+                // calculate the time that the first DwellRepeat needs to be fired after. this will be updated every time a DwellRepeat is
+                // fired to keep track of when the next one is to be fired after that.
+                var nextStateTime = GetElementStateDelay(target.TargetElement, PointerState.Enter);
+
+                target.Reset(nextStateTime);
+            }
+        }
+
+        private GazeTargetItem GetHitTarget(Point gazePoint)
+        {
+            GazeTargetItem invokable = null;
+
+            if (!IsAlwaysActivated)
+            {
+                invokable = NonInvokeGazeTargetItem;
+            }
+
+            switch (Window.Current.CoreWindow.ActivationMode)
+            {
+                case CoreWindowActivationMode.ActivatedInForeground:
+                case CoreWindowActivationMode.ActivatedNotForeground:
+                    var elements = VisualTreeHelper.FindElementsInHostCoordinates(gazePoint, null, false);
+                    var element = elements.FirstOrDefault();
+
+                    invokable = null;
+
+                    if (element != null)
+                    {
+                        invokable = GazeTargetItem.GetOrCreate(element);
+
+                        while (element != null && !invokable.IsInvokable)
+                        {
+                            element = VisualTreeHelper.GetParent(element) as UIElement;
+
+                            if (element != null)
+                            {
+                                invokable = GazeTargetItem.GetOrCreate(element);
+                            }
+                        }
+                    }
+
+                    if (element == null || !invokable.IsInvokable)
+                    {
+                        invokable = NonInvokeGazeTargetItem;
+                    }
+                    else
+                    {
+                        Interaction interaction;
+                        do
+                        {
+                            interaction = GazeInput.GetInteraction(element);
+                            if (interaction == Interaction.Inherited)
+                            {
+                                element = GetInheritenceParent(element);
+                            }
+                        }
+                        while (interaction == Interaction.Inherited && element != null);
+
+                        if (interaction == Interaction.Inherited)
+                        {
+                            interaction = GazeInput.Interaction;
+                        }
+
+                        if (interaction != Interaction.Enabled)
+                        {
+                            invokable = NonInvokeGazeTargetItem;
+                        }
+                    }
+
+                    break;
+            }
+
+            return invokable;
+        }
+
+        private GazeTargetItem ResolveHitTarget(Point gazePoint, TimeSpan timestamp)
+        {
+            // TODO: The existance of a GazeTargetItem should be used to indicate that
+            // the target item is invokable. The method of invokation should be stored
+            // within the GazeTargetItem when it is created and not recalculated when
+            // subsequently needed.
+
+            // create GazeHistoryItem to deal with this sample
+            var target = GetHitTarget(gazePoint);
+            GazeHistoryItem historyItem = default;
+            historyItem.HitTarget = target;
+            historyItem.Timestamp = timestamp;
+            historyItem.Duration = TimeSpan.Zero;
+            Debug.Assert(historyItem.HitTarget != null, "historyItem.HitTarget should not be null");
+
+            // create new GazeTargetItem with a (default) total elapsed time of zero if one does not exist already.
+            // this ensures that there will always be an entry for target elements in the code below.
+            ActivateGazeTargetItem(target);
+            target.LastTimestamp = timestamp;
+
+            // find elapsed time since we got the last hit target
+            historyItem.Duration = timestamp - _lastTimestamp;
+            if (historyItem.Duration > MAX_SINGLE_SAMPLE_DURATION)
+            {
+                historyItem.Duration = MAX_SINGLE_SAMPLE_DURATION;
+            }
+
+            _gazeHistory.Add(historyItem);
+
+            // update the time this particular hit target has accumulated
+            target.DetailedTime += historyItem.Duration;
+
+            // drop the oldest samples from the list until we have samples only
+            // within the window we are monitoring
+            //
+            // historyItem is the last item we just appended a few lines above.
+            for (var evOldest = _gazeHistory[0];
+                historyItem.Timestamp - evOldest.Timestamp > _maxHistoryTime;
+                evOldest = _gazeHistory[0])
+            {
+                _gazeHistory.RemoveAt(0);
+
+                // subtract the duration obtained from the oldest sample in _gazeHistory
+                var targetItem = evOldest.HitTarget;
+                Debug.Assert(targetItem.DetailedTime - evOldest.Duration >= TimeSpan.Zero, "DetailedTime of targetItem should be less than oldest history Duration");
+                targetItem.DetailedTime -= evOldest.Duration;
+                if (targetItem.ElementState != PointerState.PreEnter)
+                {
+                    targetItem.OverflowTime += evOldest.Duration;
+                }
+            }
+
+            _lastTimestamp = timestamp;
+
+            // Return the most recent hit target
+            // Intuition would tell us that we should return NOT the most recent
+            // hitTarget, but the one with the most accumulated time in
+            // in the maintained history. But the effect of that is that
+            // the user will feel that they have clicked on the wrong thing
+            // when they are looking at something else.
+            // That is why we return the most recent hitTarget so that
+            // when its dwell time has elapsed, it will be invoked
+            return target;
+        }
+
+        private void CheckIfExiting(TimeSpan curTimestamp)
+        {
+            for (int index = 0; index < _activeHitTargetTimes.Count; index++)
+            {
+                var targetItem = _activeHitTargetTimes[index];
+                var targetElement = targetItem.TargetElement;
+                var exitDelay = GetElementStateDelay(targetElement, PointerState.Exit);
+
+                var idleDuration = curTimestamp - targetItem.LastTimestamp;
+                if (targetItem.ElementState != PointerState.PreEnter && idleDuration > exitDelay)
+                {
+                    targetItem.ElementState = PointerState.PreEnter;
+
+                    // Transitioning to exit - clear the cached fixated element
+                    _currentlyFixatedElement = null;
+
+                    RaiseGazePointerEvent(targetItem, PointerState.Exit, targetItem.ElapsedTime);
+                    targetItem.GiveFeedback();
+
+                    _activeHitTargetTimes.RemoveAt(index);
+
+                    // remove all history samples referring to deleted hit target
+                    for (int i = 0; i < _gazeHistory.Count;)
+                    {
+                        var hitTarget = _gazeHistory[i].HitTarget;
+                        if (hitTarget.TargetElement == targetElement)
+                        {
+                            _gazeHistory.RemoveAt(i);
+                        }
+                        else
+                        {
+                            i++;
+                        }
+                    }
+
+                    // return because only one element can be exited at a time and at this point
+                    // we have done everything that we can do
+                    return;
+                }
+            }
+        }
+
+        /*
+        private const string[] pointerStates =
+        {
+            "Exit",
+            "PreEnter",
+            "Enter",
+            "Fixation",
+            "Dwel",
+            "DwellRepeat"
+        };
+        */
+
+        private void RaiseGazePointerEvent(GazeTargetItem target, PointerState state, TimeSpan elapsedTime)
+        {
+            var control = target?.TargetElement;
+
+            // assert(target != _rootElement);
+            var gpea = new StateChangedEventArgs(control, state, elapsedTime);
+
+            /*
+             * var buttonObj = dynamic_cast<Button >(target);
+             * if (buttonObj && buttonObj.Content)
+             * {
+             *     String buttonText = dynamic_cast<String>(buttonObj.Content);
+             *     Debug.WriteLine("GPE: %s . %s, %d", buttonText, PointerStates[(int)state], elapsedTime);
+             * }
+             * else
+             * {
+             *     Debug.WriteLine("GPE: 0x%08x . %s, %d", target != null ? target.GetHashCode() : 0, PointerStates[(int)state], elapsedTime);
+             * }
+            */
+
+            var gazeElement = target != null ? GazeInput.GetGazeElement(control) : null;
+
+            if (gazeElement != null)
+            {
+                gazeElement.RaiseStateChanged(control, gpea);
+            }
+
+            if (state == PointerState.Dwell)
+            {
+                var handled = false;
+
+                if (gazeElement != null)
+                {
+                    var args = new DwellInvokedRoutedEventArgs();
+                    gazeElement.RaiseInvoked(control, args);
+                    handled = args.Handled;
+                }
+
+                if (!handled)
+                {
+                    target.Invoke();
+                }
+            }
+        }
+
+        private void OnGazeEntered(
+            GazeInputSourcePreview provider,
+            GazeEnteredPreviewEventArgs args)
+        {
+            // Debug.WriteLine("Entered at %ld", args.CurrentPoint.Timestamp);
+            _gazeCursor.IsGazeEntered = true;
+        }
+
+        private void OnGazeMoved(
+            GazeInputSourcePreview provider,
+            GazeMovedPreviewEventArgs args)
+        {
+            if (!_isShuttingDown)
+            {
+                var intermediatePoints = args.GetIntermediatePoints();
+                foreach (var point in intermediatePoints)
+                {
+                    var position = point.EyeGazePosition;
+                    if (position != null)
+                    {
+                        _gazeCursor.IsGazeEntered = true;
+                        ProcessGazePoint(new TimeSpan((long)point.Timestamp * 10), position.Value);
+                    }
+                    else
+                    {
+                        // Debug.WriteLine("Null position eaten at %ld", point.Timestamp);
+                    }
+                }
+            }
+        }
+
+        private void OnGazeExited(
+            GazeInputSourcePreview provider,
+            GazeExitedPreviewEventArgs args)
+        {
+            // Debug.WriteLine("Exited at %ld", args.CurrentPoint.Timestamp);
+            _gazeCursor.IsGazeEntered = false;
+        }
+
+        private void ProcessGazePoint(TimeSpan timestamp, Point position)
+        {
+            var ea = new GazeFilterArgs(position, timestamp);
+
+            var fa = Filter.Update(ea);
+            _gazeCursor.Position = fa.Location;
+
+            if (_gazeEventCount != 0)
+            {
+                _gazeEventArgs.Set(fa.Location, timestamp);
+                _gazeEvent?.Invoke(this, _gazeEventArgs);
+                if (_gazeEventArgs.Handled)
+                {
+                    return;
+                }
+            }
+
+            var targetItem = ResolveHitTarget(fa.Location, fa.Timestamp);
+            Debug.Assert(targetItem != null, "targetItem is null when processing gaze point");
+
+            // Debug.WriteLine("ProcessGazePoint. [{0}, {1}], {2}", (int)fa.Location.X, (int)fa.Location.Y, fa.Timestamp);
+
+            // check to see if any element in _hitTargetTimes needs an exit event fired.
+            // this ensures that all exit events are fired before enter event
+            CheckIfExiting(fa.Timestamp);
+
+            PointerState nextState = (PointerState)((int)targetItem.ElementState + 1);
+
+            // Debug.WriteLine(targetItem.TargetElement.ToString());
+            // Debug.WriteLine("\tState={0}, Elapsed={1}, NextStateTime={2}", targetItem.ElementState, targetItem.ElapsedTime, targetItem.NextStateTime);
+            if (targetItem.ElapsedTime > targetItem.NextStateTime)
+            {
+                var prevStateTime = targetItem.NextStateTime;
+                Debug.WriteLine(prevStateTime);
+
+                // prevent targetItem from ever actually transitioning into the DwellRepeat state so as
+                // to continuously emit the DwellRepeat event
+                if (nextState != PointerState.DwellRepeat)
+                {
+                    targetItem.ElementState = nextState;
+                    nextState = (PointerState)((int)nextState + 1);     // nextState++
+                    targetItem.NextStateTime += GetElementStateDelay(targetItem.TargetElement, nextState);
+
+                    if (targetItem.ElementState == PointerState.Dwell)
+                    {
+                        targetItem.NextStateTime += GetElementStateDelay(targetItem.TargetElement, GazeInput.RepeatDelayDurationProperty, _defaultDwellRepeatDelay);
+                    }
+                }
+                else
+                {
+                    // move the NextStateTime by one dwell period, while continuing to stay in Dwell state
+                    targetItem.NextStateTime += GetElementStateDelay(targetItem.TargetElement, PointerState.DwellRepeat);
+                }
+
+                if (targetItem.ElementState == PointerState.Dwell)
+                {
+                    targetItem.RepeatCount++;
+                    if (targetItem.MaxDwellRepeatCount < targetItem.RepeatCount)
+                    {
+                        targetItem.NextStateTime = new TimeSpan(long.MaxValue);
+                    }
+                }
+
+                if (targetItem.ElementState == PointerState.Fixation)
+                {
+                    // Cache the fixated item
+                    _currentlyFixatedElement = targetItem;
+
+                    // We are about to transition into the Dwell state
+                    // If switch input is enabled, make sure dwell never completes
+                    // via eye gaze
+                    if (IsSwitchEnabled)
+                    {
+                        // Don't allow the next state (Dwell) to progress
+                        targetItem.NextStateTime = new TimeSpan(long.MaxValue);
+                    }
+                }
+
+                RaiseGazePointerEvent(targetItem, targetItem.ElementState, targetItem.ElapsedTime);
+            }
+
+            targetItem.GiveFeedback();
+
+            _eyesOffTimer.Start();
+            _lastTimestamp = fa.Timestamp;
+        }
+
+        private void OnEyesOff(object sender, object ea)
+        {
+            _eyesOffTimer.Stop();
+
+            CheckIfExiting(_lastTimestamp + EyesOffDelay);
+            RaiseGazePointerEvent(null, PointerState.Enter, EyesOffDelay);
+        }
+
+        private void OnDeviceAdded(GazeDeviceWatcherPreview sender, GazeDeviceWatcherAddedPreviewEventArgs args)
+        {
+            _devices.Add(args.Device);
+
+            if (_devices.Count == 1)
+            {
+                IsDeviceAvailableChanged?.Invoke(null, null);
+
+                InitializeGazeInputSource();
+            }
+        }
+
+        private void OnDeviceRemoved(GazeDeviceWatcherPreview sender, GazeDeviceWatcherRemovedPreviewEventArgs args)
+        {
+            var index = 0;
+            while (index < _devices.Count && _devices.ElementAt(index).Id != args.Device.Id)
+            {
+                index++;
+            }
+
+            if (index < _devices.Count)
+            {
+                _devices.RemoveAt(index);
+            }
+            else
+            {
+                _devices.RemoveAt(0);
+            }
+
+            if (_devices.Count == 0)
+            {
+                IsDeviceAvailableChanged?.Invoke(null, null);
+            }
+        }
+
+        private readonly List<int> _roots = new List<int>();
+
+        private readonly DispatcherTimer _eyesOffTimer;
+
+        private readonly GazeCursor _gazeCursor;
+
+        private readonly GazeDeviceWatcherPreview _watcher;
+        private readonly List<GazeDevicePreview> _devices;
+
+        private readonly GazeEventArgs _gazeEventArgs = new GazeEventArgs();
+
+        private TimeSpan _eyesOffDelay;
+
+        // _offScreenElement is a pseudo-element that represents the area outside
+        // the screen so we can track how long the user has been looking outside
+        // the screen and appropriately trigger the EyesOff event
+        private Control _offScreenElement;
+
+        // The value is the total time that FrameworkElement has been gazed at
+        private List<GazeTargetItem> _activeHitTargetTimes;
+
+        // A vector to track the history of observed gaze targets
+        private List<GazeHistoryItem> _gazeHistory;
+        private TimeSpan _maxHistoryTime;
+
+        // Used to determine if exit events need to be fired by adding GAZE_IDLE_TIME to the last
+        // saved timestamp
+        private TimeSpan _lastTimestamp;
+
+        private GazeInputSourcePreview _gazeInputSource;
+
+        private TimeSpan _defaultFixation = DEFAULT_FIXATION_DELAY;
+        private TimeSpan _defaultDwell = DEFAULT_DWELL_DELAY;
+        private TimeSpan _defaultDwellRepeatDelay = DEFAULT_DWELL_REPEAT_DELAY;
+        private TimeSpan _defaultRepeatDelay = DEFAULT_REPEAT_DELAY;
+        private TimeSpan _defaultThreshold = DEFAULT_THRESHOLD_DELAY;
+        private GazeTargetItem _currentlyFixatedElement;
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.h
deleted file mode 100644
index c219947208a..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.h
+++ /dev/null
@@ -1,243 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "GazeCursor.h"
-#include "GazeFeedbackPopupFactory.h"
-#include "GazeEventArgs.h"
-#include "IGazeFilter.h"
-#include "Interaction.h"
-#include "PointerState.h"
-
-using namespace Platform::Collections;
-using namespace Windows::Devices::Input::Preview;
-using namespace Windows::Foundation;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-ref class GazeTargetItem;
-ref struct GazeHistoryItem;
-
-/// <summary>
-/// Class of singleton object coordinating gaze input.
-/// </summary>
-public ref class GazePointer sealed
-{
-private:
-
-    // units in microseconds
-    const TimeSpan DEFAULT_FIXATION_DELAY = TimeSpanFromMicroseconds(350000);
-    const TimeSpan DEFAULT_DWELL_DELAY = TimeSpanFromMicroseconds(400000);
-    const TimeSpan DEFAULT_DWELL_REPEAT_DELAY = TimeSpanFromMicroseconds(400000);
-    const TimeSpan DEFAULT_REPEAT_DELAY = TimeSpanFromMicroseconds(400000);
-    const TimeSpan DEFAULT_THRESHOLD_DELAY = TimeSpanFromMicroseconds(50000);
-    const TimeSpan DEFAULT_MAX_HISTORY_DURATION = TimeSpanFromMicroseconds(3000000);
-    const TimeSpan MAX_SINGLE_SAMPLE_DURATION = TimeSpanFromMicroseconds(100000);
-
-    const TimeSpan GAZE_IDLE_TIME{ 25000000 };
-
-public:
-    virtual ~GazePointer();
-
-    /// <summary>
-    /// Loads a settings collection into GazePointer.
-    /// </summary>
-    void LoadSettings(ValueSet^ settings);
-
-    /// <summary>
-    /// When in switch mode, will issue a click on the currently fixated element
-    /// </summary>
-    void Click();
-
-    /// <summary>
-    /// Run device calibration.
-    /// </summary>
-    IAsyncOperation<bool>^ RequestCalibrationAsync();
-
-    event EventHandler<GazeEventArgs^>^ GazeEvent
-    {
-        EventRegistrationToken add(EventHandler<GazeEventArgs^>^ handler);
-        void remove(EventRegistrationToken token);
-        void raise(Object^ sender, GazeEventArgs^ e);
-    }
-
-	/// <summary>
-	/// The UIElement representing the cursor.
-	/// </summary>
-	property UIElement^ CursorElement
-	{
-		UIElement^ get() { return _gazeCursor->PopupChild; }
-		void set(UIElement^ value) { _gazeCursor->PopupChild = value; }
-	}
-
-private:
-
-    event EventHandler<GazeEventArgs^>^ _gazeEvent;
-    GazeEventArgs^ const _gazeEventArgs = ref new GazeEventArgs();
-    int _gazeEventCount = 0;
-
-internal:
-    Brush^ _enterBrush = nullptr;
-
-    Brush^ _progressBrush = ref new SolidColorBrush(Colors::Green);
-
-    Brush^ _completeBrush = ref new SolidColorBrush(Colors::Red);
-
-    double _dwellStrokeThickness = 2;
-
-    Interaction _interaction = Interaction::Disabled;
-
-    GazeTargetItem^ _nonInvokeGazeTargetItem;
-
-    GazeFeedbackPopupFactory^ _gazeFeedbackPopupFactory = ref new GazeFeedbackPopupFactory();
-
-internal:
-    void Reset();
-    void SetElementStateDelay(UIElement ^element, PointerState pointerState, TimeSpan stateDelay);
-    TimeSpan GetElementStateDelay(UIElement ^element, DependencyProperty^ property, TimeSpan defaultValue);
-    TimeSpan GetElementStateDelay(UIElement^ element, PointerState pointerState);
-
-    // Provide a configurable delay for when the EyesOffDelay event is fired
-    // GOTCHA: this value requires that _eyesOffTimer is instantiated so that it
-    // can update the timer interval 
-    property TimeSpan EyesOffDelay
-    {
-        TimeSpan get() { return _eyesOffDelay; }
-        void set(TimeSpan value)
-        {
-            _eyesOffDelay = value;
-
-            // convert GAZE_IDLE_TIME units (microseconds) to 100-nanosecond units used
-            // by TimeSpan struct
-            _eyesOffTimer->Interval = EyesOffDelay;
-        }
-    }
-
-    // Pluggable filter for eye tracking sample data. This defaults to being set to the
-    // NullFilter which performs no filtering of input samples.
-    property IGazeFilter^ Filter;
-
-    property bool IsCursorVisible
-    {
-        bool get() { return _gazeCursor->IsCursorVisible; }
-        void set(bool value) { _gazeCursor->IsCursorVisible = value; }
-    }
-
-    property int CursorRadius
-    {
-        int get() { return _gazeCursor->CursorRadius; }
-        void set(int value) { _gazeCursor->CursorRadius = value; }
-    }
-
-    property bool IsSwitchEnabled
-    {
-        bool get() { return _isSwitchEnabled; }
-        void set(bool value) { _isSwitchEnabled = value; }
-    }
-
-public:
-
-    property bool IsAlwaysActivated
-    {
-        bool get() { return _isAlwaysActivated; }
-        void set(bool value) { _isAlwaysActivated = value; }
-    }
-
-internal:
-
-    static property GazePointer^ Instance { GazePointer^ get(); }
-    EventRegistrationToken _unloadedToken;
-
-    void AddRoot(int proxyId);
-    void RemoveRoot(int proxyId);
-
-
-    property bool IsDeviceAvailable { bool get() { return _devices->Size != 0; }}
-    event EventHandler<Object^>^ IsDeviceAvailableChanged;
-
-private:
-
-    GazePointer();
-
-private:
-
-    bool _initialized;
-    bool _isShuttingDown;
-
-    TimeSpan GetDefaultPropertyValue(PointerState state);
-
-    void    InitializeHistogram();
-    void    InitializeGazeInputSource();
-    void    DeinitializeGazeInputSource();
-
-    void ActivateGazeTargetItem(GazeTargetItem^ target);
-    GazeTargetItem^          GetHitTarget(Point gazePoint);
-    GazeTargetItem^          ResolveHitTarget(Point gazePoint, TimeSpan timestamp);
-
-    void    CheckIfExiting(TimeSpan curTimestamp);
-    void    RaiseGazePointerEvent(GazeTargetItem^ target, PointerState state, TimeSpan elapsedTime);
-
-    void OnGazeEntered(
-        GazeInputSourcePreview^ provider,
-        GazeEnteredPreviewEventArgs^ args);
-    void OnGazeMoved(
-        GazeInputSourcePreview^ provider,
-        GazeMovedPreviewEventArgs^ args);
-    void OnGazeExited(
-        GazeInputSourcePreview^ provider,
-        GazeExitedPreviewEventArgs^ args);
-
-    void ProcessGazePoint(TimeSpan timestamp, Point position);
-
-    void    OnEyesOff(Object ^sender, Object ^ea);
-
-    void OnDeviceAdded(GazeDeviceWatcherPreview^ sender, GazeDeviceWatcherAddedPreviewEventArgs^ args);
-    void OnDeviceRemoved(GazeDeviceWatcherPreview^ sender, GazeDeviceWatcherRemovedPreviewEventArgs^ args);
-
-private:
-    Vector<int>^ _roots = ref new Vector<int>();
-
-    TimeSpan                               _eyesOffDelay;
-
-    GazeCursor^                         _gazeCursor;
-    DispatcherTimer^                    _eyesOffTimer;
-
-    // _offScreenElement is a pseudo-element that represents the area outside
-    // the screen so we can track how long the user has been looking outside
-    // the screen and appropriately trigger the EyesOff event
-    Control^                            _offScreenElement;
-
-    // The value is the total time that FrameworkElement has been gazed at
-    Vector<GazeTargetItem^>^            _activeHitTargetTimes;
-
-    // A vector to track the history of observed gaze targets
-    Vector<GazeHistoryItem^>^           _gazeHistory;
-    TimeSpan                               _maxHistoryTime;
-
-    // Used to determine if exit events need to be fired by adding GAZE_IDLE_TIME to the last 
-    // saved timestamp
-    TimeSpan                           _lastTimestamp;
-
-    GazeInputSourcePreview^             _gazeInputSource;
-    EventRegistrationToken              _gazeEnteredToken;
-    EventRegistrationToken              _gazeMovedToken;
-    EventRegistrationToken              _gazeExitedToken;
-
-    GazeDeviceWatcherPreview^ _watcher;
-    Vector<GazeDevicePreview^>^ _devices;
-    EventRegistrationToken _deviceAddedToken;
-    EventRegistrationToken _deviceRemovedToken;
-
-    TimeSpan _defaultFixation = DEFAULT_FIXATION_DELAY;
-    TimeSpan _defaultDwell = DEFAULT_DWELL_DELAY;
-    TimeSpan _defaultDwellRepeatDelay = DEFAULT_DWELL_REPEAT_DELAY;
-    TimeSpan _defaultRepeatDelay = DEFAULT_REPEAT_DELAY;
-    TimeSpan _defaultThreshold = DEFAULT_THRESHOLD_DELAY;
-
-    bool                                _isAlwaysActivated;
-    bool                                _isSwitchEnabled;
-    GazeTargetItem^                     _currentlyFixatedElement;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cpp
deleted file mode 100644
index 46c252467f8..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazePointerProxy.h"
-#include "GazePointer.h"
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// The IsLoaded heuristic for testing whether a FrameworkElement is in the visual tree.
-/// </summary>
-static bool IsLoadedHeuristic(FrameworkElement^ element)
-{
-    bool isLoaded;
-
-    // element.Loaded has already happened if it is in the visual tree...
-    auto parent = VisualTreeHelper::GetParent(element);
-    if (parent != nullptr)
-    {
-        isLoaded = true;
-    }
-    // ...or...
-    else
-    {
-        // ...if the element is a dynamically created Popup that has been opened.
-        auto popup = dynamic_cast<Popup^>(element);
-        isLoaded = popup != nullptr && popup->IsOpen;
-    }
-
-    return isLoaded;
-}
-
-DependencyProperty^ GazePointerProxy::GazePointerProxyProperty::get()
-{
-    // The attached property registration.
-    static auto value = DependencyProperty::RegisterAttached("_GazePointerProxy", GazePointerProxy::typeid, GazePointerProxy::typeid,
-        ref new PropertyMetadata(nullptr));
-    return value;
-}
-
-GazePointerProxy::GazePointerProxy(FrameworkElement^ element)
-{
-    static int lastId = 0;
-    lastId++;
-    _uniqueId = lastId;
-
-    _isLoaded = IsLoadedHeuristic(element);
-
-    // Start watching for the element to enter and leave the visual tree.
-    element->Loaded += ref new RoutedEventHandler(this, &GazePointerProxy::OnLoaded);
-    element->Unloaded += ref new RoutedEventHandler(this, &GazePointerProxy::OnUnloaded);
-}
-
-void GazePointerProxy::SetInteraction(FrameworkElement^ element, Interaction value)
-{
-    // Get or create a GazePointerProxy for element.
-    auto proxy = safe_cast<GazePointerProxy^>(element->GetValue(GazePointerProxyProperty));
-    if (proxy == nullptr)
-    {
-        proxy = ref new GazePointerProxy(element);
-        element->SetValue(GazePointerProxyProperty, proxy);
-    }
-
-    // Set the proxy's _isEnabled value.
-    proxy->SetIsEnabled(element, value == Interaction::Enabled);
-}
-
-void GazePointerProxy::SetIsEnabled(Object^ sender, bool value)
-{
-    // If we have a new value...
-    if (_isEnabled != value)
-    {
-        // ...record the new value.
-        _isEnabled = value;
-
-        // If we are in the visual tree...
-        if (_isLoaded)
-        {
-            // ...if we're being enabled...
-            if (value)
-            {
-                // ...count the element in...
-                GazePointer::Instance->AddRoot(_uniqueId);
-            }
-            else
-            {
-                // ...otherwise count the element out.
-                GazePointer::Instance->RemoveRoot(_uniqueId);
-            }
-        }
-    }
-}
-
-void GazePointerProxy::OnLoaded(Object^ sender, RoutedEventArgs^ args)
-{
-    assert(IsLoadedHeuristic(safe_cast<FrameworkElement^>(sender)));
-
-    if (!_isLoaded)
-    {
-        // Record that we are now loaded.
-        _isLoaded = true;
-
-        // If we were previously enabled...
-        if (_isEnabled)
-        {
-            // ...we can now be counted as actively enabled.
-            GazePointer::Instance->AddRoot(_uniqueId);
-        }
-    }
-    else
-    {
-        Debug::WriteLine(L"Unexpected Load");
-    }
-}
-
-void GazePointerProxy::OnUnloaded(Object^ sender, RoutedEventArgs^ args)
-{
-    assert(!IsLoadedHeuristic(safe_cast<FrameworkElement^>(sender)));
-
-    if (_isLoaded)
-    {
-        // Record that we have left the visual tree.
-        _isLoaded = false;
-
-        // If we are set as enabled...
-        if (_isEnabled)
-        {
-            // ...we no longer count as being actively enabled (because we have fallen out the visual tree).
-            GazePointer::Instance->RemoveRoot(_uniqueId);
-        }
-    }
-    else
-    {
-        Debug::WriteLine(L"Unexpected unload");
-    }
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cs
new file mode 100644
index 00000000000..c74edb5dbd6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.cs
@@ -0,0 +1,184 @@
+// 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.Diagnostics;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// Helper class that helps track which UIElements in the visual tree are enabled.
+    ///
+    /// The GazePointer is enabled when one or more UIElements in the visual tree have
+    /// their GazeInput.InteractionProperty value set to Enabled. Notice that there are
+    /// two conditions for enablement: that attached property is Enabled; that the UIElement
+    /// is in the visual tree.
+    /// </summary>
+    internal class GazePointerProxy
+    {
+        /// <summary>
+        /// The IsLoaded heuristic for testing whether a FrameworkElement is in the visual tree.
+        /// </summary>
+        private static bool IsLoadedHeuristic(FrameworkElement element)
+        {
+            bool isLoaded;
+
+            // element.Loaded has already happened if it is in the visual tree...
+            var parent = VisualTreeHelper.GetParent(element);
+            if (parent != null)
+            {
+                isLoaded = true;
+            }
+            else
+            {
+                // ...or...
+                // ...if the element is a dynamically created Popup that has been opened.
+                var popup = element as Popup;
+                isLoaded = popup != null && popup.IsOpen;
+            }
+
+            return isLoaded;
+        }
+
+        /// <summary>
+        /// A private attached property for associating an instance of this class with the UIElement
+        /// to which it refers.
+        /// </summary>
+        private static readonly DependencyProperty _gazePointerProxyProperty = DependencyProperty.RegisterAttached("_GazePointerProxy", typeof(GazePointerProxy), typeof(GazePointerProxy), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Method called when the GazeInput.Interaction attached property is set to a new value.
+        /// </summary>
+        /// <param name="element">The element being set. May be null to indicate whole user interface.</param>
+        /// <param name="value">The interaction enablement value being set.</param>
+        internal static void SetInteraction(FrameworkElement element, Interaction value)
+        {
+            // Get or create a GazePointerProxy for element.
+            if (!(element.GetValue(_gazePointerProxyProperty) is GazePointerProxy proxy))
+            {
+                proxy = new GazePointerProxy(element);
+                element.SetValue(_gazePointerProxyProperty, proxy);
+            }
+
+            // Set the proxy's _isEnabled value.
+            proxy.SetIsEnabled(element, value == Interaction.Enabled);
+        }
+
+        private static int _lastId = 0;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GazePointerProxy"/> class.
+        /// </summary>
+        /// <param name="element">The element proxy is attaching to.</param>
+        private GazePointerProxy(FrameworkElement element)
+        {
+            _lastId++;
+            _uniqueId = _lastId;
+
+            _isLoaded = IsLoadedHeuristic(element);
+
+            // Start watching for the element to enter and leave the visual tree.
+            element.Loaded += OnLoaded;
+            element.Unloaded += OnUnloaded;
+        }
+
+        /// <summary>
+        /// Set the enablement of this proxy.
+        /// </summary>
+        /// <param name="sender">The object setting the enable value.</param>
+        /// <param name="value">The new enable value.</param>
+        private void SetIsEnabled(object sender, bool value)
+        {
+            // If we have a new value...
+            if (_isEnabled != value)
+            {
+                // ...record the new value.
+                _isEnabled = value;
+
+                // If we are in the visual tree...
+                if (_isLoaded)
+                {
+                    // ...if we're being enabled...
+                    if (value)
+                    {
+                        // ...count the element in...
+                        GazePointer.Instance.AddRoot(_uniqueId);
+                    }
+                    else
+                    {
+                        // ...otherwise count the element out.
+                        GazePointer.Instance.RemoveRoot(_uniqueId);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// The handler to be called when the corresponding element joins the visual tree.
+        /// </summary>
+        private void OnLoaded(object sender, RoutedEventArgs args)
+        {
+            Debug.Assert(IsLoadedHeuristic(sender as FrameworkElement), "Should not be loaded if this is called");
+
+            if (!_isLoaded)
+            {
+                // Record that we are now loaded.
+                _isLoaded = true;
+
+                // If we were previously enabled...
+                if (_isEnabled)
+                {
+                    // ...we can now be counted as actively enabled.
+                    GazePointer.Instance.AddRoot(_uniqueId);
+                }
+            }
+            else
+            {
+                Debug.WriteLine("Unexpected Load");
+            }
+        }
+
+        /// <summary>
+        /// The handler to be called when the corresponding element leaves the visual tree.
+        /// </summary>
+        private void OnUnloaded(object sender, RoutedEventArgs args)
+        {
+            Debug.Assert(!IsLoadedHeuristic(sender as FrameworkElement), "Should be loaded if this is called");
+
+            if (_isLoaded)
+            {
+                // Record that we have left the visual tree.
+                _isLoaded = false;
+
+                // If we are set as enabled...
+                if (_isEnabled)
+                {
+                    // ...we no longer count as being actively enabled (because we have fallen out the visual tree).
+                    GazePointer.Instance.RemoveRoot(_uniqueId);
+                }
+            }
+            else
+            {
+                Debug.WriteLine("Unexpected unload");
+            }
+        }
+
+        /// <summary>
+        /// Non-zero ID associated with this instance.
+        /// </summary>
+        private readonly int _uniqueId;
+
+        /// <summary>
+        /// Indicator that the corresponding element is part of the visual tree.
+        /// </summary>
+        private bool _isLoaded;
+
+        /// <summary>
+        /// Boolean representing whether gaze is enabled for the corresponding element and its subtree.
+        /// </summary>
+        private bool _isEnabled;
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.h
deleted file mode 100644
index 291304a02ff..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointerProxy.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "Interaction.h"
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// Helper class that helps track which UIElements in the visual tree are enabled.
-///
-/// The GazePointer is enabled when one or more UIElements in the visual tree have
-/// their GazeInput.InteractionProperty value set to Enabled. Notice that there are
-/// two conditions for enablement: that attached property is Enabled; that the UIElement
-/// is in the visual tree.
-/// </summary>
-private ref class GazePointerProxy sealed
-{
-public:
-
-    /// <summary>
-    /// A private attached property for associating an instance of this class with the UIElement
-    /// to which it refers.
-    /// </summary>
-    static property DependencyProperty^ GazePointerProxyProperty { DependencyProperty^ get(); };
-
-internal:
-
-    /// <summary>
-    /// Method called when the GazeInput.Interaction attached property is set to a new value.
-    /// </summary>
-    /// <param name="element">The element being set. May be null to indicate whole user interface.</param>
-    /// <param name="value">The interaction enablement value being set.</param>
-    static void SetInteraction(FrameworkElement^ element, Interaction value);
-
-private:
-
-    /// <summary>
-    /// Constructor.
-    /// </summary>
-    /// <param name="element">The element proxy is attaching to.</param>
-    GazePointerProxy(FrameworkElement^ element);
-
-    /// <summary>
-    /// Set the enablement of this proxy.
-    /// </summary>
-    /// <param name="sender">The object setting the enable value.</param>
-    /// <param name="value">The new enable value.</param>
-    void SetIsEnabled(Object^ sender, bool value);
-
-    /// <summary>
-    /// The handler to be called when the corresponding element joins the visual tree.
-    /// </summary>
-    void OnLoaded(Object^ sender, RoutedEventArgs^ args);
-
-    /// <summary>
-    /// The handler to be called when the corresponding element leaves the visual tree.
-    /// </summary>
-    void OnUnloaded(Object^ sender, RoutedEventArgs^ args);
-
-private:
-
-    /// <summary>
-    /// Non-zero ID associated with this instance.
-    /// </summary>
-    int _uniqueId;
-
-    /// <summary>
-    /// Indicator that the corresponding element is part of the visual tree.
-    /// </summary>
-    bool _isLoaded;
-
-    /// <summary>
-    /// Boolean representing whether gaze is enabled for the corresponding element and its subtree.
-    /// </summary>
-    bool _isEnabled;
-};
-
-END_NAMESPACE_GAZE_INPUT
-
-
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cpp
deleted file mode 100644
index 2f2cc14fd35..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeSettingsHelper.h"
-
-using namespace concurrency;
-using namespace Windows::ApplicationModel::AppService;
-using namespace Windows::Foundation;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-GazeSettingsHelper::GazeSettingsHelper()
-{
-}
-
-Windows::Foundation::IAsyncAction^ GazeSettingsHelper::RetrieveSharedSettings(ValueSet^ settings)
-{
-    return create_async([settings] {
-        // Setup a new app service connection
-        AppServiceConnection^ connection = ref new AppServiceConnection();
-        connection->AppServiceName = "com.microsoft.ectksettings";
-        connection->PackageFamilyName = "Microsoft.EyeControlToolkitSettings_s9y1p3hwd5qda";
-
-        // open the connection
-        return create_task(connection->OpenAsync()).then([settings, connection](AppServiceConnectionStatus status)
-        {
-            switch (status)
-            {
-            case AppServiceConnectionStatus::Success:
-                // The new connection opened successfully
-                // Set up the inputs and send a message to the service
-                return create_task(connection->SendMessageAsync(ref new ValueSet()));
-                break;
-
-            default:
-            case AppServiceConnectionStatus::AppNotInstalled:
-            case AppServiceConnectionStatus::AppUnavailable:
-            case AppServiceConnectionStatus::AppServiceUnavailable:
-            case AppServiceConnectionStatus::Unknown:
-                // All return paths need to return a task of type AppServiceResponse, so fake it
-                AppServiceResponse ^ response = nullptr;
-                return task_from_result(response);
-            }
-        }).then([settings](AppServiceResponse^ response)
-        {
-            if (response == nullptr)
-            {
-                return;
-            }
-
-            switch (response->Status)
-            {
-            case AppServiceResponseStatus::Success:
-                for each (auto item in response->Message)
-                {
-                    settings->Insert(item->Key, item->Value);
-                }
-                break;
-            default:
-            case AppServiceResponseStatus::Failure:
-            case AppServiceResponseStatus::ResourceLimitsExceeded:
-            case AppServiceResponseStatus::Unknown:
-                break;
-            }
-        });
-    }); // create_async()
-}
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
new file mode 100644
index 00000000000..7bc6f69b5a8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
@@ -0,0 +1,73 @@
+// 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.Threading.Tasks;
+using Windows.ApplicationModel.AppService;
+using Windows.Foundation.Collections;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// A helper class to read a ValueSet and retrieve relevant settings
+    /// </summary>
+    public class GazeSettingsHelper
+    {
+        /// <summary>
+        /// Retrieves settings as a ValueSet from a shared store.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        public static async Task RetrieveSharedSettings(ValueSet settings)
+        {
+            // Setup a new app service connection
+            AppServiceConnection connection = new AppServiceConnection();
+            connection.AppServiceName = "com.microsoft.ectksettings";
+            connection.PackageFamilyName = "Microsoft.EyeControlToolkitSettings_s9y1p3hwd5qda";
+
+            // open the connection
+            var status = await connection.OpenAsync();
+            switch (status)
+            {
+                case AppServiceConnectionStatus.Success:
+                    // The new connection opened successfully
+                    // Set up the inputs and send a message to the service
+                    var response = await connection.SendMessageAsync(new ValueSet());
+
+                    if (response == null)
+                    {
+                        return;
+                    }
+
+                    switch (response.Status)
+                    {
+                        case AppServiceResponseStatus.Success:
+                            foreach (var item in response.Message)
+                            {
+                                settings.Add(item.Key, item.Value);
+                            }
+
+                            break;
+                        default:
+                        case AppServiceResponseStatus.Failure:
+                        case AppServiceResponseStatus.ResourceLimitsExceeded:
+                        case AppServiceResponseStatus.Unknown:
+                            break;
+                    }
+
+                    break;
+
+                default:
+                case AppServiceConnectionStatus.AppNotInstalled:
+                case AppServiceConnectionStatus.AppUnavailable:
+                case AppServiceConnectionStatus.AppServiceUnavailable:
+                case AppServiceConnectionStatus.Unknown:
+                    return;
+            }
+        }
+
+        private GazeSettingsHelper()
+        {
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.h
deleted file mode 100644
index 423c0296683..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-using namespace Windows::Foundation::Collections;
-
-/// <summary>
-/// A helper class to read a ValueSet and retrieve relevant settings
-/// </summary>
-public ref class GazeSettingsHelper sealed
-{
-public:
-
-    /// <summary>
-    /// Retrieves settings as a ValueSet from a shared store.
-    /// </summary>
-    static Windows::Foundation::IAsyncAction^ RetrieveSharedSettings(ValueSet^ settings);
-
-private:
-    GazeSettingsHelper();
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cpp
deleted file mode 100644
index 202a482a222..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeStats.h"
-
-using namespace Platform::Collections;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-GazeStats::GazeStats(int maxHistoryLen)
-{
-    _maxHistoryLen = maxHistoryLen;
-    _history = ref new Vector<Point>();
-}
-
-void GazeStats::Reset()
-{
-    _sumX = 0;
-    _sumY = 0;
-    _sumSquaredX = 0;
-    _sumSquaredY = 0;
-    _history->Clear();
-}
-
-void GazeStats::Update(float x, float y)
-{
-    Point pt(x, y);
-    _history->Append(pt);
-
-    if (_history->Size > _maxHistoryLen)
-    {
-        auto oldest = _history->GetAt(0);
-        _history->RemoveAt(0);
-            
-        _sumX -= oldest.X;
-        _sumY -= oldest.Y;
-        _sumSquaredX -= oldest.X * oldest.X;
-        _sumSquaredY -= oldest.Y * oldest.Y;
-    }
-    _sumX += x;
-    _sumY += y;
-    _sumSquaredX += x * x;
-    _sumSquaredY += y * y;
-}
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
new file mode 100644
index 00000000000..fbb3c4d07cb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
@@ -0,0 +1,105 @@
+// 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 Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// Provides basic stats for eye gaze
+    /// </summary>
+    public class GazeStats
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GazeStats"/> class.
+        /// </summary>
+        /// <param name="maxHistoryLen">Defines the size of the circular history for the calculations of stats</param>
+        public GazeStats(int maxHistoryLen)
+        {
+            _maxHistoryLen = maxHistoryLen;
+            _history = new List<Point>();
+        }
+
+        /// <summary>
+        /// Resets the history, and stats
+        /// </summary>
+        public void Reset()
+        {
+            _sumX = 0;
+            _sumY = 0;
+            _sumSquaredX = 0;
+            _sumSquaredY = 0;
+            _history.Clear();
+        }
+
+        /// <summary>
+        /// Adds a new item to the history
+        /// </summary>
+        /// <param name="x">X axis of the new point</param>
+        /// <param name="y">Y axis of the new point</param>
+        public void Update(float x, float y)
+        {
+            var pt = new Point(x, y);
+            _history.Add(pt);
+
+            if (_history.Count > _maxHistoryLen)
+            {
+                var oldest = _history[0];
+                _history.RemoveAt(0);
+
+                _sumX -= oldest.X;
+                _sumY -= oldest.Y;
+                _sumSquaredX -= oldest.X * oldest.X;
+                _sumSquaredY -= oldest.Y * oldest.Y;
+            }
+
+            _sumX += x;
+            _sumY += y;
+            _sumSquaredX += x * x;
+            _sumSquaredY += y * y;
+        }
+
+        /// <summary>
+        /// Gets the mean of the history of points
+        /// </summary>
+        public Point Mean
+        {
+            get
+            {
+                var count = _history.Count;
+                return new Point((float)_sumX / count, (float)_sumY / count);
+            }
+        }
+
+        /// <summary>
+        /// Gets the StandardDeviation of the items on the history => sqrt(Variance) = sqrt(E[X^2] – (E[X])^2)
+        /// </summary>
+        public Point StandardDeviation
+        {
+            get
+            {
+                var count = _history.Count;
+                if (count < _maxHistoryLen)
+                {
+                    return new Point(0.0f, 0.0f);
+                }
+
+                double meanX = _sumX / count;
+                double meanY = _sumY / count;
+                float stddevX = (float)Math.Sqrt((_sumSquaredX / count) - (meanX * meanX));
+                float stddevY = (float)Math.Sqrt((_sumSquaredY / count) - (meanY * meanY));
+                return new Point(stddevX, stddevY);
+            }
+        }
+
+        private readonly int _maxHistoryLen;
+        private readonly List<Point> _history;
+        private double _sumX;
+        private double _sumY;
+        private double _sumSquaredX;
+        private double _sumSquaredY;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.h
deleted file mode 100644
index a3959151326..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-using namespace Platform::Collections;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-public ref class GazeStats sealed
-{
-public:
-    GazeStats(int maxHistoryLen);
-    void Reset();
-    void Update(float x, float y);
-
-    property Point Mean
-    {
-        Point get()
-        {
-            UINT count = _history->Size;
-            return Point((float)_sumX / count, (float)_sumY / count);
-        }
-    }
-
-    //
-    // StdDev = sqrt(Variance) = sqrt(E[X^2] � (E[X])^2)
-    //
-    property Point StandardDeviation
-    {
-        Point get()
-        {
-            UINT count = _history->Size;
-            if (count < _maxHistoryLen)
-            {
-                return Point(0.0f, 0.0f);
-            }
-            double meanX = _sumX / count;
-            double meanY = _sumY / count;
-            float stddevX = (float)sqrt((_sumSquaredX / count) - (meanX * meanX));
-            float stddevY = (float)sqrt((_sumSquaredY / count) - (meanY * meanY));
-            return Point(stddevX, stddevY);
-        }
-    }
-
-private:
-    UINT            _maxHistoryLen;
-    double          _sumX;
-    double          _sumY;
-    double          _sumSquaredX;
-    double          _sumSquaredY;
-    Vector<Point>^  _history;
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cpp
deleted file mode 100644
index bfc9a7ea285..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "GazeTargetItem.h"
-#include "GazePointer.h"
-
-#include "GazeElement.h"
-#include "GazeFeedbackPopupFactory.h"
-
-using namespace Windows::UI::Xaml::Automation;
-using namespace Windows::UI::Xaml::Automation::Provider;
-using namespace Windows::UI::Xaml::Automation::Peers;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-static DependencyProperty^ GazeTargetItemProperty = DependencyProperty::RegisterAttached("_GazeTargetItem", GazeTargetItem::typeid, GazeTargetItem::typeid, ref new PropertyMetadata(nullptr));
-
-template<PatternInterface P, typename T>
-ref class PatternGazeTargetItem abstract : public GazeTargetItem
-{
-internal:
-
-    PatternGazeTargetItem(UIElement^ element)
-        : GazeTargetItem(element)
-    {
-    }
-
-    static T^ GetPattern(AutomationPeer^ peer)
-    {
-        auto pattern = peer->GetPattern(P);
-        return safe_cast<T^>(pattern);
-    }
-
-    static bool IsCandidate(AutomationPeer^ peer)
-    {
-        auto provider = GetPattern(peer);
-        return provider != nullptr;
-    }
-
-    void Invoke() override sealed
-    {
-        auto peer = FrameworkElementAutomationPeer::FromElement(TargetElement);
-        auto provider = GetPattern(peer);
-        Invoke(provider);
-    }
-
-    virtual void Invoke(T^ provider) = 0;
-};
-
-ref class InvokePatternGazeTargetItem : public PatternGazeTargetItem<PatternInterface::Invoke, IInvokeProvider>
-{
-internal:
-
-    InvokePatternGazeTargetItem(UIElement^ element)
-        : PatternGazeTargetItem(element)
-    {
-    }
-
-    void Invoke(IInvokeProvider^ provider) override sealed
-    {
-        provider->Invoke();
-    }
-};
-
-ref class TogglePatternGazeTargetItem : public PatternGazeTargetItem<PatternInterface::Toggle, IToggleProvider>
-{
-internal:
-
-    TogglePatternGazeTargetItem(UIElement^ element)
-        : PatternGazeTargetItem(element)
-    {
-    }
-
-    void Invoke(IToggleProvider^ provider) override
-    {
-        provider->Toggle();
-    }
-};
-
-ref class SelectionItemPatternGazeTargetItem : public PatternGazeTargetItem<PatternInterface::SelectionItem, ISelectionItemProvider>
-{
-internal:
-
-    SelectionItemPatternGazeTargetItem(UIElement^ element)
-        : PatternGazeTargetItem(element)
-    {
-    }
-
-    void Invoke(ISelectionItemProvider^ provider) override
-    {
-        provider->Select();
-    }
-};
-
-ref class ExpandCollapsePatternGazeTargetItem : public PatternGazeTargetItem<PatternInterface::ExpandCollapse, IExpandCollapseProvider>
-{
-internal:
-
-    ExpandCollapsePatternGazeTargetItem(UIElement^ element)
-        : PatternGazeTargetItem(element)
-    {
-    }
-
-    void Invoke(IExpandCollapseProvider^ provider) override
-    {
-        switch (provider->ExpandCollapseState)
-        {
-        case ExpandCollapseState::Collapsed:
-            provider->Expand();
-            break;
-
-        case ExpandCollapseState::Expanded:
-            provider->Collapse();
-            break;
-        }
-    }
-};
-
-ref class ComboBoxItemGazeTargetItem sealed : GazeTargetItem
-{
-internal:
-
-    ComboBoxItemGazeTargetItem(UIElement^ element)
-        : GazeTargetItem(element)
-    {
-    }
-
-    void Invoke() override
-    {
-        auto peer = FrameworkElementAutomationPeer::FromElement(TargetElement);
-        auto comboBoxItemAutomationPeer = dynamic_cast<ComboBoxItemAutomationPeer^>(peer);
-        auto comboBoxItem = safe_cast<ComboBoxItem^>(comboBoxItemAutomationPeer->Owner);
-
-        AutomationPeer^ ancestor = comboBoxItemAutomationPeer;
-        auto comboBoxAutomationPeer = dynamic_cast<ComboBoxAutomationPeer^>(ancestor);
-        while (comboBoxAutomationPeer == nullptr)
-        {
-            ancestor = safe_cast<AutomationPeer^>(ancestor->Navigate(AutomationNavigationDirection::Parent));
-            comboBoxAutomationPeer = dynamic_cast<ComboBoxAutomationPeer^>(ancestor);
-        }
-
-        comboBoxItem->IsSelected = true;
-        comboBoxAutomationPeer->Collapse();
-    }
-};
-
-ref class PivotItemGazeTargetItem sealed : GazeTargetItem
-{
-internal:
-
-    PivotItemGazeTargetItem(UIElement^ element)
-        : GazeTargetItem(element)
-    {
-    }
-
-    void Invoke() override
-    {
-        auto headerItem = safe_cast<PivotHeaderItem^>(TargetElement);
-        auto headerPanel = safe_cast<PivotHeaderPanel^>(VisualTreeHelper::GetParent(headerItem));
-        unsigned index;
-        headerPanel->Children->IndexOf(headerItem, &index);
-
-        DependencyObject^ walker = headerPanel;
-        Pivot^ pivot;
-        do
-        {
-            walker = VisualTreeHelper::GetParent(walker);
-            pivot = dynamic_cast<Pivot^>(walker);
-        } while (pivot == nullptr);
-
-        pivot->SelectedIndex = index;
-    }
-};
-
-GazeTargetItem^ GazeTargetItem::GetOrCreate(UIElement^ element)
-{
-    GazeTargetItem^ item;
-
-    auto value = element->ReadLocalValue(GazeTargetItemProperty);
-
-    if (value != DependencyProperty::UnsetValue)
-    {
-        item = safe_cast<GazeTargetItem^>(value);
-    }
-    else
-    {
-        auto peer = FrameworkElementAutomationPeer::FromElement(element);
-
-        if (peer == nullptr)
-        {
-            if (dynamic_cast<PivotHeaderItem^>(element) != nullptr)
-            {
-                item = ref new PivotItemGazeTargetItem(element);
-            }
-            else
-            {
-                item = GazePointer::Instance->_nonInvokeGazeTargetItem;
-            }
-        }
-        else if (InvokePatternGazeTargetItem::IsCandidate(peer))
-        {
-            item = ref new InvokePatternGazeTargetItem(element);
-        }
-        else if (TogglePatternGazeTargetItem::IsCandidate(peer))
-        {
-            item = ref new TogglePatternGazeTargetItem(element);
-        }
-        else if (SelectionItemPatternGazeTargetItem::IsCandidate(peer))
-        {
-            item = ref new SelectionItemPatternGazeTargetItem(element);
-        }
-        else if (ExpandCollapsePatternGazeTargetItem::IsCandidate(peer))
-        {
-            item = ref new ExpandCollapsePatternGazeTargetItem(element);
-        }
-        else if (dynamic_cast<ComboBoxItemAutomationPeer^>(peer) != nullptr)
-        {
-            item = ref new ComboBoxItemGazeTargetItem(element);
-        }
-        else
-        {
-            item = GazePointer::Instance->_nonInvokeGazeTargetItem;
-        }
-
-        element->SetValue(GazeTargetItemProperty, item);
-    }
-
-    return item;
-}
-
-void GazeTargetItem::RaiseProgressEvent(DwellProgressState state)
-{
-    // TODO: We should eliminate non-invokable controls before we arrive here!
-    if (dynamic_cast<Page^>(TargetElement) != nullptr)
-    {
-        return;
-    }
-
-    if (_notifiedProgressState != state || state == DwellProgressState::Progressing)
-    {
-        auto handled = false;
-
-        auto gazeElement = GazeInput::GetGazeElement(TargetElement);
-        if (gazeElement != nullptr)
-        {
-            handled = gazeElement->RaiseProgressFeedback(TargetElement, state, ElapsedTime - _prevStateTime, _nextStateTime - _prevStateTime);
-        }
-
-        if (!handled && state != DwellProgressState::Idle)
-        {
-            if (_feedbackPopup == nullptr)
-            {
-                _feedbackPopup = GazePointer::Instance->_gazeFeedbackPopupFactory->Get();
-            }
-
-            auto control = safe_cast<FrameworkElement^>(TargetElement);
-
-            auto transform = control->TransformToVisual(_feedbackPopup);
-            auto bounds = transform->TransformBounds(*ref new Rect(*ref new Point(0, 0),
-                *ref new Size(safe_cast<float>(control->ActualWidth), safe_cast<float>(control->ActualHeight))));
-            auto rectangle = safe_cast<::Windows::UI::Xaml::Shapes::Rectangle^>(_feedbackPopup->Child);
-
-            if (state == DwellProgressState::Progressing)
-            {
-                auto progress = ((double)(ElapsedTime - _prevStateTime).Duration) / (_nextStateTime - _prevStateTime).Duration;
-
-                if (0 <= progress && progress < 1)
-                {
-                    rectangle->Stroke = GazeInput::DwellFeedbackProgressBrush;
-                    rectangle->Width = (1 - progress) * bounds.Width;
-                    rectangle->Height = (1 - progress) * bounds.Height;
-
-                    _feedbackPopup->HorizontalOffset = bounds.Left + progress * bounds.Width / 2;
-                    _feedbackPopup->VerticalOffset = bounds.Top + progress * bounds.Height / 2;
-                }
-            }
-            else
-            {
-                rectangle->Stroke = state == DwellProgressState::Fixating ?
-                    GazeInput::DwellFeedbackEnterBrush : GazeInput::DwellFeedbackCompleteBrush;
-                rectangle->Width = bounds.Width;
-                rectangle->Height = bounds.Height;
-
-                _feedbackPopup->HorizontalOffset = bounds.Left;
-                _feedbackPopup->VerticalOffset = bounds.Top;
-            }
-
-            _feedbackPopup->IsOpen = true;
-        }
-        else
-        {
-            if (_feedbackPopup != nullptr)
-            {
-                GazePointer::Instance->_gazeFeedbackPopupFactory->Return(_feedbackPopup);
-                _feedbackPopup = nullptr;
-            }
-        }
-    }
-
-    _notifiedProgressState = state;
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
new file mode 100644
index 00000000000..b6f64bd181e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
@@ -0,0 +1,239 @@
+// 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 Windows.Foundation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal abstract class GazeTargetItem
+    {
+        private static readonly DependencyProperty _gazeTargetItemProperty = DependencyProperty.RegisterAttached("_GazeTargetItem", typeof(GazeTargetItem), typeof(GazeTargetItem), new PropertyMetadata(null));
+
+        internal TimeSpan DetailedTime { get; set; }
+
+        internal TimeSpan OverflowTime { get; set; }
+
+        internal TimeSpan ElapsedTime
+        {
+            get { return DetailedTime + OverflowTime; }
+        }
+
+        internal TimeSpan NextStateTime { get; set; }
+
+        internal TimeSpan LastTimestamp { get; set; }
+
+        internal PointerState ElementState { get; set; }
+
+        internal UIElement TargetElement { get; set; }
+
+        internal int RepeatCount { get; set; }
+
+        internal int MaxDwellRepeatCount { get; set; }
+
+        internal GazeTargetItem(UIElement target)
+        {
+            TargetElement = target;
+        }
+
+        internal static GazeTargetItem GetOrCreate(UIElement element)
+        {
+            GazeTargetItem item;
+
+            var value = element.ReadLocalValue(_gazeTargetItemProperty);
+
+            if (value != DependencyProperty.UnsetValue)
+            {
+                item = (GazeTargetItem)value;
+            }
+            else
+            {
+                var peer = FrameworkElementAutomationPeer.FromElement(element);
+
+                if (peer == null)
+                {
+                    if (element is PivotHeaderItem)
+                    {
+                        item = new PivotItemGazeTargetItem(element);
+                    }
+                    else
+                    {
+                        item = GazePointer.Instance.NonInvokeGazeTargetItem;
+                    }
+                }
+                else if (peer.GetPattern(PatternInterface.Invoke) is IInvokeProvider)
+                {
+                    item = new InvokePatternGazeTargetItem(element);
+                }
+                else if (peer.GetPattern(PatternInterface.Toggle) is IToggleProvider)
+                {
+                    item = new TogglePatternGazeTargetItem(element);
+                }
+                else if (peer.GetPattern(PatternInterface.SelectionItem) is ISelectionItemProvider)
+                {
+                    item = new SelectionItemPatternGazeTargetItem(element);
+                }
+                else if (peer.GetPattern(PatternInterface.ExpandCollapse) is IExpandCollapseProvider)
+                {
+                    item = new ExpandCollapsePatternGazeTargetItem(element);
+                }
+                else if (peer is ComboBoxItemAutomationPeer)
+                {
+                    item = new ComboBoxItemGazeTargetItem(element);
+                }
+                else
+                {
+                    item = GazePointer.Instance.NonInvokeGazeTargetItem;
+                }
+
+                element.SetValue(_gazeTargetItemProperty, item);
+            }
+
+            return item;
+        }
+
+        internal abstract void Invoke();
+
+        internal virtual bool IsInvokable
+        {
+            get { return true; }
+        }
+
+        internal void Reset(TimeSpan nextStateTime)
+        {
+            ElementState = PointerState.PreEnter;
+            DetailedTime = TimeSpan.Zero;
+            OverflowTime = TimeSpan.Zero;
+            NextStateTime = nextStateTime;
+            RepeatCount = 0;
+            MaxDwellRepeatCount = GazeInput.GetMaxDwellRepeatCount(TargetElement);
+        }
+
+        internal void GiveFeedback()
+        {
+            if (_nextStateTime != NextStateTime)
+            {
+                _prevStateTime = _nextStateTime;
+                _nextStateTime = NextStateTime;
+            }
+
+            if (ElementState != _notifiedPointerState)
+            {
+                switch (ElementState)
+                {
+                    case PointerState.Enter:
+                        RaiseProgressEvent(DwellProgressState.Fixating);
+                        break;
+
+                    case PointerState.Dwell:
+                    case PointerState.Fixation:
+                        RaiseProgressEvent(DwellProgressState.Progressing);
+                        break;
+
+                    case PointerState.Exit:
+                    case PointerState.PreEnter:
+                        RaiseProgressEvent(DwellProgressState.Idle);
+                        break;
+                }
+
+                _notifiedPointerState = ElementState;
+            }
+            else if (ElementState == PointerState.Dwell || ElementState == PointerState.Fixation)
+            {
+                if (RepeatCount <= MaxDwellRepeatCount)
+                {
+                    RaiseProgressEvent(DwellProgressState.Progressing);
+                }
+                else
+                {
+                    RaiseProgressEvent(DwellProgressState.Complete);
+                }
+            }
+        }
+
+        private void RaiseProgressEvent(DwellProgressState state)
+        {
+            // TODO: We should eliminate non-invokable controls before we arrive here!
+            if (!(TargetElement is Page))
+            {
+                return;
+            }
+
+            if (_notifiedProgressState != state || state == DwellProgressState.Progressing)
+            {
+                var handled = false;
+
+                var gazeElement = GazeInput.GetGazeElement(TargetElement);
+                if (gazeElement != null)
+                {
+                    handled = gazeElement.RaiseProgressFeedback(TargetElement, state, ElapsedTime - _prevStateTime, _nextStateTime - _prevStateTime);
+                }
+
+                if (!handled && state != DwellProgressState.Idle)
+                {
+                    if (_feedbackPopup == null)
+                    {
+                        _feedbackPopup = GazePointer.Instance.GazeFeedbackPopupFactory.Get();
+                    }
+
+                    var control = TargetElement as FrameworkElement;
+
+                    var transform = control.TransformToVisual(_feedbackPopup);
+                    var bounds = transform.TransformBounds(new Rect(
+                        new Point(0, 0),
+                        new Size((float)control.ActualWidth, (float)control.ActualHeight)));
+                    var rectangle = (Windows.UI.Xaml.Shapes.Rectangle)_feedbackPopup.Child;
+
+                    if (state == DwellProgressState.Progressing)
+                    {
+                        var progress = ((double)(ElapsedTime - _prevStateTime).Ticks) / (_nextStateTime - _prevStateTime).Ticks;
+
+                        if (progress >= 0 && progress < 1)
+                        {
+                            rectangle.Stroke = GazeInput.DwellFeedbackProgressBrush;
+                            rectangle.Width = (1 - progress) * bounds.Width;
+                            rectangle.Height = (1 - progress) * bounds.Height;
+
+                            _feedbackPopup.HorizontalOffset = bounds.Left + (progress * bounds.Width / 2);
+                            _feedbackPopup.VerticalOffset = bounds.Top + (progress * bounds.Height / 2);
+                        }
+                    }
+                    else
+                    {
+                        rectangle.Stroke = state == DwellProgressState.Fixating ?
+                            GazeInput.DwellFeedbackEnterBrush : GazeInput.DwellFeedbackCompleteBrush;
+                        rectangle.Width = bounds.Width;
+                        rectangle.Height = bounds.Height;
+
+                        _feedbackPopup.HorizontalOffset = bounds.Left;
+                        _feedbackPopup.VerticalOffset = bounds.Top;
+                    }
+
+                    _feedbackPopup.IsOpen = true;
+                }
+                else
+                {
+                    if (_feedbackPopup != null)
+                    {
+                        GazePointer.Instance.GazeFeedbackPopupFactory.Return(_feedbackPopup);
+                        _feedbackPopup = null;
+                    }
+                }
+            }
+
+            _notifiedProgressState = state;
+        }
+
+        private PointerState _notifiedPointerState = PointerState.Exit;
+        private TimeSpan _prevStateTime;
+        private TimeSpan _nextStateTime;
+        private DwellProgressState _notifiedProgressState = DwellProgressState.Idle;
+        private Popup _feedbackPopup;
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.h
deleted file mode 100644
index d96d22f1b20..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "DwellProgressState.h"
-#include "GazeInput.h"
-#include "PointerState.h"
-
-using namespace Windows::Foundation;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-private ref class GazeTargetItem abstract
-{
-internal:
-    property TimeSpan DetailedTime;
-    property TimeSpan OverflowTime;
-    property TimeSpan ElapsedTime { TimeSpan get() { return DetailedTime + OverflowTime; } }
-    property TimeSpan NextStateTime;
-    property TimeSpan LastTimestamp;
-    property PointerState ElementState;
-    property UIElement^ TargetElement;
-    property int RepeatCount;
-    property int MaxDwellRepeatCount;
-
-    GazeTargetItem(UIElement^ target)
-    {
-        TargetElement = target;
-    }
-
-    static GazeTargetItem^ GetOrCreate(UIElement^ element);
-
-    virtual void Invoke() = 0;
-
-    virtual property bool IsInvokable { bool get() { return true; } }
-
-    void Reset(TimeSpan nextStateTime)
-    {
-        ElementState = PointerState::PreEnter;
-        DetailedTime = TimeSpanZero;
-        OverflowTime = TimeSpanZero;
-        NextStateTime = nextStateTime;
-        RepeatCount = 0;
-        MaxDwellRepeatCount = GazeInput::GetMaxDwellRepeatCount(TargetElement);
-    }
-
-    void GiveFeedback()
-    {
-        if (_nextStateTime != NextStateTime)
-        {
-            _prevStateTime = _nextStateTime;
-            _nextStateTime = NextStateTime;
-        }
-
-        if (ElementState != _notifiedPointerState)
-        {
-            switch (ElementState)
-            {
-            case PointerState::Enter:
-                RaiseProgressEvent(DwellProgressState::Fixating);
-                break;
-
-            case PointerState::Dwell:
-            case PointerState::Fixation:
-                RaiseProgressEvent(DwellProgressState::Progressing);
-                break;
-
-            case PointerState::Exit:
-            case PointerState::PreEnter:
-                RaiseProgressEvent(DwellProgressState::Idle);
-                break;
-            }
-
-            _notifiedPointerState = ElementState;
-        }
-        else if (ElementState == PointerState::Dwell || ElementState == PointerState::Fixation)
-        {
-            if (RepeatCount <= MaxDwellRepeatCount)
-            {
-                RaiseProgressEvent(DwellProgressState::Progressing);
-            }
-            else
-            {
-                RaiseProgressEvent(DwellProgressState::Complete);
-            }
-        }
-    }
-
-private:
-
-    void RaiseProgressEvent(DwellProgressState state);
-
-    PointerState _notifiedPointerState = PointerState::Exit;
-    TimeSpan _prevStateTime;
-    TimeSpan _nextStateTime;
-    DwellProgressState _notifiedProgressState = DwellProgressState::Idle;
-    Popup^ _feedbackPopup;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.cs
new file mode 100644
index 00000000000..d5ccf8cebf5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.cs
@@ -0,0 +1,17 @@
+// 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 Windows.Foundation.Collections;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    // Every filter must provide an Wpdate method which transforms sample data
+    // and returns filtered output
+    internal interface IGazeFilter
+    {
+        GazeFilterArgs Update(GazeFilterArgs args);
+
+        void LoadSettings(ValueSet settings);
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
deleted file mode 100644
index c22d7cefe07..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This struct encapsulates the location and timestamp associated with the user's gaze 
-/// and is used as an input and output parameter for the IGazeFilter::Update method
-/// </summary>
-private ref struct GazeFilterArgs sealed
-{
-    /// <summary>
-    /// The current point in the gaze stream
-    /// </summary>
-    property Point Location {Point get() { return _location; }}
-
-    /// <summary>
-    /// The timestamp associated with the current point
-    /// </summary>
-    property TimeSpan Timestamp {TimeSpan get() { return _timestamp; }}
-
-internal:
-
-    GazeFilterArgs(Point location, TimeSpan timestamp)
-    {
-        _location = location;
-        _timestamp = timestamp;
-    }
-
-private:
-
-    Point _location;
-    TimeSpan _timestamp;
-};
-
-// Every filter must provide an Wpdate method which transforms sample data 
-// and returns filtered output
-private interface class IGazeFilter
-{
-    GazeFilterArgs^ Update(GazeFilterArgs^ args);
-    void LoadSettings(ValueSet^ settings);
-};
-
-
-// Basic filter which performs no input filtering -- easy to
-// use as a default filter.
-private ref class NullFilter sealed : public IGazeFilter
-{
-public:
-    virtual inline GazeFilterArgs^ Update(GazeFilterArgs^ args)
-    {
-        return args;
-    }
-
-    virtual inline void LoadSettings(ValueSet^ settings)
-    {
-
-    }
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.cs
new file mode 100644
index 00000000000..3cc3e99f76e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.cs
@@ -0,0 +1,27 @@
+// 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.Input.GazeInteraction
+{
+    /// <summary>
+    /// This enum indicates the current state of gaze interaction.
+    /// </summary>
+    public enum Interaction
+    {
+        /// <summary>
+        /// The state of gaze interaction is inherited from the nearest parent
+        /// </summary>
+        Inherited,
+
+        /// <summary>
+        /// Gaze interaction is enabled
+        /// </summary>
+        Enabled,
+
+        /// <summary>
+        /// Gaze interaction is disabled
+        /// </summary>
+        Disabled
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.h
deleted file mode 100644
index 77665875a57..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Interaction.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This enum indicates the current state of gaze interaction. 
-/// </summary>
-public enum class Interaction
-{
-
-    /// <summary>
-    /// The state of gaze interaction is inherited from the nearest parent
-    /// </summary>
-    Inherited,
-
-    /// <summary>
-    /// Gaze interaction is enabled
-    /// </summary>
-    Enabled,
-
-    /// <summary>
-    /// Gaze interaction is disabled
-    /// </summary>
-    Disabled
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/InvokePatternGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/InvokePatternGazeTargetItem.cs
new file mode 100644
index 00000000000..179edb558fb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/InvokePatternGazeTargetItem.cs
@@ -0,0 +1,25 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class InvokePatternGazeTargetItem : GazeTargetItem
+    {
+        internal InvokePatternGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(TargetElement);
+            var provider = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
+            provider.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/LowpassFilter.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/LowpassFilter.cs
new file mode 100644
index 00000000000..f2e6436be97
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/LowpassFilter.cs
@@ -0,0 +1,37 @@
+// 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.
+
+/*
+ * http://www.lifl.fr/~casiez/1euro/
+ * http://www.lifl.fr/~casiez/publications/CHI2012-casiez.pdf
+*/
+
+using Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class LowpassFilter
+    {
+        public LowpassFilter()
+        {
+            Previous = new Point(0, 0);
+        }
+
+        public LowpassFilter(Point initial)
+        {
+            Previous = initial;
+        }
+
+        public Point Previous { get; set; }
+
+        public Point Update(Point point, Point alpha)
+        {
+            Point pt;
+            pt.X = (alpha.X * point.X) + ((1 - alpha.X) * Previous.X);
+            pt.Y = (alpha.Y * point.Y) + ((1 - alpha.Y) * Previous.Y);
+            Previous = pt;
+            return Previous;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.targets b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.targets
deleted file mode 100644
index 01f7341cd32..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.targets
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-     <PropertyGroup>
-        <PackagePlatform Condition="'$(Platform)' == 'Win32'">x86</PackagePlatform>
-        <PackagePlatform Condition="'$(Platform)' != 'Win32'">$(Platform)</PackagePlatform>
-    </PropertyGroup>
-    <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'UAP'">
-        <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0.17134\Microsoft.Toolkit.Uwp.Input.GazeInteraction.winmd">
-            <Implementation>Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll</Implementation>
-        </Reference>
-        <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(PackagePlatform)\native\Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll" />
-    </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
deleted file mode 100644
index 74113867050..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{a5e98964-45b1-442d-a07a-298a3221d81e}</ProjectGuid>
-    <Keyword>WindowsRuntimeComponent</Keyword>
-    <RootNamespace>Microsoft.Toolkit.Uwp.Input.GazeInteraction</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <ProjectName>Microsoft.Toolkit.Uwp.Input.GazeInteraction</ProjectName>
-    <TargetFrameworks>UAP,Version=v10.0</TargetFrameworks>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <GenerateManifest>false</GenerateManifest>
-    <OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="GazeEventArgs.h" />
-    <ClInclude Include="GazeHidParsers.h" />
-    <ClInclude Include="GazeHidUsages.h" />
-    <ClInclude Include="GazeInput.h" />
-    <ClInclude Include="GazeCursor.h" />
-    <ClInclude Include="GazeElement.h" />
-    <ClInclude Include="Interaction.h" />
-    <ClInclude Include="GazeFeedbackPopupFactory.h" />
-    <ClInclude Include="GazeHistoryItem.h" />
-    <ClInclude Include="DwellInvokedRoutedEventArgs.h" />
-    <ClInclude Include="GazePointer.h" />
-    <ClInclude Include="StateChangedEventArgs.h" />
-    <ClInclude Include="GazePointerProxy.h" />
-    <ClInclude Include="PointerState.h" />
-    <ClInclude Include="DwellProgressEventArgs.h" />
-    <ClInclude Include="DwellProgressState.h" />
-    <ClInclude Include="GazeSettingsHelper.h" />
-    <ClInclude Include="GazeStats.h" />
-    <ClInclude Include="GazeTargetItem.h" />
-    <ClInclude Include="IGazeFilter.h" />
-    <ClInclude Include="OneEuroFilter.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="GazeEventArgs.cpp" />
-    <ClCompile Include="GazeHidParsers.cpp" />
-    <ClCompile Include="GazeInput.cpp" />
-    <ClCompile Include="GazeCursor.cpp" />
-    <ClCompile Include="GazeFeedbackPopupFactory.cpp" />
-    <ClCompile Include="GazePointer.cpp" />
-    <ClCompile Include="GazePointerProxy.cpp" />
-    <ClCompile Include="GazeSettingsHelper.cpp" />
-    <ClCompile Include="GazeStats.cpp" />
-    <ClCompile Include="GazeTargetItem.cpp" />
-    <ClCompile Include="OneEuroFilter.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
new file mode 100644
index 00000000000..883210a55f3
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17134</TargetFrameworks>
+    <Title>Windows Community Toolkit Eye Gaze Library</Title>
+    <Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
+    <PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NonInvokeGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NonInvokeGazeTargetItem.cs
new file mode 100644
index 00000000000..40c8099e7b2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NonInvokeGazeTargetItem.cs
@@ -0,0 +1,25 @@
+// 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 Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class NonInvokeGazeTargetItem : GazeTargetItem
+    {
+        internal NonInvokeGazeTargetItem()
+            : base(new Page())
+        {
+        }
+
+        internal override bool IsInvokable
+        {
+            get { return false; }
+        }
+
+        internal override void Invoke()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NullFilter.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NullFilter.cs
new file mode 100644
index 00000000000..6a8ba296fca
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/NullFilter.cs
@@ -0,0 +1,22 @@
+// 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 Windows.Foundation.Collections;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    // Basic filter which performs no input filtering -- easy to
+    // use as a default filter.
+    internal class NullFilter : IGazeFilter
+    {
+        public virtual GazeFilterArgs Update(GazeFilterArgs args)
+        {
+            return args;
+        }
+
+        public virtual void LoadSettings(ValueSet settings)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cpp
deleted file mode 100644
index 04098535f87..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "OneEuroFilter.h"
-
-//
-// http://www.lifl.fr/~casiez/1euro/
-// http://www.lifl.fr/~casiez/publications/CHI2012-casiez.pdf
-//
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-OneEuroFilter::OneEuroFilter()
-{
-
-    _lastTimestamp = TimeSpanZero;
-    Beta = ONEEUROFILTER_DEFAULT_BETA;
-    Cutoff = ONEEUROFILTER_DEFAULT_CUTOFF;
-    VelocityCutoff = ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF;
-}
-
-OneEuroFilter::OneEuroFilter(float cutoff, float beta)
-{
-    _lastTimestamp = TimeSpanZero;
-    Beta = beta;
-    Cutoff = cutoff;
-    VelocityCutoff = ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF;
-}
-
-GazeFilterArgs^ OneEuroFilter::Update(GazeFilterArgs^ args)
-{
-    if (_lastTimestamp == TimeSpanZero)
-    {
-        _lastTimestamp = args->Timestamp;
-        _pointFilter = ref new LowpassFilter(args->Location);
-        _deltaFilter = ref new LowpassFilter(Point());
-        return ref new GazeFilterArgs(args->Location, args->Timestamp);
-    }
-
-    Point gazePoint = args->Location;
-
-    // Reducing _beta increases lag. Increasing beta decreases lag and improves response time
-    // But a really high value of beta also contributes to jitter
-    float beta = Beta;
-
-    // This simply represents the cutoff frequency. A lower value reduces jiiter
-    // and higher value increases jitter
-    float cf = Cutoff;
-    Point cutoff = Point(cf, cf);
-
-    // determine sampling frequency based on last time stamp
-    float samplingFrequency = 10000000.0f / max(1, (args->Timestamp - _lastTimestamp).Duration);
-    _lastTimestamp = args->Timestamp;
-
-    // calculate change in distance...
-    Point deltaDistance;
-    deltaDistance.X = gazePoint.X - _pointFilter->Previous.X;
-    deltaDistance.Y = gazePoint.Y - _pointFilter->Previous.Y;
-
-    // ...and velocity
-    Point velocity(deltaDistance.X * samplingFrequency, deltaDistance.Y * samplingFrequency);
-
-    // find the alpha to use for the velocity filter
-    float velocityAlpha = Alpha(samplingFrequency, VelocityCutoff);
-    Point velocityAlphaPoint(velocityAlpha, velocityAlpha);
-
-    // find the filtered velocity
-    Point filteredVelocity = _deltaFilter->Update(velocity, velocityAlphaPoint);
-
-    // ignore sign since it will be taken care of by deltaDistance
-    filteredVelocity.X = abs(filteredVelocity.X);
-    filteredVelocity.Y = abs(filteredVelocity.Y);
-
-    // compute new cutoff to use based on velocity
-    cutoff.X += beta * filteredVelocity.X;
-    cutoff.Y += beta * filteredVelocity.Y;
-
-    // find the new alpha to use to filter the points
-    Point distanceAlpha(Alpha(samplingFrequency, cutoff.X), Alpha(samplingFrequency, cutoff.Y));
-
-    // find the filtered point
-    Point filteredPoint = _pointFilter->Update(gazePoint, distanceAlpha);
-
-    // compute the new args
-    auto fa = ref new GazeFilterArgs(filteredPoint, args->Timestamp);
-    return fa;
-}
-
-float OneEuroFilter::Alpha(float rate, float cutoff)
-{
-    const float PI = 3.14159265f;
-    float  te = 1.0f / rate;
-    float tau = (float)(1.0f / (2 * PI * cutoff));
-    float alpha = te / (te + tau);
-    return alpha;
-}
-void OneEuroFilter::LoadSettings(ValueSet^ settings)
-{
-    if (settings->HasKey("OneEuroFilter.Beta"))
-    {
-        Beta = (float)(settings->Lookup("OneEuroFilter.Beta"));
-    }
-    if (settings->HasKey("OneEuroFilter.Cutoff"))
-    {
-        Cutoff = (float)(settings->Lookup("OneEuroFilter.Cutoff"));
-    }
-    if (settings->HasKey("OneEuroFilter.VelocityCutoff"))
-    {
-        VelocityCutoff = (float)(settings->Lookup("OneEuroFilter.VelocityCutoff"));
-    }
-}
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cs
new file mode 100644
index 00000000000..99358cd319c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.cs
@@ -0,0 +1,134 @@
+// 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.
+
+/*
+ * http://www.lifl.fr/~casiez/1euro/
+ * http://www.lifl.fr/~casiez/publications/CHI2012-casiez.pdf
+*/
+
+using System;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class OneEuroFilter : IGazeFilter
+    {
+        private const float ONEEUROFILTER_DEFAULT_BETA = 5.0f;
+        private const float ONEEUROFILTER_DEFAULT_CUTOFF = 0.1f;
+        private const float ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF = 1.0f;
+
+        public OneEuroFilter()
+        {
+            _lastTimestamp = TimeSpan.Zero;
+            Beta = ONEEUROFILTER_DEFAULT_BETA;
+            Cutoff = ONEEUROFILTER_DEFAULT_CUTOFF;
+            VelocityCutoff = ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF;
+        }
+
+        public OneEuroFilter(float cutoff, float beta)
+        {
+            _lastTimestamp = TimeSpan.Zero;
+            Beta = beta;
+            Cutoff = cutoff;
+            VelocityCutoff = ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF;
+        }
+
+        public virtual GazeFilterArgs Update(GazeFilterArgs args)
+        {
+            if (_lastTimestamp == TimeSpan.Zero)
+            {
+                _lastTimestamp = args.Timestamp;
+                _pointFilter = new LowpassFilter(args.Location);
+                _deltaFilter = new LowpassFilter(default);
+                return new GazeFilterArgs(args.Location, args.Timestamp);
+            }
+
+            Point gazePoint = args.Location;
+
+            // Reducing _beta increases lag. Increasing beta decreases lag and improves response time
+            // But a really high value of beta also contributes to jitter
+            float beta = Beta;
+
+            // This simply represents the cutoff frequency. A lower value reduces jiiter
+            // and higher value increases jitter
+            float cf = Cutoff;
+            Point cutoff = new Point(cf, cf);
+
+            // determine sampling frequency based on last time stamp
+            float samplingFrequency = 100000000.0f / Math.Max(1, (args.Timestamp - _lastTimestamp).Ticks);
+            _lastTimestamp = args.Timestamp;
+
+            // calculate change in distance...
+            Point deltaDistance;
+            deltaDistance.X = gazePoint.X - _pointFilter.Previous.X;
+            deltaDistance.Y = gazePoint.Y - _pointFilter.Previous.Y;
+
+            // ...and velocity
+            var velocity = new Point(deltaDistance.X * samplingFrequency, deltaDistance.Y * samplingFrequency);
+
+            // find the alpha to use for the velocity filter
+            float velocityAlpha = Alpha(samplingFrequency, VelocityCutoff);
+            var velocityAlphaPoint = new Point(velocityAlpha, velocityAlpha);
+
+            // find the filtered velocity
+            Point filteredVelocity = _deltaFilter.Update(velocity, velocityAlphaPoint);
+
+            // ignore sign since it will be taken care of by deltaDistance
+            filteredVelocity.X = Math.Abs(filteredVelocity.X);
+            filteredVelocity.Y = Math.Abs(filteredVelocity.Y);
+
+            // compute new cutoff to use based on velocity
+            cutoff.X += beta * filteredVelocity.X;
+            cutoff.Y += beta * filteredVelocity.Y;
+
+            // find the new alpha to use to filter the points
+            var distanceAlpha = new Point(Alpha(samplingFrequency, (float)cutoff.X), Alpha(samplingFrequency, (float)cutoff.Y));
+
+            // find the filtered point
+            Point filteredPoint = _pointFilter.Update(gazePoint, distanceAlpha);
+
+            // compute the new args
+            var fa = new GazeFilterArgs(filteredPoint, args.Timestamp);
+            return fa;
+        }
+
+        public virtual void LoadSettings(ValueSet settings)
+        {
+            if (settings.ContainsKey("OneEuroFilter.Beta"))
+            {
+                Beta = (float)settings["OneEuroFilter.Beta"];
+            }
+
+            if (settings.ContainsKey("OneEuroFilter.Cutoff"))
+            {
+                Cutoff = (float)settings["OneEuroFilter.Cutoff"];
+            }
+
+            if (settings.ContainsKey("OneEuroFilter.VelocityCutoff"))
+            {
+                VelocityCutoff = (float)settings["OneEuroFilter.VelocityCutoff"];
+            }
+        }
+
+        public float Beta { get; set; }
+
+        public float Cutoff { get; set; }
+
+        public float VelocityCutoff { get; set; }
+
+        private float Alpha(float rate, float cutoff)
+        {
+            const float PI = 3.14159265f;
+            float te = 1.0f / rate;
+            float tau = (float)(1.0f / (2 * PI * cutoff));
+            float alpha = te / (te + tau);
+            return alpha;
+        }
+
+        private TimeSpan _lastTimestamp;
+        private LowpassFilter _pointFilter;
+        private LowpassFilter _deltaFilter;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.h
deleted file mode 100644
index 1be4a9acecc..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/OneEuroFilter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "IGazeFilter.h"
-
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-const float ONEEUROFILTER_DEFAULT_BETA = 5.0f;
-const float ONEEUROFILTER_DEFAULT_CUTOFF = 0.1f;
-const float ONEEUROFILTER_DEFAULT_VELOCITY_CUTOFF = 1.0f;
-
-private ref class LowpassFilter sealed
-{
-public:
-    LowpassFilter()
-    {
-        Previous = Point(0, 0);
-    }
-
-    LowpassFilter(Point initial)
-    {
-        Previous = initial;
-    }
-
-    property Point Previous;
-
-    Point Update(Point point, Point alpha)
-    {
-        Point pt;
-        pt.X = (alpha.X * point.X) + ((1 - alpha.X) * Previous.X);
-        pt.Y = (alpha.Y * point.Y) + ((1 - alpha.Y) * Previous.Y);
-        Previous = pt;
-        return Previous;
-    }
-};
-
-private ref class OneEuroFilter sealed : public IGazeFilter
-{
-public:
-    OneEuroFilter();
-    OneEuroFilter(float cutoff, float beta);
-    virtual GazeFilterArgs^ Update(GazeFilterArgs^ args);
-    virtual void LoadSettings(ValueSet^ settings);
-
-public:
-    property float Beta;
-    property float Cutoff;
-    property float VelocityCutoff;
-
-private:
-    float  Alpha(float rate, float cutoff);
-
-private:
-    TimeSpan       _lastTimestamp;
-    LowpassFilter^  _pointFilter;
-    LowpassFilter^  _deltaFilter;
-
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PivotItemGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PivotItemGazeTargetItem.cs
new file mode 100644
index 00000000000..38a587fb4b9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PivotItemGazeTargetItem.cs
@@ -0,0 +1,37 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class PivotItemGazeTargetItem : GazeTargetItem
+    {
+        internal PivotItemGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var headerItem = (PivotHeaderItem)TargetElement;
+            var headerPanel = (PivotHeaderPanel)VisualTreeHelper.GetParent(headerItem);
+            int index = headerPanel.Children.IndexOf(headerItem);
+
+            DependencyObject walker = headerPanel;
+            Pivot pivot;
+            do
+            {
+                walker = VisualTreeHelper.GetParent(walker);
+                pivot = walker as Pivot;
+            }
+            while (pivot == null);
+
+            pivot.SelectedIndex = index;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.cs
new file mode 100644
index 00000000000..429498e7b20
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.cs
@@ -0,0 +1,46 @@
+// 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.Input.GazeInteraction
+{
+    /// <summary>
+    /// This enum reflects the states that a user's gaze through while interacting with a control using their eyes.
+    /// </summary>
+    public enum PointerState
+    {
+        /// <summary>
+        /// User's gaze is no longer on the control
+        /// </summary>
+        Exit = 0,
+
+        // The order of the following elements is important because
+        // they represent states that linearly transition to their
+        // immediate successors.
+
+        /// <summary>
+        /// For internal use only
+        /// </summary>
+        PreEnter = 1,
+
+        /// <summary>
+        /// User's gaze has entered a control
+        /// </summary>
+        Enter = 2,
+
+        /// <summary>
+        /// User eye's are focused on the control
+        /// </summary>
+        Fixation = 3,
+
+        /// <summary>
+        /// User is conciously dwelling on the control with an intent to invoke, e.g. click a button
+        /// </summary>
+        Dwell = 4,
+
+        /// <summary>
+        /// User is continuing to dwell on the control for repeated invocation. (For internal use only)
+        /// </summary>
+        DwellRepeat = 5
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
deleted file mode 100644
index 2de72ba5eb1..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This enum reflects the states that a user's gaze through while interacting with a control using their eyes.
-/// </summary>
-public enum class PointerState
-{
-    /// <summary>
-    /// User's gaze is no longer on the control
-    /// </summary>
-    Exit = 0,
-
-    // The order of the following elements is important because
-    // they represent states that linearly transition to their
-    // immediate successors. 
-
-    /// <summary>
-    /// For internal use only
-    /// </summary>
-    PreEnter = 1,
-
-    /// <summary>
-    /// User's gaze has entered a control
-    /// </summary>
-    Enter = 2,
-
-    /// <summary>
-    /// User eye's are focused on the control
-    /// </summary>
-    Fixation = 3,
-
-    /// <summary>
-    /// User is conciously dwelling on the control with an intent to invoke, e.g. click a button
-    /// </summary>
-    Dwell = 4,
-
-    /// <summary>
-    /// User is continuing to dwell on the control for repeated invocation. (For internal use only)
-    /// </summary>
-    DwellRepeat = 5
-};
-
-END_NAMESPACE_GAZE_INPUT
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/SelectionItemPatternGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/SelectionItemPatternGazeTargetItem.cs
new file mode 100644
index 00000000000..57f8edc30b8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/SelectionItemPatternGazeTargetItem.cs
@@ -0,0 +1,25 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class SelectionItemPatternGazeTargetItem : GazeTargetItem
+    {
+        internal SelectionItemPatternGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(TargetElement);
+            var provider = peer.GetPattern(PatternInterface.SelectionItem) as ISelectionItemProvider;
+            provider.Select();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.cs
new file mode 100644
index 00000000000..ac68e340fca
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.cs
@@ -0,0 +1,35 @@
+// 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 Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    /// <summary>
+    /// This parameter is passed to the StateChanged event.
+    /// </summary>
+    public class StateChangedEventArgs
+    {
+        /// <summary>
+        /// Gets the state of the user's gaze with respect to a control
+        /// </summary>
+        public PointerState PointerState { get; }
+
+        /// <summary>
+        /// Gets elapsed time since the last state
+        /// </summary>
+        public TimeSpan ElapsedTime => _elapsedTime;
+
+        internal StateChangedEventArgs(UIElement target, PointerState state, TimeSpan elapsedTime)
+        {
+            _hitTarget = target;
+            PointerState = state;
+            _elapsedTime = elapsedTime;
+        }
+
+        private readonly UIElement _hitTarget;
+        private TimeSpan _elapsedTime;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.h
deleted file mode 100644
index 6b8eac897fb..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/StateChangedEventArgs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "PointerState.h"
-
-using namespace Windows::UI::Xaml;
-
-BEGIN_NAMESPACE_GAZE_INPUT
-
-/// <summary>
-/// This parameter is passed to the StateChanged event.
-/// </summary>
-public ref struct StateChangedEventArgs sealed
-{
-    /// <summary>
-    /// The state of user's gaze with respect to a control
-    /// </summary>
-    property GazeInteraction::PointerState PointerState {GazeInteraction::PointerState get() { return _pointerState; }}
-
-    /// <summary>
-    /// Elapsed time since the last state
-    /// </summary>
-    property TimeSpan ElapsedTime {TimeSpan get() { return _elapsedTime; }}
-
-internal:
-
-    StateChangedEventArgs(UIElement^ target, GazeInteraction::PointerState state, TimeSpan elapsedTime)
-    {
-        _hitTarget = target;
-        _pointerState = state;
-        _elapsedTime = elapsedTime;
-    }
-
-private:
-    UIElement ^ _hitTarget;
-    GazeInteraction::PointerState _pointerState;
-    TimeSpan _elapsedTime;
-};
-
-END_NAMESPACE_GAZE_INPUT
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/TogglePatternGazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/TogglePatternGazeTargetItem.cs
new file mode 100644
index 00000000000..98ed1a44912
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/TogglePatternGazeTargetItem.cs
@@ -0,0 +1,25 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+
+namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+{
+    internal class TogglePatternGazeTargetItem : GazeTargetItem
+    {
+        internal TogglePatternGazeTargetItem(UIElement element)
+            : base(element)
+        {
+        }
+
+        internal override void Invoke()
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(TargetElement);
+            var provider = peer.GetPattern(PatternInterface.Toggle) as IToggleProvider;
+            provider.Toggle();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.cpp
deleted file mode 100644
index f655674037d..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#include "pch.h"
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.h
deleted file mode 100644
index 6d294adbc6b..00000000000
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/pch.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license.
-//See LICENSE in the project root for license information.
-
-#pragma once
-
-#include <collection.h>
-#include <ppltasks.h>
-
-//#define _USE_MATH_DEFINES
-//#include <math.h>
-#include <assert.h>
-
-//#include <Windows.Input.Gaze.h>
-
-using namespace Windows::Foundation;
-using namespace Windows::Devices::Enumeration;
-using namespace Windows::Devices::HumanInterfaceDevice;
-using namespace Windows::UI::Core;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Shapes;
-
-#include <strsafe.h>
-private class Debug
-{
-public:
-    static void WriteLine(wchar_t *format, ...)
-    {
-        wchar_t message[1024];
-        va_list args;
-        va_start(args, format);
-        StringCchVPrintf(message, 1024, format, args);
-        OutputDebugString(message);
-        OutputDebugString(L"\n");
-    }
-};
-
-inline static TimeSpan operator + (const TimeSpan& lhs, const TimeSpan& rhs) { return TimeSpan{ lhs.Duration + rhs.Duration }; }
-inline static TimeSpan operator - (const TimeSpan& lhs, const TimeSpan& rhs) { return TimeSpan{ lhs.Duration - rhs.Duration }; }
-inline static TimeSpan operator * (int lhs, const TimeSpan& rhs) { return TimeSpan{ lhs*rhs.Duration }; }
-inline static bool operator < (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration < rhs.Duration; }
-inline static bool operator <= (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration <= rhs.Duration; }
-inline static bool operator > (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration > rhs.Duration; }
-inline static bool operator >= (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration >= rhs.Duration; }
-inline static bool operator == (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration == rhs.Duration; }
-inline static bool operator != (const TimeSpan& lhs, const TimeSpan& rhs) { return lhs.Duration != rhs.Duration; }
-
-static TimeSpan TimeSpanZero{ 0 };
-inline static TimeSpan TimeSpanFromMicroseconds(uint64 milliseconds) { return TimeSpan{ (int64)(10 * milliseconds) }; }
-inline static TimeSpan TimeSpanFromMicroseconds(int64 milliseconds) { return TimeSpan{ 10 * milliseconds }; }
-inline static TimeSpan TimeSpanFromMicroseconds(int milliseconds) { return TimeSpan{ 10 * milliseconds }; }
-
-#define BEGIN_NAMESPACE_GAZE_INPUT namespace Microsoft { namespace Toolkit { namespace Uwp { namespace Input { namespace GazeInteraction {
-#define END_NAMESPACE_GAZE_INPUT } } } } }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 6426c03d171..884377a8a98 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1517,8 +1517,8 @@
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj">
-      <Project>{a5e98964-45b1-442d-a07a-298a3221d81e}</Project>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">
+      <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.csproj">
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e5f4ccbee..c37c5778045 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -84,7 +84,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DifferencesGen", "Microsoft
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer", "Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer\Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj", "{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Toolkit.Uwp.Input.GazeInteraction", "Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj", "{A5E98964-45B1-442D-A07A-298A3221D81E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Input.GazeInteraction", "Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj", "{5BF75694-798A-43A0-8150-415DE195359C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}"
 EndProject
@@ -144,11 +144,6 @@ Global
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Native|Any CPU = Native|Any CPU
-		Native|ARM = Native|ARM
-		Native|ARM64 = Native|ARM64
-		Native|x64 = Native|x64
-		Native|x86 = Native|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
@@ -171,11 +166,6 @@ Global
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.ActiveCfg = Debug|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|Any CPU.ActiveCfg = Release|x86
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.ActiveCfg = Release|ARM
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.ActiveCfg = Release|ARM64
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
@@ -199,11 +189,6 @@ Global
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Debug|x64.Build.0 = Debug|Any CPU
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Debug|x86.Build.0 = Debug|Any CPU
-		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Native|ARM.ActiveCfg = Release|Any CPU
-		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Native|x64.ActiveCfg = Release|Any CPU
-		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Native|x86.ActiveCfg = Release|Any CPU
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -228,11 +213,6 @@ Global
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.ActiveCfg = Debug|x86
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Build.0 = Debug|x86
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Deploy.0 = Debug|x86
-		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Native|Any CPU.ActiveCfg = Release|x86
-		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Native|ARM.ActiveCfg = Release|ARM
-		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Native|ARM64.ActiveCfg = Release (Anniversary Update)|ARM64
-		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Native|x64.ActiveCfg = Release|x64
-		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Native|x86.ActiveCfg = Release|x86
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x86
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x86
 		{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.ActiveCfg = Release|ARM
@@ -257,11 +237,6 @@ Global
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Debug|x86.Build.0 = Debug|Any CPU
-		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Native|ARM.ActiveCfg = Release|Any CPU
-		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Native|x64.ActiveCfg = Release|Any CPU
-		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Native|x86.ActiveCfg = Release|Any CPU
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DD8AA7C-3569-4E51-992F-0C2257E8878E}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -282,11 +257,6 @@ Global
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Debug|x64.Build.0 = Debug|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Debug|x86.Build.0 = Debug|Any CPU
-		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Native|ARM.ActiveCfg = Release|Any CPU
-		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Native|x64.ActiveCfg = Release|Any CPU
-		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Native|x86.ActiveCfg = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -307,11 +277,6 @@ Global
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x64.Build.0 = Debug|Any CPU
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|ARM.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|x64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|x86.ActiveCfg = Release|Any CPU
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -332,11 +297,6 @@ Global
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x64.Build.0 = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Native|ARM.ActiveCfg = Release|Any CPU
-		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Native|x64.ActiveCfg = Release|Any CPU
-		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Native|x86.ActiveCfg = Release|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -357,11 +317,6 @@ Global
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Debug|x64.Build.0 = Debug|Any CPU
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Debug|x86.Build.0 = Debug|Any CPU
-		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Native|ARM.ActiveCfg = Release|Any CPU
-		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Native|x64.ActiveCfg = Release|Any CPU
-		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Native|x86.ActiveCfg = Release|Any CPU
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -386,11 +341,6 @@ Global
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.ActiveCfg = Debug|x86
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Build.0 = Debug|x86
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Deploy.0 = Debug|x86
-		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Native|Any CPU.ActiveCfg = Release|x86
-		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Native|ARM.ActiveCfg = Release|ARM
-		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Native|ARM64.ActiveCfg = Release|ARM64
-		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Native|x64.ActiveCfg = Release|x64
-		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Native|x86.ActiveCfg = Release|x86
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x86
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x86
 		{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.ActiveCfg = Release|ARM
@@ -415,11 +365,6 @@ Global
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|x64.Build.0 = Debug|x64
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|x86.ActiveCfg = Debug|x86
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|x86.Build.0 = Debug|x86
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|ARM.ActiveCfg = Release|ARM
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|ARM64.ActiveCfg = Release|ARM64
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x64.ActiveCfg = Release|x64
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x86.ActiveCfg = Release|x86
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.ActiveCfg = Release|ARM
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.Build.0 = Release|ARM
@@ -439,11 +384,6 @@ Global
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Debug|x86.Build.0 = Debug|Any CPU
-		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Native|ARM.ActiveCfg = Release|Any CPU
-		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Native|x64.ActiveCfg = Release|Any CPU
-		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Native|x86.ActiveCfg = Release|Any CPU
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E7697922-9555-4CFB-AEE0-C5F4D657E559}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -464,11 +404,6 @@ Global
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Debug|x64.Build.0 = Debug|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Debug|x86.Build.0 = Debug|Any CPU
-		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Native|ARM.ActiveCfg = Release|Any CPU
-		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Native|x64.ActiveCfg = Release|Any CPU
-		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Native|x86.ActiveCfg = Release|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -489,11 +424,6 @@ Global
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Debug|x64.Build.0 = Debug|Any CPU
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Debug|x86.Build.0 = Debug|Any CPU
-		{34398053-FC70-4243-84F9-F355DEFFF66D}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{34398053-FC70-4243-84F9-F355DEFFF66D}.Native|ARM.ActiveCfg = Release|Any CPU
-		{34398053-FC70-4243-84F9-F355DEFFF66D}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{34398053-FC70-4243-84F9-F355DEFFF66D}.Native|x64.ActiveCfg = Release|Any CPU
-		{34398053-FC70-4243-84F9-F355DEFFF66D}.Native|x86.ActiveCfg = Release|Any CPU
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34398053-FC70-4243-84F9-F355DEFFF66D}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -514,11 +444,6 @@ Global
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|x86.Build.0 = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Native|ARM.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Native|x64.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Native|x86.ActiveCfg = Release|Any CPU
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -539,11 +464,6 @@ Global
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|x86.Build.0 = Debug|Any CPU
-		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Native|ARM.ActiveCfg = Release|Any CPU
-		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Native|x64.ActiveCfg = Release|Any CPU
-		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Native|x86.ActiveCfg = Release|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -564,11 +484,6 @@ Global
 		{94994424-5F60-4CD8-ABA2-101779066208}.Debug|x64.Build.0 = Debug|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Debug|x86.Build.0 = Debug|Any CPU
-		{94994424-5F60-4CD8-ABA2-101779066208}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{94994424-5F60-4CD8-ABA2-101779066208}.Native|ARM.ActiveCfg = Release|Any CPU
-		{94994424-5F60-4CD8-ABA2-101779066208}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{94994424-5F60-4CD8-ABA2-101779066208}.Native|x64.ActiveCfg = Release|Any CPU
-		{94994424-5F60-4CD8-ABA2-101779066208}.Native|x86.ActiveCfg = Release|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -593,11 +508,6 @@ Global
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Debug|x86.ActiveCfg = Debug|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Debug|x86.Build.0 = Debug|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Debug|x86.Deploy.0 = Debug|x86
-		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Native|Any CPU.ActiveCfg = Release|x86
-		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Native|ARM.ActiveCfg = Release|ARM
-		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Native|ARM64.ActiveCfg = Release|ARM64
-		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Native|x64.ActiveCfg = Release|x64
-		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Native|x86.ActiveCfg = Release|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|Any CPU.ActiveCfg = Release|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|Any CPU.Build.0 = Release|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|ARM.ActiveCfg = Release|ARM
@@ -622,11 +532,6 @@ Global
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x64.Build.0 = Debug|Any CPU
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x86.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|ARM.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|x64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|x86.ActiveCfg = Release|Any CPU
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -646,11 +551,6 @@ Global
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.Build.0 = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Native|Any CPU.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Native|ARM.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Native|ARM64.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Native|x64.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Native|x86.ActiveCfg = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.ActiveCfg = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.Build.0 = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|x86
@@ -669,11 +569,6 @@ Global
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.Build.0 = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.ActiveCfg = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Native|Any CPU.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Native|ARM.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Native|ARM64.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Native|x64.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Native|x86.ActiveCfg = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.ActiveCfg = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.Build.0 = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.ActiveCfg = Release|x86
@@ -693,11 +588,6 @@ Global
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x64.Build.0 = Debug|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x86.Build.0 = Debug|Any CPU
-		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Native|ARM.ActiveCfg = Release|Any CPU
-		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Native|x64.ActiveCfg = Release|Any CPU
-		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Native|x86.ActiveCfg = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -718,11 +608,6 @@ Global
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|ARM.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|x64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|x86.ActiveCfg = Release|Any CPU
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.ActiveCfg = Release|Any CPU
 		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.Build.0 = Release|Any CPU
@@ -742,11 +627,6 @@ Global
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|ARM.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|x64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|x86.ActiveCfg = Release|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -757,35 +637,6 @@ Global
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x64.Build.0 = Release|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.Build.0 = Release|Any CPU
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.Build.0 = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM.Build.0 = Debug|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x64.ActiveCfg = Debug|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x64.Build.0 = Debug|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.ActiveCfg = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.Build.0 = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|Any CPU.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|Any CPU.Build.0 = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.ActiveCfg = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.Build.0 = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM64.ActiveCfg = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM64.Build.0 = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x64.ActiveCfg = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x64.Build.0 = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x86.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x86.Build.0 = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM.ActiveCfg = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM.Build.0 = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM64.Build.0 = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x64.ActiveCfg = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x64.Build.0 = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x86.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x86.Build.0 = Release|Win32
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM
@@ -799,11 +650,6 @@ Global
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86
-		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Native|Any CPU.ActiveCfg = Release|x86
-		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Native|ARM.ActiveCfg = Release|ARM
-		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Native|ARM64.ActiveCfg = Release|ARM64
-		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Native|x64.ActiveCfg = Release|x64
-		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Native|x86.ActiveCfg = Release|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM
@@ -827,11 +673,6 @@ Global
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Debug|x64.Build.0 = Debug|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Debug|x86.Build.0 = Debug|Any CPU
-		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Native|x64.ActiveCfg = Debug|Any CPU
-		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Native|x86.ActiveCfg = Debug|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -852,16 +693,6 @@ Global
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.Build.0 = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.Build.0 = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.Build.0 = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.Build.0 = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.Build.0 = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -882,11 +713,6 @@ Global
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x64.Build.0 = Debug|Any CPU
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x86.Build.0 = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x64.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x86.ActiveCfg = Debug|Any CPU
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -907,16 +733,6 @@ Global
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.Build.0 = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.Build.0 = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.Build.0 = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.Build.0 = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.Build.0 = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -937,11 +753,6 @@ Global
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x86.Build.0 = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x64.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x86.ActiveCfg = Debug|Any CPU
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -962,11 +773,6 @@ Global
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x86.Build.0 = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x64.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x86.ActiveCfg = Debug|Any CPU
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -991,11 +797,6 @@ Global
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.ActiveCfg = Debug|x86
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.Build.0 = Debug|x86
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.Deploy.0 = Debug|x86
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|Any CPU.ActiveCfg = Release|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM.ActiveCfg = Release|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM64.ActiveCfg = Release|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x64.ActiveCfg = Release|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x86.ActiveCfg = Release|x86
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|Any CPU.ActiveCfg = Release|x86
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|Any CPU.Build.0 = Release|x86
 		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.ActiveCfg = Release|ARM
@@ -1017,11 +818,6 @@ Global
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|x64
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|x86
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|x86
-		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Native|Any CPU.ActiveCfg = Release|x86
-		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Native|ARM.ActiveCfg = Release|x86
-		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Native|ARM64.ActiveCfg = Release|x86
-		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Native|x64.ActiveCfg = Release|x86
-		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Native|x86.ActiveCfg = Release|x86
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|x86
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|x86
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|x86
@@ -1044,11 +840,6 @@ Global
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.ActiveCfg = Debug|x86
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Build.0 = Debug|x86
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Deploy.0 = Debug|x86
-		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|Any CPU.ActiveCfg = Debug|x86
-		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|ARM.ActiveCfg = Release|ARM
-		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|ARM64.ActiveCfg = Release|ARM64
-		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|x64.ActiveCfg = Release|x64
-		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|x86.ActiveCfg = Release|x86
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -1071,11 +862,6 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.ActiveCfg = Debug|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Build.0 = Debug|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Deploy.0 = Debug|x86
-		{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|Any CPU.ActiveCfg = Release|x86
-		{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|ARM.ActiveCfg = Release|ARM
-		{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|ARM64.ActiveCfg = Release|ARM64
-		{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|x64.ActiveCfg = Release|x64
-		{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -1085,6 +871,26 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/Microsoft.Toolkit.Uwp.Input.GazeInteraction.nuspec b/build/Microsoft.Toolkit.Uwp.Input.GazeInteraction.nuspec
deleted file mode 100644
index b6c045cfd39..00000000000
--- a/build/Microsoft.Toolkit.Uwp.Input.GazeInteraction.nuspec
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Microsoft.Toolkit.Uwp.Input.GazeInteraction</id>
-    <version>$version$</version>
-    <title>Windows Community Toolkit Eye Gaze Library</title>
-    <authors>Microsoft.Toolkit</authors>
-    <owners>Microsoft.Toolkit</owners>
-    <iconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</iconUrl>
-    <licenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</licenseUrl>
-    <projectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</projectUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>A library to integrate gaze interactions using eye trackers into UWP applications</description>
-    <releaseNotes>v5.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</releaseNotes>
-    <copyright>(c) .NET Foundation and Contributors. All rights reserved.</copyright>
-    <tags>UWP Toolkit Windows Eye Gaze EyeTracker </tags>
-  </metadata>
-
-  <files>
-      <!-- WinMd and IntelliSense files -->
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.winmd" target="lib\uap10.0.17134"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.xml" target="lib\uap10.0.17134"/>
-
-      <!-- DLLs and resources -->
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll" target="runtimes\win10-arm\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pri" target="runtimes\win10-arm\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pdb" target="runtimes\win10-arm\native"/>
-	  
-	  <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll" target="runtimes\win10-arm64\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pri" target="runtimes\win10-arm64\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\ARM64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pdb" target="runtimes\win10-arm64\native"/>
-
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\x64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll" target="runtimes\win10-x64\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\x64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pri" target="runtimes\win10-x64\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\x64\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pdb" target="runtimes\win10-x64\native"/>
-
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.dll" target="runtimes\win10-x86\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pri" target="runtimes\win10-x86\native"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.pdb" target="runtimes\win10-x86\native"/>
-
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.targets" target="build\native"/>
-  </files>
-</package>
\ No newline at end of file
diff --git a/build/build.cake b/build/build.cake
index 51d5ed13ee7..67de85e745f 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -225,39 +225,6 @@ Task("Package")
 	.WithProperty("PackageOutputPath", nupkgDir);
 
     MSBuild(Solution, buildSettings);
-
-    // Build and pack C++ packages
-    buildSettings = new MSBuildSettings
-    {
-        MaxCpuCount = 0
-    }
-    .SetConfiguration("Native");
-
-    buildSettings.SetPlatformTarget(PlatformTarget.ARM);
-    MSBuild(Solution, buildSettings);
-	
-	buildSettings.SetPlatformTarget(PlatformTarget.ARM64);
-    MSBuild(Solution, buildSettings);
-
-    buildSettings.SetPlatformTarget(PlatformTarget.x64);
-    MSBuild(Solution, buildSettings);
-
-    buildSettings.SetPlatformTarget(PlatformTarget.x86);
-    MSBuild(Solution, buildSettings);
-
-    RetrieveVersion();
-
-    var nuGetPackSettings = new NuGetPackSettings
-	{
-		OutputDirectory = nupkgDir,
-        Version = Version
-	};
-	
-    var nuspecs = GetFiles("./*.nuspec");
-    foreach (var nuspec in nuspecs)
-    {
-        NuGetPack(nuspec, nuGetPackSettings);
-    }
 });
 
 public string getMSTestAdapterPath(){

From c3b3d035746d1721362278f0021c27bdf32710b4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 13 Aug 2020 18:32:32 +0200
Subject: [PATCH 371/595] Add initial version of ObservableValidator type

---
 .../ComponentModel/ObservableValidator.cs     | 77 +++++++++++++++++++
 .../Microsoft.Toolkit.Mvvm.csproj             |  1 +
 2 files changed, 78 insertions(+)
 create mode 100644 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
new file mode 100644
index 00000000000..c0d58102eb0
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -0,0 +1,77 @@
+// 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;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.Toolkit.Mvvm.ComponentModel
+{
+    /// <summary>
+    /// A base class for objects implementing the <see cref="INotifyDataErrorInfo"/> interface. This class
+    /// also inherits from <see cref="ObservableObject"/>, so it can be used for observable items too.
+    /// </summary>
+    public abstract class ObservableValidator : ObservableObject, INotifyDataErrorInfo
+    {
+        /// <summary>
+        /// The <see cref="Dictionary{TKey,TValue}"/> instance used to store previous validation results.
+        /// </summary>
+        private readonly Dictionary<string, List<ValidationResult>> errors = new Dictionary<string, List<ValidationResult>>();
+
+        /// <inheritdoc/>
+        public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
+
+        /// <inheritdoc/>
+        public bool HasErrors => this.errors.Count > 0;
+
+        /// <inheritdoc/>
+        public IEnumerable GetErrors(string propertyName)
+        {
+            return this.errors[propertyName];
+        }
+
+        /// <summary>
+        /// Validates a property with a specified name and a given input value.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to validate.</param>
+        /// <param name="value">The value to test for the specified property.</param>
+        public void ValidateProperty(string propertyName, object value)
+        {
+            // Clear the errors for the specified property, if any
+            if (this.errors.TryGetValue(propertyName, out List<ValidationResult>? propertyErrors))
+            {
+                propertyErrors.Clear();
+
+                ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+            }
+
+            List<ValidationResult> results = new List<ValidationResult>();
+
+            // Validate the property
+            if (!Validator.TryValidateProperty(
+                value,
+                new ValidationContext(this, null, null) { MemberName = propertyName },
+                results))
+            {
+                // We can avoid the repeated dictionary lookup if we just check the result of the previous
+                // one here. If the retrieved errors collection is null, we can log the ones produced by
+                // the validation we just performed. We also don't need to create a new list and add them
+                // to that, as we can directly set the resulting list as value in the mapping. If the
+                // property already had some other logged errors instead, we can add the new ones as a range.
+                if (propertyErrors is null)
+                {
+                    this.errors.Add(propertyName, results);
+                }
+                else
+                {
+                    propertyErrors.AddRange(results);
+                }
+
+                ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 25371e3abc3..b98b400247d 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
 </Project>

From 67908f36834a1390d1cd6e32fcad16a948236c8d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 13 Aug 2020 18:47:05 +0200
Subject: [PATCH 372/595] Update ValidateProperty API to mirror SetProperty

---
 .../ComponentModel/ObservableValidator.cs     | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index c0d58102eb0..e7da951eb73 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
 {
@@ -36,12 +38,19 @@ public IEnumerable GetErrors(string propertyName)
         /// <summary>
         /// Validates a property with a specified name and a given input value.
         /// </summary>
-        /// <param name="propertyName">The name of the property to validate.</param>
         /// <param name="value">The value to test for the specified property.</param>
-        public void ValidateProperty(string propertyName, object value)
+        /// <param name="propertyName">The name of the property to validate.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="propertyName"/> is <see langword="null"/>.</exception>
+        public void ValidateProperty(object value, [CallerMemberName] string? propertyName = null)
         {
+            if (propertyName is null)
+            {
+                ThrowArgumentNullExceptionForNullPropertyName();
+            }
+
             // Clear the errors for the specified property, if any
-            if (this.errors.TryGetValue(propertyName, out List<ValidationResult>? propertyErrors))
+            if (this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors) &&
+                propertyErrors.Count > 0)
             {
                 propertyErrors.Clear();
 
@@ -63,7 +72,7 @@ public void ValidateProperty(string propertyName, object value)
                 // property already had some other logged errors instead, we can add the new ones as a range.
                 if (propertyErrors is null)
                 {
-                    this.errors.Add(propertyName, results);
+                    this.errors.Add(propertyName!, results);
                 }
                 else
                 {
@@ -73,5 +82,13 @@ public void ValidateProperty(string propertyName, object value)
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
         }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentNullException"/> when a property name given as input is <see langword="null"/>.
+        /// </summary>
+        private static void ThrowArgumentNullExceptionForNullPropertyName()
+        {
+            throw new ArgumentNullException("propertyName", "The input property name cannot be null when validating a property");
+        }
     }
 }
\ No newline at end of file

From ffb54ca73568ef54f78564a7108681ec8917baa4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 13 Aug 2020 18:51:08 +0200
Subject: [PATCH 373/595] Add XML docs for thrown exceptions

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs    | 5 +++++
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs | 2 ++
 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs            | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 61f5c41f65e..eaff311f873 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -220,6 +220,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// be used to access properties of a model that is directly stored as a property of the current instance.
         /// Additionally, this method can only be used if the wrapped item is a reference type.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, out _, propertyName);
@@ -238,6 +239,7 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(propertyExpression, newValue, comparer, out _, propertyName);
@@ -253,6 +255,7 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// <param name="oldValue">The resulting initial value for the target property.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
         private protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, out T oldValue, [CallerMemberName] string? propertyName = null)
         {
             PropertyInfo? parentPropertyInfo;
@@ -328,6 +331,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="fieldExpression"/> is not valid.</exception>
         protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
@@ -360,6 +364,7 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="fieldExpression"/> is not valid.</exception>
         protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index ca847383b87..5c4ba934e60 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -247,6 +247,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
@@ -268,6 +269,7 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
         protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
             bool propertyChanged = SetProperty(propertyExpression, newValue, comparer, out T oldValue, propertyName);
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
index 7546d684da8..f8567c0de57 100644
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
@@ -54,6 +54,7 @@ public sealed class Ioc : IServiceProvider
         private volatile ServiceProvider? serviceProvider;
 
         /// <inheritdoc/>
+        /// <exception cref="InvalidOperationException">Thrown if the current instance has not been configured yet.</exception>
         object? IServiceProvider.GetService(Type serviceType)
         {
             // As per section I.12.6.6 of the official CLI ECMA-335 spec:
@@ -81,6 +82,7 @@ public sealed class Ioc : IServiceProvider
         /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
         /// <param name="setup">The configuration delegate to use to add services.</param>
+        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
         public void ConfigureServices(Action<IServiceCollection> setup)
         {
             ConfigureServices(setup, new ServiceProviderOptions());
@@ -91,6 +93,7 @@ public void ConfigureServices(Action<IServiceCollection> setup)
         /// </summary>
         /// <param name="setup">The configuration delegate to use to add services.</param>
         /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
+        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
         public void ConfigureServices(Action<IServiceCollection> setup, ServiceProviderOptions options)
         {
             var collection = new ServiceCollection();
@@ -104,6 +107,7 @@ public void ConfigureServices(Action<IServiceCollection> setup, ServiceProviderO
         /// Initializes the shared <see cref="IServiceProvider"/> instance.
         /// </summary>
         /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
+        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
         public void ConfigureServices(IServiceCollection services)
         {
             ConfigureServices(services, new ServiceProviderOptions());
@@ -114,6 +118,7 @@ public void ConfigureServices(IServiceCollection services)
         /// </summary>
         /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
         /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
+        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
         public void ConfigureServices(IServiceCollection services, ServiceProviderOptions options)
         {
             ServiceProvider newServices = services.BuildServiceProvider(options);

From b446d061d41af841ec918190553a3fc46c226022 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 13 Aug 2020 12:05:18 -0700
Subject: [PATCH 374/595] Simplified many using statements by changing the lang
 version to C#8 in the services project.

---
 .../Microsoft.Toolkit.Services.csproj         |   1 +
 .../Services/LinkedIn/LinkedInDataProvider.cs |  65 +++----
 .../MicrosoftTranslator/AzureAuthToken.cs     |  26 ++-
 .../MicrosoftTranslator/TranslatorService.cs  |  53 +++---
 .../Services/Twitter/TwitterDataProvider.cs   |  26 ++-
 .../Services/Twitter/TwitterOAuthRequest.cs   | 108 +++++------
 .../Services/Weibo/WeiboOAuthRequest.cs       | 169 ++++++++----------
 7 files changed, 188 insertions(+), 260 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index a7d3225ee7e..eda0b41f4ee 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -11,6 +11,7 @@
     </Description>
     <PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
 
+    <LangVersion>8.0</LangVersion>
     <NoWarn>CS8002;CS0618</NoWarn>
     <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index cf07a1c305e..2018e7cd33d 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -198,22 +198,18 @@ public async Task<IEnumerable<TSchema>> GetDataAsync<TSchema>(LinkedInDataConfig
 
             var url = $"{_baseUrl}{config.Query}/~:({fields})?oauth2_access_token={Tokens.AccessToken}&format=json&count={maxRecords}&start={startRecord}";
 
-            using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url)))
-            {
-                request.Headers.Connection.TryParseAdd("Keep-Alive");
-
-                using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                {
-                    var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url));
+            request.Headers.Connection.TryParseAdd("Keep-Alive");
 
-                    if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
-                    {
-                        return parser.Parse(data);
-                    }
+            using var response = await client.SendAsync(request).ConfigureAwait(false);
+            var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                    throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
-                }
+            if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
+            {
+                return parser.Parse(data);
             }
+
+            throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
         }
 
         /// <summary>
@@ -234,22 +230,18 @@ public async Task<U> ShareDataAsync<T, U>(T dataToShare)
 
                 var url = $"{_baseUrl}/people/~/shares?oauth2_access_token={Tokens.AccessToken}&format=json";
 
-                using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
-                {
-                    request.Headers.Add("x-li-format", "json");
-                    var stringContent = requestParser.Parse(shareRequest);
-                    request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
+                using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
+                request.Headers.Add("x-li-format", "json");
+                var stringContent = requestParser.Parse(shareRequest);
+                request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
 
-                    using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                    {
-                        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                using var response = await client.SendAsync(request).ConfigureAwait(false);
+                var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                        var responseParser = new LinkedInParser<U>();
+                var responseParser = new LinkedInParser<U>();
 
-                        var listResults = responseParser.Parse(data) as List<U>;
-                        return listResults[0];
-                    }
-                }
+                var listResults = responseParser.Parse(data) as List<U>;
+                return listResults[0];
             }
 
             return default(U);
@@ -275,20 +267,13 @@ private async Task<string> GetAccessTokenAsync(LinkedInOAuthTokens tokens, strin
             + "&client_id=" + tokens.ClientId
             + "&client_secret=" + tokens.ClientSecret;
 
-            using (var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
-            {
-                using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                {
-                    using (var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    {
-                        using (var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false))
-                        {
-                            var value = jsonDoc.RootElement.GetProperty("access_token");
-                            return value.GetString();
-                        }
-                    }
-                }
-            }
+            using var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
+            using var response = await client.SendAsync(request).ConfigureAwait(false);
+            using var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            using var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false);
+
+            var value = jsonDoc.RootElement.GetProperty("access_token");
+            return value.GetString();
         }
 
         private async Task<string> GetAuthorizeCodeAsync(LinkedInOAuthTokens tokens, LinkedInPermissions permissions)
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
index 32dff4c0c74..a2607423256 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs
@@ -93,24 +93,22 @@ public async Task<string> GetAccessTokenAsync()
                 return _storedTokenValue;
             }
 
-            using (var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl))
-            {
-                request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
+            using var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl);
+            request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
 
-                var response = await client.SendAsync(request).ConfigureAwait(false);
-                var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            var response = await client.SendAsync(request).ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                if (!response.IsSuccessStatusCode)
-                {
-                    var error = JsonSerializer.Deserialize<ErrorResponse>(content);
-                    throw new TranslatorServiceException(error?.Error?.Message);
-                }
+            if (!response.IsSuccessStatusCode)
+            {
+                var error = JsonSerializer.Deserialize<ErrorResponse>(content);
+                throw new TranslatorServiceException(error?.Error?.Message);
+            }
 
-                _storedTokenTime = DateTime.Now;
-                _storedTokenValue = $"Bearer {content}";
+            _storedTokenTime = DateTime.Now;
+            _storedTokenValue = $"Bearer {content}";
 
-                return _storedTokenValue;
-            }
+            return _storedTokenValue;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
index 83c9a008956..aec1fb5841e 100644
--- a/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
+++ b/Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs
@@ -107,14 +107,13 @@ public async Task<IEnumerable<DetectedLanguageResponse>> DetectLanguagesWithResp
             await CheckUpdateTokenAsync().ConfigureAwait(false);
 
             var uriString = $"{BaseUrl}detect?{ApiVersion}";
-            using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) })))
-            {
-                var response = await client.SendAsync(request).ConfigureAwait(false);
-                var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) }));
 
-                var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
-                return responseContent;
-            }
+            var response = await client.SendAsync(request).ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
+            return responseContent;
         }
 
         /// <inheritdoc/>
@@ -131,24 +130,23 @@ public async Task<IEnumerable<ServiceLanguage>> GetLanguageNamesAsync(string lan
             await CheckUpdateTokenAsync().ConfigureAwait(false);
 
             var uriString = $"{BaseUrl}languages?scope=translation&{ApiVersion}";
-            using (var request = CreateHttpRequest(uriString))
+            using var request = CreateHttpRequest(uriString);
+
+            language = language ?? Language;
+            if (!string.IsNullOrWhiteSpace(language))
             {
-                language = language ?? Language;
-                if (!string.IsNullOrWhiteSpace(language))
-                {
-                    // If necessary, adds the Accept-Language header in order to get localized language names.
-                    request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
-                }
+                // If necessary, adds the Accept-Language header in order to get localized language names.
+                request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
+            }
 
-                var response = await client.SendAsync(request).ConfigureAwait(false);
-                var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            var response = await client.SendAsync(request).ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
-                var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
-                responseContent.ForEach(r => r.Value.Code = r.Key);
+            var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
+            var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
+            responseContent.ForEach(r => r.Value.Code = r.Key);
 
-                return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
-            }
+            return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
         }
 
         /// <inheritdoc/>
@@ -215,14 +213,13 @@ public async Task<IEnumerable<TranslationResponse>> TranslateWithResponseAsync(I
 
             var toQueryString = string.Join("&", to.Select(t => $"to={t}"));
             var uriString = (string.IsNullOrWhiteSpace(from) ? $"{BaseUrl}translate?{toQueryString}" : $"{BaseUrl}translate?from={from}&{toQueryString}") + $"&{ApiVersion}";
-            using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t })))
-            {
-                var response = await client.SendAsync(request).ConfigureAwait(false);
-                var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t }));
 
-                var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
-                return responseContent;
-            }
+            var response = await client.SendAsync(request).ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
+            return responseContent;
         }
 
         /// <inheritdoc/>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index b594fcba563..f4498ef5b8f 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -592,18 +592,16 @@ private async Task<bool> InitializeRequestAccessTokensAsync(string twitterCallba
 
             using (var request = new HttpRequestMessage(HttpMethod.Get, new Uri(twitterUrl)))
             {
-                using (var response = await _client.SendAsync(request).ConfigureAwait(false))
+                using var response = await _client.SendAsync(request).ConfigureAwait(false);
+                var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                if (response.IsSuccessStatusCode)
                 {
-                    var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    if (response.IsSuccessStatusCode)
-                    {
-                        getResponse = data;
-                    }
-                    else
-                    {
-                        Debug.WriteLine("HttpHelper call failed trying to retrieve Twitter Request Tokens.  Message: {0}", data);
-                        return false;
-                    }
+                    getResponse = data;
+                }
+                else
+                {
+                    Debug.WriteLine("HttpHelper call failed trying to retrieve Twitter Request Tokens.  Message: {0}", data);
+                    return false;
                 }
             }
 
@@ -676,10 +674,8 @@ private async Task<bool> ExchangeRequestTokenForAccessTokenAsync(string webAuthR
             {
                 request.Headers.Authorization = new AuthenticationHeaderValue("OAuth", authorizationHeaderParams);
 
-                using (var response = await _client.SendAsync(request).ConfigureAwait(false))
-                {
-                    data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                }
+                using var response = await _client.SendAsync(request).ConfigureAwait(false);
+                data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             }
 
             var screenName = ExtractTokenFromResponse(data, TwitterOAuthTokenType.ScreenName);
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
index 7ad7f835c50..303cee3de28 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterOAuthRequest.cs
@@ -45,18 +45,14 @@ public TwitterOAuthRequest()
         /// <returns>String result.</returns>
         public async Task<string> ExecuteGetAsync(Uri requestUri, TwitterOAuthTokens tokens, ISignatureManager signatureManager)
         {
-            using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))
-            {
-                var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "GET");
+            using var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
+            var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "GET");
 
-                request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
+            request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
 
-                using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                {
-                    response.ThrowIfNotValid();
-                    return ProcessErrors(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                }
-            }
+            using var response = await client.SendAsync(request).ConfigureAwait(false);
+            response.ThrowIfNotValid();
+            return ProcessErrors(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         }
 
         /// <summary>
@@ -69,30 +65,22 @@ public async Task<string> ExecuteGetAsync(Uri requestUri, TwitterOAuthTokens tok
         /// <returns>awaitable task</returns>
         public async Task ExecuteGetStreamAsync(Uri requestUri, TwitterOAuthTokens tokens, TwitterStreamCallbacks.RawJsonCallback callback, ISignatureManager signatureManager)
         {
-            using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))
-            {
-                var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager);
+            using var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
+            var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager);
 
-                request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
+            request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
+
+            using var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+            response.ThrowIfNotValid();
+            using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            using var reader = new StreamReader(responseStream);
+            while (!_abort && !reader.EndOfStream)
+            {
+                var result = reader.ReadLine();
 
-                using (var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+                if (!string.IsNullOrEmpty(result))
                 {
-                    response.ThrowIfNotValid();
-                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    {
-                        using (var reader = new StreamReader(responseStream))
-                        {
-                            while (!_abort && !reader.EndOfStream)
-                            {
-                                var result = reader.ReadLine();
-
-                                if (!string.IsNullOrEmpty(result))
-                                {
-                                    callback?.Invoke(result);
-                                }
-                            }
-                        }
-                    }
+                    callback?.Invoke(result);
                 }
             }
         }
@@ -114,18 +102,14 @@ public void Abort()
         /// <returns>String result.</returns>
         public async Task<string> ExecutePostAsync(Uri requestUri, TwitterOAuthTokens tokens, ISignatureManager signatureManager)
         {
-            using (var request = new HttpRequestMessage(HttpMethod.Post, requestUri))
-            {
-                var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "POST");
+            using var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
+            var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "POST");
 
-                request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
+            request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
 
-                using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                {
-                    response.ThrowIfNotValid();
-                    return ProcessErrors(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                }
-            }
+            using var response = await client.SendAsync(request).ConfigureAwait(false);
+            response.ThrowIfNotValid();
+            return ProcessErrors(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         }
 
         /// <summary>
@@ -143,32 +127,22 @@ public async Task<string> ExecutePostMultipartAsync(Uri requestUri, TwitterOAuth
 
             try
             {
-                using (var multipartFormDataContent = new MultipartFormDataContent(boundary))
-                {
-                    using (var byteContent = new ByteArrayContent(content))
-                    {
-                        multipartFormDataContent.Add(byteContent, "media");
-
-                        using (var request = new HttpRequestMessage(HttpMethod.Post, requestUri))
-                        {
-                            var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "POST");
-
-                            request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
-
-                            request.Content = multipartFormDataContent;
-
-                            using (var response = await client.SendAsync(request).ConfigureAwait(false))
-                            {
-                                response.ThrowIfNotValid();
-                                using (var jsonResult = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                                {
-                                    var jObj = await JsonDocument.ParseAsync(jsonResult).ConfigureAwait(false);
-                                    mediaId = jObj.RootElement.GetProperty("media_id_string");
-                                }
-                            }
-                        }
-                    }
-                }
+                using var multipartFormDataContent = new MultipartFormDataContent(boundary);
+                using var byteContent = new ByteArrayContent(content);
+                multipartFormDataContent.Add(byteContent, "media");
+
+                using var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
+                var requestBuilder = new TwitterOAuthRequestBuilder(requestUri, tokens, signatureManager, "POST");
+
+                request.Headers.Authorization = AuthenticationHeaderValue.Parse(requestBuilder.AuthorizationHeader);
+
+                request.Content = multipartFormDataContent;
+
+                using var response = await client.SendAsync(request).ConfigureAwait(false);
+                response.ThrowIfNotValid();
+                using var jsonResult = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                var jObj = await JsonDocument.ParseAsync(jsonResult).ConfigureAwait(false);
+                mediaId = jObj.RootElement.GetProperty("media_id_string");
             }
             catch (ObjectDisposedException)
             {
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
index 011c9d8bc44..8db8a768507 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboOAuthRequest.cs
@@ -41,26 +41,22 @@ public WeiboOAuthRequest()
         /// <returns>String result.</returns>
         public async Task<string> ExecuteGetAsync(Uri requestUri, WeiboOAuthTokens tokens)
         {
-            using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri))
+            using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
+            UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
+            if (requestUriBuilder.Query.StartsWith("?"))
             {
-                UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
-                if (requestUriBuilder.Query.StartsWith("?"))
-                {
-                    requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                }
-                else
-                {
-                    requestUriBuilder.Query = requestUriBuilder.Query + "?access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                }
+                requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+            }
+            else
+            {
+                requestUriBuilder.Query = requestUriBuilder.Query + "?access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+            }
 
-                request.RequestUri = requestUriBuilder.Uri;
+            request.RequestUri = requestUriBuilder.Uri;
 
-                using (HttpResponseMessage response = await _client.SendAsync(request).ConfigureAwait(false))
-                {
-                    response.ThrowIfNotValid();
-                    return ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                }
-            }
+            using HttpResponseMessage response = await _client.SendAsync(request).ConfigureAwait(false);
+            response.ThrowIfNotValid();
+            return ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         }
 
         /// <summary>
@@ -75,41 +71,33 @@ public async Task<WeiboStatus> ExecutePostAsync(Uri requestUri, WeiboOAuthTokens
             var contentDict = new Dictionary<string, string>();
             contentDict.Add("status", status);
 
-            using (var formUrlEncodedContent = new FormUrlEncodedContent(contentDict))
+            using var formUrlEncodedContent = new FormUrlEncodedContent(contentDict);
+            using var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
+            UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
+            if (requestUriBuilder.Query.StartsWith("?"))
             {
-                using (var request = new HttpRequestMessage(HttpMethod.Post, requestUri))
-                {
-                    UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
-                    if (requestUriBuilder.Query.StartsWith("?"))
-                    {
-                        requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                    }
-                    else
-                    {
-                        requestUriBuilder.Query = requestUriBuilder.Query + "access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                    }
-
-                    request.RequestUri = requestUriBuilder.Uri;
-
-                    request.Content = formUrlEncodedContent;
-
-                    using (var response = await _client.SendAsync(request).ConfigureAwait(false))
-                    {
-                        if (response.StatusCode == HttpStatusCode.OK)
-                        {
-                            using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                            {
-                                return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
-                            }
-                        }
-                        else
-                        {
-                            response.ThrowIfNotValid();
-                            ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                            return null;
-                        }
-                    }
-                }
+                requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+            }
+            else
+            {
+                requestUriBuilder.Query = requestUriBuilder.Query + "access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+            }
+
+            request.RequestUri = requestUriBuilder.Uri;
+
+            request.Content = formUrlEncodedContent;
+
+            using var response = await _client.SendAsync(request).ConfigureAwait(false);
+            if (response.StatusCode == HttpStatusCode.OK)
+            {
+                using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
+            }
+            else
+            {
+                response.ThrowIfNotValid();
+                ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
+                return null;
             }
         }
 
@@ -125,52 +113,41 @@ public async Task<WeiboStatus> ExecutePostMultipartAsync(Uri requestUri, WeiboOA
         {
             try
             {
-                using (var multipartFormDataContent = new MultipartFormDataContent())
+                using var multipartFormDataContent = new MultipartFormDataContent();
+                using var stringContent = new StringContent(status);
+                multipartFormDataContent.Add(stringContent, "status");
+                using var byteContent = new ByteArrayContent(content);
+
+                // Somehow Weibo's backend requires a Filename field to work
+                byteContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data") { FileName = "attachment", Name = "pic" };
+                multipartFormDataContent.Add(byteContent, "pic");
+
+                using var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
+                UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
+                if (requestUriBuilder.Query.StartsWith("?"))
+                {
+                    requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+                }
+                else
                 {
-                    using (var stringContent = new StringContent(status))
-                    {
-                        multipartFormDataContent.Add(stringContent, "status");
-                        using (var byteContent = new ByteArrayContent(content))
-                        {
-                            // Somehow Weibo's backend requires a Filename field to work
-                            byteContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data") { FileName = "attachment", Name = "pic" };
-                            multipartFormDataContent.Add(byteContent, "pic");
-
-                            using (var request = new HttpRequestMessage(HttpMethod.Post, requestUri))
-                            {
-                                UriBuilder requestUriBuilder = new UriBuilder(request.RequestUri);
-                                if (requestUriBuilder.Query.StartsWith("?"))
-                                {
-                                    requestUriBuilder.Query = requestUriBuilder.Query.Substring(1) + "&access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                                }
-                                else
-                                {
-                                    requestUriBuilder.Query = requestUriBuilder.Query + "access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
-                                }
-
-                                request.RequestUri = requestUriBuilder.Uri;
-
-                                request.Content = multipartFormDataContent;
-
-                                using (var response = await _client.SendAsync(request).ConfigureAwait(false))
-                                {
-                                    if (response.StatusCode == HttpStatusCode.OK)
-                                    {
-                                        using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                                        {
-                                            return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
-                                        }
-                                    }
-                                    else
-                                    {
-                                        response.ThrowIfNotValid();
-                                        ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
-                                        return null;
-                                    }
-                                }
-                            }
-                        }
-                    }
+                    requestUriBuilder.Query = requestUriBuilder.Query + "access_token=" + OAuthEncoder.UrlEncode(tokens.AccessToken);
+                }
+
+                request.RequestUri = requestUriBuilder.Uri;
+
+                request.Content = multipartFormDataContent;
+
+                using var response = await _client.SendAsync(request).ConfigureAwait(false);
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                    return await JsonSerializer.DeserializeAsync<WeiboStatus>(stream).ConfigureAwait(false);
+                }
+                else
+                {
+                    response.ThrowIfNotValid();
+                    ProcessError(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
+                    return null;
                 }
             }
             catch (ObjectDisposedException)

From 043edd61d3d4e9eac6174b113580c5f6a31c6e56 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 13 Aug 2020 12:05:37 -0700
Subject: [PATCH 375/595] Update
 Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 .../Services/Twitter/TwitterCoordinatesConverter.cs   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
index 5a53501286a..16c15bf3d56 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
@@ -22,14 +22,7 @@ public override bool CanConvert(Type objectType)
 
         public TwitterCoordinatesConverter(JsonSerializerOptions options)
         {
-            if (options?.GetConverter(typeof(double)) is JsonConverter<double> doubleConverter)
-            {
-                _doubleConverter = doubleConverter;
-            }
-            else
-            {
-                throw new InvalidOperationException();
-            }
+            _doubleConverter = options?.GetConverter(typeof(double)) as JsonConverter<double> ?? throw new InvalidOperationException();
         }
 
         public override TwitterCoordinates Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -119,4 +112,4 @@ public override void Write(Utf8JsonWriter writer, TwitterCoordinates value, Json
             throw new NotImplementedException();
         }
     }
-}
\ No newline at end of file
+}

From b5542c019a5c1c81d91552dba017ccc4a55aed65 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 13 Aug 2020 12:27:50 -0700
Subject: [PATCH 376/595] Applied PR feedback.

---
 .../Services/Twitter/TwitterCoordinatesConverter.cs         | 6 +++---
 .../InfiniteCanvas/Drawables/InkDrawable.cs                 | 1 +
 .../InfiniteCanvas/Drawables/TextDrawable.cs                | 1 +
 .../InfiniteCanvas/JsonConverters/IDrawableConverter.cs     | 4 ----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
index 16c15bf3d56..3e459a1cfee 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterCoordinatesConverter.cs
@@ -18,11 +18,11 @@ public override bool CanConvert(Type objectType)
             return false;
         }
 
-        private readonly JsonConverter<double> _doubleConverter;
+        private readonly JsonConverter<double> doubleConverter;
 
         public TwitterCoordinatesConverter(JsonSerializerOptions options)
         {
-            _doubleConverter = options?.GetConverter(typeof(double)) as JsonConverter<double> ?? throw new InvalidOperationException();
+            doubleConverter = options?.GetConverter(typeof(double)) as JsonConverter<double> ?? throw new InvalidOperationException();
         }
 
         public override TwitterCoordinates Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -104,7 +104,7 @@ public override TwitterCoordinates Read(ref Utf8JsonReader reader, Type typeToCo
         private double ReadProperty(ref Utf8JsonReader reader, JsonSerializerOptions options)
         {
             reader.Read();
-            return _doubleConverter.Read(ref reader, typeof(double), options);
+            return doubleConverter.Read(ref reader, typeof(double), options);
         }
 
         public override void Write(Utf8JsonWriter writer, TwitterCoordinates value, JsonSerializerOptions options)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
index 3dac970475e..9da83196804 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
@@ -30,6 +30,7 @@ internal class InkDrawable : IDrawable
 
         internal static readonly InkStrokeBuilder StrokeBuilder = new InkStrokeBuilder();
 
+        // Don't remove! Used for deserialization.
         public InkDrawable()
         {
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
index 24dbbf4fee3..7f9604dc12a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
@@ -32,6 +32,7 @@ internal class TextDrawable : IDrawable
 
         public bool IsItalic { get; set; }
 
+        // Don't remove! Used for deserialization.
         public TextDrawable()
         {
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
index 911f3fb6c77..19fdc0472b4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
@@ -11,10 +11,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class IDrawableConverter : JsonConverter<IDrawable>
     {
-        public IDrawableConverter()
-        {
-        }
-
         public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert);
 
         public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

From df7dab1a449ccbb8df91cff8c2822c82dcd1a644 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 13 Aug 2020 15:05:01 -0700
Subject: [PATCH 377/595] Small improvement, removing magic number.

---
 .../Services/LinkedIn/LinkedInDataProvider.cs      |  4 ++--
 .../Services/LinkedIn/LinkedInPermissions.cs       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index 2018e7cd33d..4ebffa1c5f9 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -81,8 +81,8 @@ public LinkedInDataProvider(LinkedInOAuthTokens tokens, LinkedInPermissions requ
                 throw new ArgumentException("Missing callback uri");
             }
 
-            // Check if outside the bounds of the LinkedInPermissions Enum
-            if (requiredPermissions < 0 || requiredPermissions > (LinkedInPermissions)15)
+            // Check if its a valid combination of LinkedInPermissions
+            if ((~(int)LinkedInPermissionsHelpers.AllPermissions & (int)requiredPermissions) == 0)
             {
                 throw new ArgumentException("Error retrieving required permissions");
             }
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInPermissions.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInPermissions.cs
index 4042818c797..6d2d2fe756a 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInPermissions.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInPermissions.cs
@@ -37,4 +37,18 @@ public enum LinkedInPermissions
         /// </summary>
         WriteShare = 8
     }
+
+#pragma warning disable SA1649 // File name should match first type name
+    internal static class LinkedInPermissionsHelpers
+    {
+        /// <summary>
+        /// Internal AllPermissions for LinkedInPermissions, so we don't expose it. Keep it in sync with <see cref="LinkedInPermissions"/>
+        /// </summary>
+        internal const LinkedInPermissions AllPermissions =
+            LinkedInPermissions.ReadBasicProfile |
+            LinkedInPermissions.ReadEmailAddress |
+            LinkedInPermissions.ReadWriteCompanyAdmin |
+            LinkedInPermissions.WriteShare;
+    }
+#pragma warning restore SA1649 // File name should match first type name
 }

From 00b7241d62470f9a31b92ab304bf6535d5d70ae8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 13 Aug 2020 15:30:04 -0700
Subject: [PATCH 378/595] Update
 Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 .../Services/LinkedIn/LinkedInDataProvider.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index 4ebffa1c5f9..4847bc31077 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -82,7 +82,7 @@ public LinkedInDataProvider(LinkedInOAuthTokens tokens, LinkedInPermissions requ
             }
 
             // Check if its a valid combination of LinkedInPermissions
-            if ((~(int)LinkedInPermissionsHelpers.AllPermissions & (int)requiredPermissions) == 0)
+            if ((~(int)LinkedInPermissionsHelpers.AllPermissions & (int)requiredPermissions) != 0)
             {
                 throw new ArgumentException("Error retrieving required permissions");
             }

From 274492be9708ee1f7eed68a6a0b786394ff6481f Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 14 Aug 2020 15:30:25 -0700
Subject: [PATCH 379/595] Removed TabView/TabViewItem, HeaderedTextBlock,
 LightBehavior/AnimationExtensions.Light, and some other smaller methods
 marked as Obsolete.

---
 .../Services/LinkedIn/LinkedInDataProvider.cs |  11 -
 .../Services/LinkedIn/LinkedInService.cs      |   9 -
 .../Services/Twitter/TwitterDataProvider.cs   |  11 -
 .../Services/Twitter/TwitterService.cs        |   9 -
 .../Services/Weibo/WeiboDataProvider.cs       |  11 -
 .../Services/Weibo/WeiboService.cs            |   9 -
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  30 -
 .../HeaderedTextBlock/HeaderedTextBlock.png   | Bin 3308 -> 0 bytes
 .../HeaderedTextBlockCode.bind                |  16 -
 .../HeaderedTextBlockPage.xaml                |   9 -
 .../HeaderedTextBlockPage.xaml.cs             |  18 -
 .../SamplePages/Light/LightBehavior.png       | Bin 6164 -> 0 bytes
 .../SamplePages/Light/LightBehaviorCode.bind  |   8 -
 .../SamplePages/Light/LightBehaviorPage.xaml  |  39 -
 .../Light/LightBehaviorPage.xaml.cs           |  52 --
 .../SamplePages/Light/LightBehaviorXaml.bind  |  25 -
 .../SamplePages/TabView/TabView.png           | Bin 1392 -> 0 bytes
 .../SamplePages/TabView/TabViewPage.xaml      |  19 -
 .../SamplePages/TabView/TabViewPage.xaml.cs   |  73 --
 .../SamplePages/TabView/TabViewXaml.bind      |  97 ---
 .../SamplePages/samples.json                  |  37 -
 .../Behaviors/Light.cs                        |  69 --
 .../ConnectedAnimations/Connected.cs          |  16 -
 .../Extensions/AnimationExtensions.Light.cs   | 210 +----
 .../HeaderedTextBlockMetadata.cs              |  49 --
 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj |   3 -
 .../TabViewItemMetadata.cs                    |  43 -
 .../TabViewMetadata.cs                        |  54 --
 .../HeaderedTextBlock.Properties.cs           | 172 ----
 .../HeaderedTextBlock/HeaderedTextBlock.cs    |  76 --
 .../HeaderedTextBlock/HeaderedTextBlock.xaml  |  60 --
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   1 -
 ...Toolkit.Uwp.UI.Controls.csproj.DotSettings |   1 -
 .../Strings/en-US/Resources.resw              |   8 -
 .../TabView/TabClosingEventArgs.cs            |  36 -
 .../TabView/TabDraggedOutsideEventArgs.cs     |  35 -
 .../TabView/TabView.HeaderLayout.cs           | 221 ------
 .../TabView/TabView.ItemSources.cs            | 115 ---
 .../TabView/TabView.Properties.cs             | 245 ------
 .../TabView/TabView.cs                        | 320 --------
 .../TabView/TabView.xaml                      | 736 ------------------
 .../TabView/TabViewItem.Properties.cs         |  79 --
 .../TabView/TabViewItem.cs                    | 116 ---
 .../TabView/TabWidthMode.cs                   |  36 -
 .../Themes/Generic.xaml                       |   2 -
 .../TileControl/TileControl.cs                |   7 -
 .../VisualStudioToolsManifest.xml             |   3 -
 .../Extensions/StringExtensions.cs            |   8 -
 48 files changed, 4 insertions(+), 3200 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs

diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index f852688bc57..27c7739c333 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -154,17 +154,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of LinkedIn.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index 251e5fb711d..7a79b8fc344 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -92,15 +92,6 @@ public Task<LinkedInShareResponse> ShareActivityAsync(LinkedInShareRequest share
             return Provider.ShareDataAsync<LinkedInShareRequest, LinkedInShareResponse>(shareRequest);
         }
 
-        /// <summary>
-        /// Log user out of LinkedIn.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index a6eda59f07e..41db01d748b 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -273,17 +273,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of Twitter.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index 703657cf2fb..b461458ce8d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -400,15 +400,6 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
-        /// <summary>
-        /// Log user out of Twitter.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
index 3dd6d59a8ac..6975a33d005 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
@@ -163,17 +163,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of Weibo.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
index f5f8dd7ec99..ea2f6cea3b1 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
@@ -183,15 +183,6 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
-        /// <summary>
-        /// Log user out of Weibo.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 6426c03d171..4291bcd25b3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -280,7 +280,6 @@
     <Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
     <Content Include="SamplePages\ImageCropper\ImageCropper.png" />
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.png" />
-    <Content Include="SamplePages\TabView\TabView.png" />
     <Content Include="SamplePages\PeoplePicker\PeoplePicker.png" />
     <Content Include="SamplePages\PersonView\PersonView.png" />
     <Content Include="SamplePages\TokenizingTextBox\TokenizingTextBox.png" />
@@ -318,7 +317,6 @@
     <Content Include="SamplePages\AlignmentGrid\AlignmentGrid.png" />
     <Content Include="SamplePages\HeaderedContentControl\HeaderedContentControl.png" />
     <Content Include="SamplePages\HeaderedItemsControl\HeaderedItemsControl.png" />
-    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlock.png" />
     <Content Include="SamplePages\ImageBlendBrush\ImageBlendBrush.png" />
     <Content Include="SamplePages\ImageCache\ImageCache.png" />
     <Content Include="SamplePages\ImageEx\ImageEx.png" />
@@ -327,7 +325,6 @@
     <Content Include="SamplePages\Incremental Loading Collection\icon.png" />
     <Content Include="SamplePages\LayoutTransformControl\LayoutTransformControl.png" />
     <Content Include="SamplePages\InfiniteCanvas\InfiniteCanvas.png" />
-    <Content Include="SamplePages\Light\LightBehavior.png" />
     <Content Include="SamplePages\LinkedIn Service\LinkedInLogo.png" />
     <Content Include="Assets\Helpers.png" />
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
@@ -369,7 +366,6 @@
     <Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
     <Content Include="SamplePages\Twitter Service\icon.png" />
     <Content Include="SamplePages\Facebook Service\FacebookCode.bind" />
-    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockCode.bind" />
     <Content Include="SamplePages\ViewExtensions\ViewExtensions.png" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehavior.png" />
     <Content Include="SamplePages\Visual Extensions\VisualExtensions.png" />
@@ -429,8 +425,6 @@
     <Content Include="SamplePages\Connected Animations\ConnectedAnimationsCode.bind" />
     <Content Include="SamplePages\Loading\LoadingCode.bind" />
     <Content Include="SamplePages\ReorderGridAnimation\ReorderGrid.bind" />
-    <Content Include="SamplePages\Light\LightBehaviorCode.bind" />
-    <Content Include="SamplePages\Light\LightBehaviorXaml.bind" />
     <Content Include="SamplePages\TextBoxMask\TextBoxMask.bind" />
     <Content Include="SamplePages\TileControl\TileControl.bind">
       <SubType>Designer</SubType>
@@ -512,9 +506,6 @@
     <Content Include="SamplePages\RemoteDevicePicker\RemoteDevicePickerCode.bind" />
     <Content Include="SamplePages\DataGrid\DataGridCode.bind" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
-    <Content Include="SamplePages\TabView\TabViewXaml.bind">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -656,9 +647,6 @@
     <Compile Include="Models\LandingPageResource.cs" />
     <Compile Include="Models\LandingPageLink.cs" />
     <Compile Include="Models\PaneState.cs" />
-    <Compile Include="SamplePages\TabView\TabViewPage.xaml.cs">
-      <DependentUpon>TabViewPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
       <DependentUpon>UniformGridPage.xaml</DependentUpon>
     </Compile>
@@ -867,9 +855,6 @@
     </Compile>
     <Compile Include="SamplePages\Incremental Loading Collection\PeopleSource.cs" />
     <Compile Include="SamplePages\Incremental Loading Collection\Person.cs" />
-    <Compile Include="SamplePages\Light\LightBehaviorPage.xaml.cs">
-      <DependentUpon>LightBehaviorPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\LinkedIn Service\LinkedInPage.xaml.cs">
       <DependentUpon>LinkedInPage.xaml</DependentUpon>
     </Compile>
@@ -921,9 +906,6 @@
     <Compile Include="SamplePages\Fade\FadeBehaviorPage.xaml.cs">
       <DependentUpon>FadeBehaviorPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs">
-      <DependentUpon>HeaderedTextBlockPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\ImageEx\ImageExPage.xaml.cs">
       <DependentUpon>ImageExPage.xaml</DependentUpon>
     </Compile>
@@ -1056,10 +1038,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\TabView\TabViewPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1352,10 +1330,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\Light\LightBehaviorPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SamplePages\LinkedIn Service\LinkedInPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1424,10 +1398,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SamplePages\ImageEx\ImageExPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
deleted file mode 100644
index 4b495ab237ab617b406082956fa4df6764313695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3308
zcmeH~**6=C7RE!&Lrtfps8CaTYN&%!Eipt@kydpu#nhIVrIa2af{KI|HIy1^o|V#|
z#&Ag0P%+Q5LyRdWGMKM*|AV{MeYg*Iul3t|KYb71!?)MQJ%F0<^N8~R004f|yO4(f
z0E_h5-p0jo)(gJ0)}0MDe?!wpTxS)+^&ATT@a3CA3?9AC+@AHtO42TM?bZ_&pUMlc
zio3@h=)1=x=nuF=iKt-~BC$pCwht0Cu3TMhXMf{l43ZNQdh@pd#4?YK4<7#{Qs%v&
zNJ02z+c(#+inVx`d(WiV)qW1^G5f#xfBlMVN}WBVc+aU?)91JPe1ih@s2RWdDE7b#
zlSE;AJNxYW-cbeRgJqx>_4-4jy@15z@Bekg<CNPPre2t>?02C>h|5THccD*?22UmI
zbwaK!FtbuOkn44;^MrC+yHxb07glX%DTmXso0g#<B)qoTv7B>K@Er)LZ}tm=>AKK_
z_H^FFNs$+~FeR`+fi;hS+{J1mv$>dEhK3*Li%OHsMxWHc&@J9AHrLq0X!JNWUA->Q
znfdlMQvc@MHI?3WDt^4UUz4w%B~1e5uL1q8hE_l~;aq%e>^`#VvFhc7%Ghwv7*r@L
zhJQ{WpJT}ef>=`}iZr>sIHZ&uz`T;|sI{TiD4t&y#`F9{8n83{k`t!HGi2`iI~ruL
zRg!dd;dp7c2%&21x2Nuyt`}+5ww!`E#?htvT^FoVZzQ)jB&~d974ys&)1S5pu?!S`
z%`#z)41pmg*|#|6DsKk~Y$M0Zyu+<0vYk;}7A(I4)B1B}d2c^OdU+yBIe)}qoVA8d
zJ}MQW$h|C61fT?tbfn~WYdf2YO7F0i^~&_n7ip7FYR+ka?6DnGr;JUB=8f-pWiNjd
zrs<ak=e$H7vv#;z_k}dv-Fvw4sRWh^WvNoC3-3{fvIKyC!u}cUoT~O{e0eBbO`qkP
zvE>W%?C_MTm_dDWw(Y>D!pG|{WJ>wWC!g0SyWJ^%ev)z&u|Ji8bt;{@ySKC9To=D;
z@%-I41W!)12g42isvBIQTmOEI2*_kR;j-sEN-qI7-z^_|Sf&CA(lifK6|(nqcl4_q
z`M7lOyu<%R)03fAr~XF{>L&e^6Jo#UnQl2_Cr~|1BtSDu0Iih$^+f&hoobE|())qO
zw5Y0z_W>_~gQMA(Zxjcw4^}8S4C8Mi(yVzM6?j_BVE*npZM%o^K1NCZmYOsp|Ln1G
zS;>9jkr}KXTaCFQ_q4-JqPk(|Q6${<hgtqN?k_IkhrR7I*e5&AqmWYZy!NIk;M&~O
zu~DZ&Zwlo@D}~1qe8tZFd|>g~997JC(|!K8$_xdb*_Is>f~;#MYl*`^Cc9MbV`~SC
z-@pvfdNMkD#KB*E_r)i+Pg{R{F0#G1@5wM-7(|KdNoN^S#Slkk#|hzuHEH{-YM>3x
zoJq{Cx12{%3-b*<OyNP^nT<gnjBz2}*?IS4`R{70RhERZ7T0HLM~VSe+?wYj1uhI*
zuhn+owcHzLm0Vi^w~Y_UOr7m0Pb`c{oBP@4B3@po31!(+u2#r`!P{b%VVGZaU297D
z4PQV-)CjHNl?G?qzL0hNI!!H$u{w&ZsG_Us%3mx7L`<|CUduz<pC<NSh<_Yk*l<^J
z<O%FLL&SJ3Dy}T_-9&OpYhY0tor03klTO9S)&&je{N_{#C#joyN1Uvh4Ht<*7E+O2
z>4EvaiW~NYHy5BTs3#r1985Qm_qZU;sKUG7O$%Z)z9*r9we7n?X&+|VY5M3&6T_3O
z@aNVtu24X5F}ffoUU(8H4z>tO8SHjFVk!P-0@xU{P291pu{^qp!H`Zn2Jc=+e<%4Y
zxb>ZavuqZumUhBP@NJ94hc>{(WTJRN!EKI&0*(KaWpRBwEI|R5G@Bqlu;&m2P=p_=
z;x!WQ$e<OlQEPzDBBNQd7jnGFSn!{Ya4{18=DheSsTZ1B?#!O6QgbSVkoPP27Mjc~
ze}MHbpMO7;x4UDD=zbYK*34$je%s_ofVMy77m3GdE7O;OQdJnaTWBc-C;_R6;P_cq
zpW1p;JR!F4l(eo10c7P;Z*Flq$7r|IeZXy5e90Ch7nMcF7nJJ<0z&T}{dw?Qpo5az
zAZ0Zsp)=|{He9BfCC!5u39ZM6d7_KmM{k`Qu%}LR9vwU_UQ|GLVHtjL+5#cPjOJ)M
zH8LfBw96mOe4AcWA4y;5Z)_vfIO}A1Y-<}(o5ALrR2`GecxEqYXle%AdoCv^W>YII
z%;A?ogJ>E@oQUG$EkiG!<{y4W@EC3We|VOTcH;$|k?H%qlnV>W3%xFB-b5;A8iCU@
z4^A~BBCpK%8W9UYB!CtRp~~FXF?wBB3%&kI-R3PrWl55f5l#@yHoYj78cW_Fqvj30
zd|LQIfL_x5hfo9(xU&nGE|d9D$r5Td66OGyV}}Yk2L$Rb6Jo8KJ`{saB$;u{2oNWf
zem!ox4@~@NsDO6EMXj#%EW3qggwG4*a{1xt2jlDuVwP`Ir-Q&>QmjkLG?T%@Vb%NB
zR>#MC)@O~%eXO8WsMQgoc~yoYZr?K71i%?C5ZiTMIAh~JAWU9wSrKO#v_JV%NXBt)
z?2m+5U<8v@7rF<Kj(`h9uIDxz95#^d3zNHT$CtICLXLaT)W+#p1Yvk*=CCsY=55w;
zLVJM-g{@RaV{4J2?Tz+tzk<3v8NKW$A292qq|C;&^;b2CTy$AHDPNsPyMHbI62M39
zuig4ix5e)BsSR6F4@M`KYPctiE8NRHzZ2K+84N2IYKiD+-l6ER)Aq^PSyI%E3*+~b
z_^e}Y<?AVn_^aJuE#To_8)UT~>#rW7puRNiBjbfvd1Ncf&Cx%!?y)@5;XaCA<DRwf
z%`iQ-H7IY=Q<4Z4bLF&j`<VN<YQo%0coZi7peeZa(eU)0Hz7&B9t>5%MRl_f6MWx0
z7l1)IM*wVlH{(!}6fYr_A$=o~PM<E3f|c0^-D=LceZy6PYE<Vw?Ehg+Mw8aLkv*8h
zhYTJ?Zx*_KO)UAmEq6nxIGoHmazVbklEpi3pK))+XJSKPgn+Y%JWx60Y<x>_*Yf%^
zdFvyF%(3`&=|D^Ooa4NCGr>76UjtNm-Bfb_7JS8_*ctlEF0Yk-rDgQ62p2(%?sRC{
z?wf}RSUMGV?Ygr)XP}F);%%sf&82EPtoQ&Qm4V5U3FcE3jOyiW3k?8c;Ov$IDo8Pc
z()X6s#qFyNcPk3d@)d06<uY^UNNy2ijO<zXSVTin*eZR+$RIQ)F7H4n4@2X1Sv*dj
z<K1WpPGWjR>$Ze;=5kjF5w}&b4wQGD<OdYQG=#06BTqrwB*ZOHDBN+Zw)I+NHmlz6
zKI6RW;xd!EIY5Y5h5UtyNJ!3>T-?*rblDAA!Q5H_rU2r)tzwn1C(#X;J~ZVr({YkD
zg6wo?IS;YBKdggVja@ppyo)+9+dMu3G!I>GjqOxfi^o0-hl(_<7hmjWt$Q?_A#1qe
z+u01Zc++Enk6|X^pFA8*`JO?f1*}vjbu!#VElniGR!cel7I(2bJu(E|i&BPIR}@mE
zG)qOxYmoZ3D2hzX5+=Sfjimr(E`$_}ch!O{%QSI)9>hmYT-<rJQvDA&)OF1vC@I(#
zP}(gD0i>8*GGZe^Z3(2r$~0rRsg07MS<f?o>AnB+zwd#+H=^bD+VhE(_f9!uYP7w2
TO!KSG-WPzWF%(j1=oIlU(~cTl

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
deleted file mode 100644
index a2db4b8dc80..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
+++ /dev/null
@@ -1,16 +0,0 @@
-<Page
-    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:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    mc:Ignorable="d">
-  
-    <Grid>
-        <controls:HeaderedTextBlock 
-            Header="@[Header:String:Name]"
-            Text="@[Text:String:Windows Community Toolkit]"
-            Orientation="@[Orientation:Enum:Orientation.Vertical]"
-            Margin="20,10,0,0" />
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
deleted file mode 100644
index a5795898a0e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.HeaderedTextBlockPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
deleted file mode 100644
index 77cdba59f3e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
+++ /dev/null
@@ -1,18 +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 Microsoft.Toolkit.Uwp.SampleApp.Models;
-
-using Windows.UI.Xaml.Navigation;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class HeaderedTextBlockPage
-    {
-        public HeaderedTextBlockPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png
deleted file mode 100644
index b2235f1b9e4577a48af0b24d219f8485b2a71878..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6164
zcmZ9QcQl*r8^@DaF`JayBSuRrwEEhs5hB)W#0)}PlvZh#m{qg(Y|$DaX4EXAX3=4k
zB34qfLlIJ=W?R+%^8WjK{&=3}+~?f)ea<z%*C*N963xpc$^`%bcuh@=FaQ7$#{BOC
zvoqfn&wE}lKdgaBQ#&y8xexYC0sw?YOpOfeLW?#DzK@pMq45)95ga9Nj;>@|sr>nD
zBb@pSO=Xcoc^X?Jv2w9hyZp#udlnKkApBQS0A-^=-~O2Sw*!Ah07a;dI>8@tDWqsS
zvO-WcZOMQ#g$?zS%|vSs`r1H8)S{*az6DI&3zEMrXUdSy;e!JA-Sl`>p*MZypSqm`
z(Q&_S&|w87QrGrDP{hajHkQH3UkjWS7X^U(k)5Zt34xpJtcw#uDS%&mo3Ue$uTnXA
zU(?Nv0D3OC=pP9fKiaE3`HKeo2q<EF%9LU-y>f$|BB=nPYi$4q_~=1jzs>C|UXn@j
z7X$|N)`<Py`YsXZiJ$<>OI|zG7_d@a4*UP99o%#{n5Uc(p5R?%?v(UG+?{z!QaIKt
zfv17X#EbyAT16NpW-PaFSUY#<1CJfJj2i{OkqEG##vyj+yUH#N$0kAM;2@vg;23WW
zVog{L$B0icIIRp;CidTQV=&@62l4WEiJvlCY{}@DY#>yc%)DHG5txI!J6Bn~Y;aA0
zxfWCoCO*J-NnWhtx0wBrBy%?ROlBV#X!Dl0NzPXgI9;o_Xu<JRCIC10Ib8SBHvm+6
z8V0Ji!in`v_P*h@AMnzjX&wl>v;krsl?^6JZU(D5wwLPs$++zphG(nR4~VxmV711D
zyz*|dt;tAz@VYYH@Y?kQ7vi%{X=F9?sHzM1J6{DlhULA>4Y-2!j%%-kS5Sn_Aix}&
z@{e!+=;IK@jR({RtadgKC{idDFuZQ|!<DT<zIy(%(`Gz{#R$-EA7h1%;HZ$<7@GL*
zEs}Jc3?R*)MP0A{C=-3XbK_D6S3Zwwu(q61$e{bP^1JKz3<**zQWrsB8g6IybLf_?
z)MQcG^u>3vsnnhqIGaaMWHcCNvADB-yA~-AD$L0ItVa)BL%4~9p7JGrJ&-;bOa<)X
zIqrA%O`X_0FmjOGUp`PsdvN~9LCkp)iex%(#_pljxpUmb@3A)C=M(bWCRkRly@gSp
z<=u3X@=5|U=i<2}uC4=&g_6nwJbrv!$1cn5IQc<o*=)8#@n8iMYgWUzuD^Ug>|XJ|
z3&C@~7&s9X4%LNt!E7I9okf~JfO3j11+KhOih`rI0Y)PA(Lc$if##Qnqv;pG-*puf
zKne}Gop-U`AvbBj@}%YbWu*_HR|{4Q7-nFb$6(@>+}XQU(N=O%6-tv=YVXm-@p@N=
z4=!-S9dkWcr{zEjRo{%alykS@As3V~S@W&BLJmD*OuO=^tzyV{9%i_fq~ysEb_~pQ
zZoc>bgg3p=RuMdX@V==)tYDC*^5hm6YTb(hoVZ&hTG3k7Kk|JF4GcX?yTEHv%z_;A
z1(z}{bg+Kw$G7OLDz2iei+p2E#Zv|ivfhRSNLj2*^dA!6QQYeIYk6+DAj^s?yWOoV
z#T`~7nbAYB?5DfN#Pldss+Euc1W4}PAAT**Qbc!kc0Ysk5m9TC4)pQR`{Z-ND3XkK
zN>NJ%)YNk8pZVnDix3yQCuKi<{sex6QRY;}6f0y=JG5a&F*4CXD8g8{`$H>7v1WZw
zoV_&1n4~!QzT|zGvsjM!GG)3Gfe$t<9kj9$ZB?<qOMO1iiQWCQ+#w*KTEMc)Hz>Pi
zT&*4W5-HE3(AgnV$UjP8<J|~{AU1=MHfzf(`GKW72FJQsVs+jPG?MNKxY^mf?|ckN
za=O&KI@$@V_j>{fDX%wYNn0s{5T6Uo%YmvJ;P)X!yHET|n{}<un|a+<^>v|NdA!{U
z*`%g9@kJaqKmr$W=tfG88{JhTE7YU8vM|@&g<qzku4cg0|4oE=pYVBh`$_>Fz8fTv
zi7lIQQrGie7slk5t0;`RGVAXP<J!g`<F}ls;mgk&zr<#+q*w6+1;Rqmu$Wae?Qx71
ztD9S)yZ}7=yJ!;i0k6dwF#gpW5aumbf{nxvjIY5|h55}4THGGkB#v`uznHBH9c8Om
zVTfbFD07uOM-+jbnBw~^Px%bp6L)%}tYX2f=<J;$a<(4oRa5M<DG}*PCpOK&z716X
z?rd#P;da-jaxK}4>69h!uN_bE`btX|Ua8*wEvzDWI}1}&=7A_*mjj>{GFv%cGJH(S
z)7z+C2IsyoO?=a@TBhV){a%>Y)1!%Bbtd@_+e^~8Q*r{(eas!3cIfro^^w<uEaQAa
z`_OxzbjMTk%njFDc8ylEf>`B(nf2Y4zFMpK5bQ(#0nU=?s0?r}BqbeBAUx9>5hlKd
zb^({;ssE(|ec+oyT<|OTjaah!ztq8Xx8C5qIKbdAKO2V12E9zQ1X{oC_uLEXC~H8A
zi9O8ZC^lKQKi_YyQIUS~z9fcH<CA~x8NY6IL^#0`2)W?<2Bl#|J*e|@gL6r-no(P4
zUJS>juQ|YlVG!r#1Qj=5F+|DP(J<4a!3|G<{n98++~#Px725>;;kjUy$iNQ5O0G*I
zrBxI7L^eg)ChOoub*||3#x9{9Sm_qW?4_h*>@wMjRr%4ICL+^b_Z)KaZC%=)1Zpl*
z@#)f;dtX#b8w(psHXRwP9At)2`f9o+p@VnULV*m?s90&4gPNWlB}oLB6-;3R8%hdH
z8*cEtgg@FfS{PO4*t_K&1d5jP(#To!S&f)J38f{mOwQ@iiM}(}b?Xt>af4OiO`DO#
z;)75cLzMcoiCiBkIV2OVc3Y0X1+z+0qz`#(@r?kzKJ&9#u^~_2m*enQF&Ya?fGqdd
zBd_M#hx9lmdn2^M#8fcBrD98rmQ|xq9zcsO+8^vP)%Rxo#9D=()OyFwpIN^9N0u?+
zI?)s%qr-=Bn(=AJ*zMMTl@5G8s1GjoYBZi@b!IF~{>oaD))Qh4nk;zfTVKyOuuVVK
zZeneD2w)Kr8<m>X^o^Rq`|NqC$Jh(j`!PD+i)KD}ch{{kc$It@(LoVb($_u|h9X+i
zGrqda*Zs~rZrZZ(mK|;7MlR*Q&)jVvJEOIS9W*`K3pJJ0Bsb0NJ>QM+4STu7L$sV1
z#s7mTY-_5&#}Q!UhP^&2zp}I1BoLFS8cY~Dp1!4UWTLNx7Brd=wrgaaDFg<QAUi~B
z!@h@ku9&p_r&xyeAlg}^^)TY&-uHW6R|Ou9D@xxbfr(LEO1<R6I@^L{UHQs>?8=jw
zo)*@^LE_n`j{ev!FS+@F$xLmrM)AD?W|uR0!jUo*Dj?`qsG7JE4*9Wwi$%dy<8?if
z3A9<x@>}mvbZ|IhaK}FM+f$w825Zgw<+IP7EYY{x?uDkj&(yxe-9Qz!alARYna-Fd
zG%k)DH~{c9yXKil`Q0)!?$LBF()b>Rs#^_D^crQ1Vq?<OmnO$(eG}ob(G7nd`et0;
zq+KVE=0ql<x3Ui$`eawq-YcdXZndgcSUHb`EA=lNghxEI)L}t>w6E>`TAiK&K>Hqv
zXRoPtj-1-=x{Ucf=dO3Rc)q^peMtP}g2C;gHQ#+>4zhV}NH=cV`H>4!{84Ka7@XZI
z{j(KcYQ1=%b8Wp9D-Wcn2pPRap)@+%X1fD<xsjqd<VPGoNh^r8Ox+Uu{LAp&;}q?M
zv<$!pQ^2F3mDIBv?3cyrSdh-QXMm-UU8>CD_@38;DiK(zN>WC2dc_ow>_Q(f7&Jfe
z$v=%{!AweTalG@YXTwDd_?7wY4A`;}c!;>|yR#~bFC_6-vco3uMuT3i)^c}V{2f+7
zBey&OD1oLe9h$Y0Y*ru-FFTIuuN16`TcLWJ;8dl2w|)<X6v-2nSmu3Yw#WevD(<+*
z6=%OB750bc_qY`GejX*%_m3I;jDUo-g;h8$En{2ZTJV#r`3n=``Gy<S^!rRf8eymR
zwn&2ob1Ud}=$)STfzRi%S$r;%9P`YYpisF&6kxHIaB)X*Va|p6ynMeB07XQG%UE1a
zq-6g&a91l4JZ1&B<sS=whZLl6X}w)7Rbor#OWL)IB#~^1c2LAL{B>-n9V<jFwUQtI
z3=A8#J!2LxTA7kav9n{e<y7jY#2Rr-lL&<u3nL_sM(C+yKh1wQj*|KvivKoz<i0i!
z1JT{|pw5Jj;^zrt3-Ojrovv5Y6F0uSKy@08H1W_qS{{88#^(^>mA<F9aqqH!Qr|3`
zS%DRoCTh0_vek@7s=m$DtcaYR{~pNrb#mI3$dqciLIS&%k_7qAYZEO}?+8u}hR3A(
zGk841wOYns;n6>eu|rUx-Bj+yON|Q%b3w%i{*BQH(ehUu4~ui82rjAXrwtxYzXNPM
zAk}3U;0%H#M0sTPwv=CKOHWTktvr>L4!#`SU_GeQ@kHu;#O1^;2lrN1Lt1RZOHcuQ
zJnq)?I-qlxq7p8cb6%x8-6Pis{8ol<C@xVg>T4L$w=S=d-kz4hwqOeA{PHBNsLAPM
zh#je6!>(U2KS7Prh6(7~gRz0(k=Y*|`&-MjL1yy6YI8?|7%>b=y7me^{A~0wR_u|x
zix4y7{8c6;(`Qu<g$ajkS9=rwloUNZuF&+o9b7zqf}Sk$>7u^)gMQup_n-c83eA1d
zu6QqBO4fR2u3P`qUCe!yV^{ScBb|@F;qLa<hPd51!RyhHP{%UdF8Oa@Lki38|0U%T
znCQPr{!H(>L+ff=Rdt|;6^iGwUGZJ=!R9I*b!(ENXdh^ddO+vY(v5NP<_xsxo!m=v
zIvN=E(knW?@LvkJh%ve2y~)+bK{Uo%O2<XoO>YGBMD&MNhEU5uW27Pd$sD<bX!T9o
zvT%*|V~@w=7VSC&tIQGu0hP@dgzce+)%-^DGGft*%%V5Ul1jaDX94`QqDOk)9N@C7
z`@v^(av9RF_8nSk`93alE!w)zXhcV`YHCyRJP6DW5>%4xc(Kdlk+u>Ie>$r2sP?;S
z7PG%&=esAl0uTyG-D=LXB(Ny@4!gC0sLrb4=Via(3c1JPX==eUkIkNIja}&N{+V@u
zNwiY4-jC$Q*`mP$&V7+x+0!wqI7n7+WNk51s+HRvt`95P*VX>q(%{~i**B;-qH1D#
zH0in|n%(4pO+apILJ{p3yo67ezhW8n2EM)L;Kq4w5nbV@Iqv6l_DPOVejCQQ>GvG5
zjRpMB_=RiB!sF=#&C=Up>hYTEq5)>kJz;L<vy<mQQoNpdfsa<x8YY}W?C9;Z*WWe)
zbCpSA$>PQ?%0sb)kWB+0!g$;xl8?ycHdIXc%KmWkd;B!sCIbw^CfTkJ2?ZEXkAerL
zy@6=k{s1hpD3(=nJ;1MJ?xm(LVPf*VEwlBm+X3*ot`0oT8CXj+$h0CdFZk1K2~4BM
zKPk7v$Jy%rOu9lgwG{o*^MapvHcoH?Htt?>Sh}TEl`ewpcFe2yfFA8-vzKXkCtC0L
zWSWGn<pwZ>J^cz~t`5^@tiu@}W4%0cxoyP!UMggVY)g|P3g1U~AE~!KX^~Nk64ZAd
zYf5uzq~WETuty#%k!nuXgiq0`c+GM?p$aWorC<e`vzB_iN-f2zPv5WDdS{GAFQ<}l
z=r!7$9KN$eHYVtDv|K%GA{z4UY<eo-re>3G?-^3R+11)17E1U>PO0+^pdz>@{Q-ag
zg7HdXg**-V#o}J0#dP9zF)pjNwOFcwdYPq=XMZW8c^4MwtJSS;w507`YYUjJR0vh2
z!^Y5zam3K@KY2}z*6B>HhmbGE%{vCAq*3X5l=BmsF(-3?$$1g*Qd5yy$jx>dByGwZ
z0W6B-D)tK+p-hv2?^7m6Fs$0}ULGhyucjS#O4SA&7MS*Z?c9d|zKYS-7g)##wvr@9
za%V|(2K%Hbphi=qQMaH`_EPgN%2SmfAD<?S{=X6kBra>_qJgpRc%D6!9%^Yh%>PqM
z5?J*Z5L8*_Rdk@4<9b@R`;o<PhnT)p7-iymb0%h~dSn)-F98%WCjqO!#FF(loy8u9
z{T@=BscULcZBPGvhwE$FNT8a7yJLqPn^VwBYU`8n;lH>36ZF<FX{PA6YRH6qfR)@g
z9aoeM5_cX8B~GXx^9ilAGG`JnF@+nskimArQx6J`{Bi~93c)yF8IAs(NfAk}!O5wb
z5~d~{3GGsH;|#n^wDwBw^(5|s`N6(VaR}eMkh|%{2S%?_$mqpP>W%bdO>y!#D1%fE
z^Y||$JBZ(0C9Ug(-*Toy<G3(ms8bcP+dB%LGFd|iQu%x2!YS>;1MM>i!mcYN{AI?}
zg82YveORTg$J=X|pQ=2w)A<++QK=Yf0e#$7Vu2Ch<XIZ`Fw#e&1UQ2>(F#et04UgQ
z89VRnALfgs)+|N@N|GJ}1(YgfmM0d9=aUa3=cvD1;PRf4-`wpzTgo!LdyJ*y0cQMM
zbv{cLzZIELH$X9nX(w7Jt0t<Rb9TmN_`J;9>axcp9j<^x>;FBCx$gDAfzaVrItBDx
zAI4a)j0p?hcOYHQ4GjEyX>0I9i^^rMk%g^XABA{whf_FC0W>6tF~cK$c;<oiCydlN
zQQ1+ogrY%A1=;AB@*{;Y@k=())FZn@;&XWt;5BTyKg7VtKNG~6%O-o#-Lrvt%%2SA
zxWr^50_x~D$$(!aaIkb=^4Cm+PtRfWSKPSA;PaC08Z%QtkvRWD_}vRT26h1<=oG-l
z<CR$IF+6_Nm-m9;Z8+_#M8-Cx`C8XvmYVz9P4QEid{D$+$3*Tq-cptO8svdG<f$S>
zcN<DP;_6GZL6#P2J^s|96_VBZ-$jV1S&zzH<`g7in2^a{tcc5;mh5P3m%PLCxy6Q+
za%H81D7_zo9C9|S`1<Hq!o;1{`kDt^H~K^UM3^bT1RS?c1NTXAFlvCw3e=RpgtJrB
z;~yv*KNgbG<JjHWPRNvhee*O>K<J)Zd21L%bl{}mXezN&l2JFP^LKqgH9OrE$X*~H
zcxM#d$7%$4#|#c-u=J7dmdYhs95dQ_9dm3v_ilW$7U|{JkDrnOnK)JnOby@>KEjOT
zcF9^lKld{yTej-TEM*zuUBeB-?T)E{=7+`out=LB6N*7meva&<di)=?C}W8}1dRd|
z)Gpy>;-6_?>1Q%(EFr5K(;&Tn^F$)0hz9c@KZV<A6HYM!&~C2YsmWi>erF){0nW#B
zZMV>zH~MdkwEI&$qmvJ%ltADqK5%+WhqQnN!|A3(i?xvF%20K4e)b2&5yjUe1rXR#
zBc6O{l3&&8-2)Frt*_Ke>r{ct>7f;;)=BI@0sDQ3u!u{5N%r^RPP0anr3~FJ*i@Jx
z>by+!mtB}=zY}C)PWEo|T;=cTtq;}&jv2=eN!5g3N+1OiSA1PhQepCo@kr;ti^F+p
zj_qQvz2m^d?qH-3IMVHSZmpwa=<^<*y+#npux6i$*-%VZOE6s>)%M0<Smh4?<}YDM
ziK)#j?NuWWh5z86Jvi*7*jAMH#5ql)swQI;w=RF52}h@81(0u&YKs<$9TUQ)v%RS!
zKHg!}390mQ0j4ZP!uFHJjNy|XIYkBFIvOstgkCP)2`4isa9U9SX>$8u3ck<ZSbM6x
zT<j?2GH?33x0nPb$_(Q>C)!osjU4IMna2Ks=$;Y+lC22-bpC&e+DV;~|LQDIGTMFM
zY$<@bT7`Iah*Y}aby}#oW0dm?meXB*Xf_mJ)3HJ>^(`7OwH{i0SC}ASxT9;qO2MbJ
zms<S>3>qztX`j=6VVFA_$z}rn&)vA%YO&$8cYP+J$ErBCZ27-DZt_f|YmX2Rd2%u~
z&QIPmPa`Z>$AXCwxxfisW$nYQW^-Hoo;!BTCS4}FxRm~rqJ3B{5v4o<td=P3mX-e;
z$kfGa3XFsb@fls`v96icJb67*ISQa>g@eoj%XN(C-A=5OmYL5ftGX@4;7U^7t?6@2
zmR;IqR%>a3;{+ksn7lf&qyb*vb5k~I%J~_Sh4#37{H<3~11=Iu0)#(Vy0=r8ObN>e
z6OYX1>plX`#jZl2h_&^bB}q_qj#NO|0F1S|aG$owO;p%$g(3t{i&a*fhm9_d1~${#
azb+0$RdwfQyenj4et;>;(x?G>HTHj)(0CpI

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
deleted file mode 100644
index 4019e9a2ce7..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
+++ /dev/null
@@ -1,8 +0,0 @@
-// XAML UIElement
-<Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
-
-// C# - Light can be applied to any UIElement. In this case it is an image called ToolkitLogo.
-using Microsoft.Toolkit.Uwp.UI.Animations;
-
-var lightAnimationSet = ToolkitLogo.Light(distance: 10, duration: 500, delay: 0, color: Colors.Red);
-await lightAnimationSet.StartAsync();
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
deleted file mode 100644
index 8eba95bedbd..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.LightBehaviorPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors"
-      xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Grid>
-        <TextBlock x:Name="WarningText"
-                   Margin="0,20"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Top"
-                   Foreground="Red"
-                   Text="Light effects are not available on your version of Windows 10"
-                   TextWrapping="Wrap"
-                   Visibility="Collapsed" />
-        <Grid x:Name="XamlRoot"/>
-        
-        <!-- Shallow Copy -->
-        <Image>
-            <interactivity:Interaction.Behaviors>
-                <behaviors:Light Color="Red" />
-            </interactivity:Interaction.Behaviors>
-        </Image>
-
-        <StackPanel Visibility="Collapsed">
-            <Button>
-                <interactivity:Interaction.Behaviors>
-                    <core:EventTriggerBehavior EventName="Click">
-                        <core:CallMethodAction />
-                    </core:EventTriggerBehavior>
-                </interactivity:Interaction.Behaviors>
-            </Button>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
deleted file mode 100644
index fd59ec7d5be..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
+++ /dev/null
@@ -1,52 +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.Linq;
-using Microsoft.Toolkit.Uwp.UI.Animations;
-using Microsoft.Toolkit.Uwp.UI.Animations.Behaviors;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    /// <summary>
-    /// A page that shows how to use the light behavior.
-    /// </summary>
-    public sealed partial class LightBehaviorPage : IXamlRenderListener
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        private Light _lightBehavior;
-#pragma warning restore CS0618 // Type or member is obsolete
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LightBehaviorPage"/> class.
-        /// </summary>
-        public LightBehaviorPage()
-        {
-            this.InitializeComponent();
-
-            if (!AnimationExtensions.IsLightingSupported)
-            {
-                WarningText.Visibility = Visibility.Visible;
-            }
-
-            SampleController.Current.RegisterNewCommand("Apply", (s, e) =>
-            {
-                _lightBehavior?.StartAnimation();
-            });
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-            if (control.FindChildByName("EffectElement") is FrameworkElement element)
-            {
-                var behaviors = Interaction.GetBehaviors(element);
-#pragma warning disable CS0618 // Type or member is obsolete
-                _lightBehavior = behaviors.FirstOrDefault(item => item is Light) as Light;
-#pragma warning restore CS0618 // Type or member is obsolete
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
deleted file mode 100644
index 2ca51bf1cfc..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
+++ /dev/null
@@ -1,25 +0,0 @@
-<Page
-    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:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors"
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-    mc:Ignorable="d">
-
-  <Grid>
-    <Image x:Name="EffectElement" Source="ms-appx:///Assets/ToolkitLogo.png" Height="100" Width="100">
-      <interactivity:Interaction.Behaviors>
-        <behaviors:Light x:Name="LightBehavior"
-                        Distance="@[Distance:DoubleSlider:10.0:0.1-50.0]"
-                        Duration="@[Duration:DoubleSlider:500.0:0.0-10000.0]"
-                        Delay="@[Delay:DoubleSlider:0.0:0.0-5000.0]"
-                        AutomaticallyStart="@[AutomaticallyStart:Bool:True]"
-                        EasingType="@[EasingType:Enum:EasingType.Linear]"
-                        EasingMode="@[EasingMode:Enum:EasingMode.EaseOut]"
-                        Color="@[Color:Brush:Red]" />
-      </interactivity:Interaction.Behaviors>
-    </Image>
-  </Grid>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
deleted file mode 100644
index 9aeebd1d673de8670b59cb522700c93f1c75b887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1392
zcmeAS@N?(olHy`uVBq!ia0y~yU{nCI4{)#n$t4^1Z39v)>5jgR3=A9lx&I`x0{NT;
z9+AZi3_@Vc*rT+Q9VjSK;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XQ*fNOZn_apgHe6
zT^vIy;@;jkn3<9;(sHr$a7C&>Me2+jB8``VnSxjjMP@u{{Ps+A*_%VZT#Kdr^5tW8
z?PLG@_VH)g2NUMU?`QbaU-$RJ?e_cje?B@kH25n!957^Jks+S?oXJ@AJU_4Ksap8<
z*>{W?tq%CEyYu8#+2m?92lgE&r_PSKn^$z6<pqQJ&Z5byZ~MNxd7b0J<;$0U-@bkO
z&C{n(|9<>vX!n@AaI&`f&Rut(%&YBXu(h{8E`O?i>b#Gwa0B+aHT<iRUMhcL|JPr?
zetp)Ri7fety`*7w%+8Zn->QB0Y2Yh>nZ<d55$3SX=Q%GNK74rofm*NG`kVqAJV(jV
z5Eu=Cfe3+GzXk>-My5VNg$EMEQ9q9}FxG6!zhBS5Tj$4m^~aMNz|xVy)78&qol`;+
E0K}H&HUIzs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
deleted file mode 100644
index 32f465f2c64..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TabViewPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Grid>
-        <Grid x:Name="XamlRoot"/>
-        <controls:InAppNotification x:Name="TabViewNotification"
-                                    ShowDismissButton="True"
-                                    AnimationDuration="00:00:00.1000000"
-                                    VerticalOffset="100"
-                                    HorizontalOffset="0"
-                                    StackMode="Replace" />
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
deleted file mode 100644
index 74d9a3db253..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
+++ /dev/null
@@ -1,73 +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 System.Collections.ObjectModel;
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class TabViewPage : Page, IXamlRenderListener
-    {
-        #pragma warning disable CS0618 // Type or member is obsolete
-        private TabView _tabs;
-
-        private int _counter = 1;
-
-        public TabViewPage()
-        {
-            this.InitializeComponent();
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-            _tabs = control.FindChildByName("Tabs") as TabView;
-            if (_tabs != null)
-            {
-                _tabs.TabDraggedOutside += Tabs_TabDraggedOutside;
-                _tabs.TabClosing += Tabs_TabClosing;
-            }
-
-            var btn = control.FindDescendantByName("AddTabButtonUpper") as Button;
-            if (btn != null)
-            {
-                btn.Click += AddUpperTabClick;
-            }
-        }
-
-        private void AddUpperTabClick(object sender, RoutedEventArgs e)
-        {
-            _tabs.Items.Add(new TabViewItem()
-            {
-                Header = "Untitled " + _counter,
-                Icon = new SymbolIcon(Symbol.Document),
-                Content = "This is new tab #" + _counter++ + "."
-            });
-        }
-
-        private void Tabs_TabClosing(object sender, TabClosingEventArgs e)
-        {
-            TabViewNotification.Show("You're closing the '" + e.Tab.Header + "' tab.", 2000);
-        }
-
-        private void Tabs_TabDraggedOutside(object sender, TabDraggedOutsideEventArgs e)
-        {
-            // The sample app let's you drag items from a static TabView with TabViewItem's pre-defined.
-            // In the case of data bound scenarios e.Item should be your data item, and e.Tab should always be the TabViewItem.
-            var str = e.Item.ToString();
-
-            if (e.Tab != null)
-            {
-                str = e.Tab.Header.ToString();
-            }
-
-            TabViewNotification.Show("Tore Tab '" + str + "' Outside of TabView.", 2000);
-        }
-        #pragma warning restore CS0618 // Type or member is obsolete
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
deleted file mode 100644
index e81732aa2a3..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
+++ /dev/null
@@ -1,97 +0,0 @@
-<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-      mc:Ignorable="d">
-
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="Auto"/>
-    </Grid.RowDefinitions>
-    <controls:TabView x:Name="Tabs"
-                      TabWidthBehavior="@[Tab Width Behavior:Enum:TabWidthMode.Actual]"
-                      CanCloseTabs="@[Can Close Tabs:Bool:False]"
-                      IsCloseButtonOverlay="@[Overlay Close Button:Bool:False]"
-                      CanDragItems="@[Drag and Drop Enabled:Bool:False]"
-                      CanReorderItems="@[Drag and Drop Enabled]"
-                      AllowDrop="@[Drag and Drop Enabled]"
-                      SelectedTabWidth="200">
-      <controls:TabView.Resources>
-        <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
-        <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
-        <x:Double x:Key="TabViewItemHeaderMaxWidth">200</x:Double>
-      </controls:TabView.Resources>
-      <controls:TabView.Header>
-        <TextBlock Padding="16,8,0,8" FontSize="16" FontWeight="Bold" Text="TabView Control Header"/>
-      </controls:TabView.Header>
-      <controls:TabView.TabStartHeader>
-        <Button Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="0,0,-1,0"
-                BorderThickness="1"
-                Background="Transparent" 
-                Style="{StaticResource ButtonRevealStyle}" 
-                Padding="2,2,0,0">
-          <Viewbox MaxWidth="16" MaxHeight="16">
-            <SymbolIcon Symbol="AddFriend"/>
-          </Viewbox>
-        </Button>
-      </controls:TabView.TabStartHeader>
-
-      <!-- Tabs -->
-      <controls:TabViewItem Header="Home" Icon="Home">
-        <TextBlock Padding="16">The TabView control has multiple uses.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Tab 2 Has Longer Text" Icon="Audio">
-        <TextBlock Padding="16">It has a lot of versitility out of the box for different scenarios.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Tab 3" Icon="Video">
-        <TextBlock Padding="16">You can enable drag-and-drop and reorder the tabs too.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Not Closable" Icon="Calendar" IsClosable="False">
-        <TextBlock Padding="16">This tab isn't closable because its IsClosable property is set to False, even when CanCloseTabs is True.</TextBlock>
-      </controls:TabViewItem>
-
-      <controls:TabView.TabActionHeader>
-        <Button x:Name="AddTabButtonUpper"
-                Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="-1,0,0,0"
-                BorderThickness="1"
-                Background="Transparent"
-                Style="{StaticResource ButtonRevealStyle}">
-          <Viewbox MaxWidth="16"
-                    MaxHeight="16">
-            <FontIcon FontFamily="Segoe MDL2 Assets"
-                      Glyph="&#xE710;" />
-          </Viewbox>
-        </Button>
-
-      </controls:TabView.TabActionHeader>
-
-      <controls:TabView.TabEndHeader>
-        <Button Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="-1,0,0,0"
-                BorderThickness="1" 
-                Background="Transparent" 
-                Style="{StaticResource ButtonRevealStyle}">
-          <Viewbox MaxWidth="16" MaxHeight="16">
-            <SymbolIcon Symbol="Setting"/>
-          </Viewbox>
-        </Button>
-      </controls:TabView.TabEndHeader>
-
-      <controls:TabView.Footer>
-        <TextBlock Padding="16,8,16,8"
-                   HorizontalAlignment="Right"
-                   FontSize="16" FontWeight="Bold"
-                   Text="TabView Control Footer" />
-      </controls:TabView.Footer>
-    </controls:TabView>
-  </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 7cba82117d9..1856644c3df 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -14,18 +14,6 @@
         "Icon": "/SamplePages/TextToolbar/TextToolbar.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TextToolbar.md"
       },
-      {
-        "Name": "TabView",
-        "Type": "TabViewPage",
-        "Subcategory": "Layout",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui",
-        "About": "A control for displaying multiple items in the same space and allows a user to easily switch between them.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TabView",
-        "XamlCodeFile": "TabViewXaml.bind",
-        "Icon": "/SamplePages/TabView/TabView.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TabView.md"
-      },
       {
         "Name": "DataGrid",
         "Type": "DataGridPage",
@@ -86,18 +74,6 @@
         "Icon": "/SamplePages/ImageEx/ImageEx.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
-      {
-        "Name": "HeaderedTextBlock",
-        "Type": "HeaderedTextBlockPage",
-        "Subcategory": "Layout",
-        "About": "The HeaderedTextBlock control is designed to provide a header for read only text. This control is useful for displaying read only forms.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock",
-        "XamlCodeFile": "HeaderedTextBlockCode.bind",
-        "Icon": "/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/HeaderedTextBlock.md",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "The HeaderedTextBlock has been replaced with the HeaderedContentControl and will be removed in a future major release."
-      },
       {
         "Name": "MasterDetailsView",
         "Type": "MasterDetailsViewPage",
@@ -532,19 +508,6 @@
         "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Saturation.md"
       },
-      {
-        "Name": "Light",
-        "Type": "LightBehaviorPage",
-        "Subcategory": "Behavior",
-        "About": "The Light effect will be removed in a future major release",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "The Light effect will be removed in a future major release",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors",
-        "CodeFile": "LightBehaviorCode.bind",
-        "XamlCodeFile": "LightBehaviorXaml.bind",
-        "Icon": "/SamplePages/Light/LightBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Light.md"
-      },
       {
         "Name": "FadeHeader",
         "Type": "FadeHeaderBehaviorPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
deleted file mode 100644
index 8940f3eb630..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
+++ /dev/null
@@ -1,69 +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 Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Media;
-
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Behaviors
-{
-    /// <summary>
-    /// Applies a basic point light to a UIElement. You control the intensity by setting the distance of the light.
-    /// </summary>
-    /// <seealso cref="Microsoft.Toolkit.Uwp.UI.Animations.Behaviors.CompositionBehaviorBase" />
-    /// <seealso cref="AnimationExtensions.IsLightingSupported"/>
-    [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
-
-    public class Light : CompositionBehaviorBase<FrameworkElement>
-    {
-        /// <summary>
-        /// The Blur value of the associated object
-        /// </summary>
-        public static readonly DependencyProperty DistanceProperty = DependencyProperty.Register(nameof(Distance), typeof(double), typeof(Light), new PropertyMetadata(0d, PropertyChangedCallback));
-
-        /// <summary>
-        /// The Color of the spotlight no the associated object.
-        /// </summary>
-        public static readonly DependencyProperty ColorProperty = DependencyProperty.Register("Color", typeof(Brush), typeof(Light), new PropertyMetadata(new SolidColorBrush(Colors.White)));
-
-        /// <summary>
-        /// Gets or sets the Blur.
-        /// </summary>
-        /// <value>
-        /// The Blur.
-        /// </value>
-        public double Distance
-        {
-            get { return (double)GetValue(DistanceProperty); }
-            set { SetValue(DistanceProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the color of the spotlight.
-        /// </summary>
-        public Brush Color
-        {
-            get { return (Brush)GetValue(ColorProperty); }
-            set { SetValue(ColorProperty, value); }
-        }
-
-        /// <summary>
-        /// Starts the animation.
-        /// </summary>
-        public override void StartAnimation()
-        {
-            if (AnimationExtensions.IsLightingSupported)
-            {
-                AssociatedObject?.Light(
-                    duration: Duration,
-                    delay: Delay,
-                    easingType: EasingType,
-                    easingMode: EasingMode,
-                    distance: (float)Distance,
-                    color: ((SolidColorBrush)Color).Color)?.Start();
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
index a0e5afa756d..999ea1d40c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
@@ -361,22 +361,6 @@ public static void UnregisterListItemForConnectedAnimation(this Page page, ListV
             }
         }
 
-        /// <summary>
-        /// Sets the object that will be used during next Frame navigation for
-        /// Connected Animation involving a list control (item must be an element of
-        /// ListViewBase.ItemsSource collection).
-        /// Useful if the parameter used during page navigation is different from the
-        /// data item in the list control. Also useful during back navigation if the
-        /// item navigating back to is different from the item that was navigated from.
-        /// </summary>
-        /// <param name="frame">The Frame handling the navigation</param>
-        /// <param name="item">The data item from a list control to be animated during next frame navigation</param>
-        [Obsolete("Method is replaced by SetListDataItemForNextConnectedAnimation")]
-        public static void SetListDataItemForNextConnectedAnnimation(this Frame frame, object item)
-        {
-            GetConnectedAnimationHelper(frame)?.SetParameterForNextFrameNavigation(item);
-        }
-
         /// <summary>
         /// Sets the object that will be used during next Frame navigation for
         /// Connected Animation involving a list control (item must be an element of
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
index 0949dd235dd..3bc0da11259 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
@@ -3,16 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.Toolkit.Uwp.Helpers;
-using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Composition.Effects;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Media.Animation;
 
 namespace Microsoft.Toolkit.Uwp.UI.Animations
 {
@@ -22,204 +12,12 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     public static partial class AnimationExtensions
     {
         /// <summary>
-        /// Stores all the point lights along with the visuals that they are applied to.
-        /// This is to stop multiplication of point lights on a single visual.
-        /// </summary>
-        private static Dictionary<Visual, PointLight> pointLights = new Dictionary<Visual, PointLight>();
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is lighting supported.
+        /// Gets a value indicating whether this instance is lighting supported. Deprecated. Will always return <c>true</c>.
         /// </summary>
         /// <value>
-        /// <c>true</c> if this instance is lighting supported; otherwise, <c>false</c>.
+        /// Deprecated. Will always returns <c>true</c>.
         /// </value>
-        public static bool IsLightingSupported
-        {
-            get
-            {
-                bool lightingSupported = true;
-
-                if (!Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", "SetElementChildVisual"))
-                {
-                    lightingSupported = false;
-                }
-
-                if (!Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.Composition.CompositionSurfaceBrush"))
-                {
-                    lightingSupported = false;
-                }
-
-                return lightingSupported;
-            }
-        }
-
-        /// <summary>
-        /// Animates a point light and it's distance.
-        /// </summary>
-        /// <param name="associatedObject">The associated object.</param>
-        /// <param name="distance">The value.</param>
-        /// <param name="duration">The duration.</param>
-        /// <param name="delay">The delay.</param>
-        /// <param name="color">The color of the spotlight.</param>
-        /// <param name="easingType">The easing function</param>
-        /// <param name="easingMode">The easing mode</param>
-        /// <returns>An animation set.</returns>
-        [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
-        public static AnimationSet Light(
-            this FrameworkElement associatedObject,
-            double distance = 0d,
-            double duration = 500d,
-            double delay = 0d,
-            Color? color = null,
-            EasingType easingType = EasingType.Default,
-            EasingMode easingMode = EasingMode.EaseOut)
-        {
-            if (associatedObject == null)
-            {
-                return null;
-            }
-
-            var animationSet = new AnimationSet(associatedObject);
-            return animationSet.Light(distance, duration, delay, color, easingType, easingMode);
-        }
-
-        /// <summary>
-        /// Animates a point light and it's distance.
-        /// </summary>
-        /// <param name="animationSet">The animation set.</param>
-        /// <param name="distance">The distance of the light.</param>
-        /// <param name="duration">The duration in milliseconds.</param>
-        /// <param name="delay">The delay. (ignored if duration == 0)</param>
-        /// <param name="color">The color of the spotlight.</param>
-        /// <param name="easingType">The easing function</param>
-        /// <param name="easingMode">The easing mode</param>
-        /// <seealso cref="IsLightingSupported" />
-        /// <returns>
-        /// An Animation Set.
-        /// </returns>
-        [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
-        public static AnimationSet Light(
-            this AnimationSet animationSet,
-            double distance = 0d,
-            double duration = 500d,
-            double delay = 0d,
-            Color? color = null,
-            EasingType easingType = EasingType.Default,
-            EasingMode easingMode = EasingMode.EaseOut)
-        {
-            if (!IsLightingSupported)
-            {
-                return null;
-            }
-
-            if (animationSet == null)
-            {
-                return null;
-            }
-
-            var visual = animationSet.Visual;
-            var associatedObject = animationSet.Element as FrameworkElement;
-
-            if (associatedObject == null)
-            {
-                return animationSet;
-            }
-
-            var compositor = visual?.Compositor;
-            if (compositor == null)
-            {
-                return null;
-            }
-
-            var task = new AnimationTask();
-            task.AnimationSet = animationSet;
-
-            task.Task = DispatcherHelper.ExecuteOnUIThreadAsync(
-                () =>
-            {
-                const string sceneName = "PointLightScene";
-                PointLight pointLight;
-                CompositionDrawingSurface normalMap = null;
-
-                if (!pointLights.ContainsKey(visual))
-                {
-                    SurfaceLoader.Initialize(compositor);
-                    normalMap = SurfaceLoader.LoadText(string.Empty, new Windows.Foundation.Size(512, 512), new Graphics.Canvas.Text.CanvasTextFormat(), Colors.Transparent, Colors.Transparent);
-                }
-
-                if (pointLights.ContainsKey(visual))
-                {
-                    pointLight = pointLights[visual];
-                }
-                else
-                {
-                    pointLight = compositor.CreatePointLight();
-
-                    var normalBrush = compositor.CreateSurfaceBrush(normalMap);
-                    normalBrush.Stretch = CompositionStretch.Fill;
-
-                    // check to see if the visual already has a point light applied.
-                    var spriteVisual = ElementCompositionPreview.GetElementChildVisual(associatedObject) as SpriteVisual;
-                    var normalsBrush = spriteVisual?.Brush as CompositionEffectBrush;
-
-                    if (normalsBrush == null || normalsBrush.Comment != sceneName)
-                    {
-                        var lightEffect = new CompositeEffect()
-                        {
-                            Mode = CanvasComposite.Add,
-                            Sources =
-                            {
-                                new CompositionEffectSourceParameter("ImageSource"),
-                                new SceneLightingEffect()
-                                {
-                                    Name = sceneName,
-                                    AmbientAmount = 0,
-                                    DiffuseAmount = 0.5f,
-                                    SpecularAmount = 0,
-                                    NormalMapSource = new CompositionEffectSourceParameter("NormalMap"),
-                                }
-                            }
-                        };
-
-                        var effectFactory = compositor.CreateEffectFactory(lightEffect);
-                        var brush = effectFactory.CreateBrush();
-                        brush.SetSourceParameter("NormalMap", normalBrush);
-
-                        var sprite = compositor.CreateSpriteVisual();
-                        sprite.Size = visual.Size;
-                        sprite.Brush = brush;
-                        sprite.Comment = sceneName;
-
-                        ElementCompositionPreview.SetElementChildVisual(task.AnimationSet.Element, sprite);
-
-                        pointLight.CoordinateSpace = visual;
-                        pointLight.Targets.Add(visual);
-                    }
-                }
-
-                pointLight.Color = color ?? Colors.White;
-                var delayTime = task.Delay != null ? task.Delay.Value : TimeSpan.FromMilliseconds(delay);
-                var durationTime = task.Duration != null ? task.Duration.Value : TimeSpan.FromMilliseconds(duration);
-
-                if (durationTime.TotalMilliseconds <= 0)
-                {
-                    task.AnimationSet.AddEffectDirectPropertyChange(pointLight, (float)distance, nameof(pointLight.Offset));
-                }
-                else
-                {
-                    var diffuseAnimation = compositor.CreateVector3KeyFrameAnimation();
-                    diffuseAnimation.InsertKeyFrame(1f, new System.Numerics.Vector3(visual.Size.X / 2, visual.Size.Y / 2, (float)distance), GetCompositionEasingFunction(easingType, compositor, easingMode));
-                    diffuseAnimation.Duration = durationTime;
-                    diffuseAnimation.DelayTime = delayTime;
-
-                    task.AnimationSet.AddCompositionEffectAnimation(pointLight, diffuseAnimation, nameof(pointLight.Offset));
-                }
-
-                pointLights[visual] = pointLight;
-            }, Windows.UI.Core.CoreDispatcherPriority.Normal);
-
-            animationSet.AddAnimationThroughTask(task);
-            return animationSet;
-        }
+        [Obsolete("This method is deprecated and will always return true")]
+        public static bool IsLightingSupported => true;
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
deleted file mode 100644
index 3cba40e11f1..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.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.
-
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Features;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.Model;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-    internal class HeaderedTextBlockDefaults : DefaultInitializer
-    {
-        public override void InitializeDefaults(ModelItem item)
-        {
-            item.Properties[nameof(HeaderedTextBlock.Header)].SetValue(string.Empty);
-            item.Properties[nameof(HeaderedTextBlock.Text)].SetValue(string.Empty);
-        }
-    }
-    internal class HeaderedTextBlockMetadata : AttributeTableBuilder
-	{
-        public HeaderedTextBlockMetadata()
-			: base()
-		{
-			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock),
-				b =>
-				{
-                    b.AddCustomAttributes(new FeatureAttribute(typeof(HeaderedTextBlockDefaults)));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.TextStyle),
-                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Header), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Text), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Orientation), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HideTextIfEmpty), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-				}
-			);
-		}
-	}
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
index b611399dd13..b7b241a6403 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
@@ -85,7 +85,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TabViewItemMetadata.cs" />
     <Compile Include="BladeItemMetadata.cs" />
     <Compile Include="BladeViewMetadata.cs" />
     <Compile Include="CarouselMetadata.cs" />
@@ -93,7 +92,6 @@
     <Compile Include="AdaptiveGridViewMetadata.cs" />
     <Compile Include="ExpanderMetadata.cs" />
     <Compile Include="GridSplitterMetadata.cs" />
-    <Compile Include="HeaderedTextBlockMetadata.cs" />
     <Compile Include="ImageExMetadata.cs" />
     <Compile Include="InAppNotificationMetadata.cs" />
     <Compile Include="LayoutTransitionControlMetadata.cs" />
@@ -105,7 +103,6 @@
     <Compile Include="MetadataRegistration.cs" />
     <Compile Include="Common\MetadataRegistrationBase.cs" />
     <Compile Include="Common\PlatformTypes.cs" />
-    <Compile Include="TabViewMetadata.cs" />
     <Compile Include="OrbitViewMetadata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
deleted file mode 100644
index 6ed6bc37bf8..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
+++ /dev/null
@@ -1,43 +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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Features;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.Model;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-
-	internal class TabViewItemMetadata : AttributeTableBuilder
-	{
-		public TabViewItemMetadata()
-			: base()
-		{
-            AddCallback(typeof(TabViewItem),
-                b =>
-                {
-                    b.AddCustomAttributes(nameof(TabViewItem.Header),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-                    b.AddCustomAttributes(nameof(TabViewItem.HeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabViewItem.IsClosable),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-                    b.AddCustomAttributes(nameof(TabViewItem.Icon),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-                }
-            );
-		}
-	}
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
deleted file mode 100644
index 7bfa77541db..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
+++ /dev/null
@@ -1,54 +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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-	internal class TabViewMetadata : AttributeTableBuilder
-	{
-        public TabViewMetadata()
-			: base()
-		{
-			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TabView),
-				b =>
-                {
-                    // Layout
-                    b.AddCustomAttributes(nameof(TabView.TabWidthBehavior), new CategoryAttribute(Properties.Resources.CategoryLayout));
-                    b.AddCustomAttributes(nameof(TabView.SelectedTabWidth), new CategoryAttribute(Properties.Resources.CategoryLayout));
-                    b.AddCustomAttributes(nameof(TabView.IsCloseButtonOverlay), new CategoryAttribute(Properties.Resources.CategoryLayout));
-
-                    // Interactions
-                    b.AddCustomAttributes(nameof(TabView.CanCloseTabs), new CategoryAttribute(Properties.Resources.CategoryCommon));
-
-                    // Templates
-                    b.AddCustomAttributes(nameof(TabView.ItemHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabActionHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabActionHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabEndHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabEndHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabStartHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabStartHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-				}
-			);
-		}
-	}
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
deleted file mode 100644
index 7528591fc2b..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
+++ /dev/null
@@ -1,172 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Defines the properties for the <see cref="HeaderedTextBlock"/> control.
-    /// </summary>
-    public partial class HeaderedTextBlock
-    {
-        /// <summary>
-        /// Defines the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-            nameof(HeaderTemplate),
-            typeof(DataTemplate),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Defines the <see cref="TextStyle"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TextStyleProperty = DependencyProperty.Register(
-            nameof(TextStyle),
-            typeof(Style),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Defines the <see cref="Header"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            nameof(Header),
-            typeof(string),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Defines the <see cref="Text"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            nameof(Text),
-            typeof(string),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            nameof(Orientation),
-            typeof(Orientation),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(Orientation.Vertical, (d, e) => { ((HeaderedTextBlock)d).UpdateForOrientation((Orientation)e.NewValue); }));
-
-        /// <summary>
-        /// Defines the <see cref="HideTextIfEmpty"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HideTextIfEmptyProperty = DependencyProperty.Register(
-            nameof(HideTextIfEmpty),
-            typeof(bool),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(false, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Gets or sets the header style.
-        /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get
-            {
-                return (DataTemplate)GetValue(HeaderTemplateProperty);
-            }
-
-            set
-            {
-                SetValue(HeaderTemplateProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the text style.
-        /// </summary>
-        public Style TextStyle
-        {
-            get
-            {
-                return (Style)GetValue(TextStyleProperty);
-            }
-
-            set
-            {
-                SetValue(TextStyleProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the header.
-        /// </summary>
-        public string Header
-        {
-            get
-            {
-                return (string)GetValue(HeaderProperty);
-            }
-
-            set
-            {
-                SetValue(HeaderProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the text.
-        /// </summary>
-        public string Text
-        {
-            get
-            {
-                return (string)GetValue(TextProperty);
-            }
-
-            set
-            {
-                SetValue(TextProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets the collection of inline text elements within a Windows.UI.Xaml.Controls.TextBlock.
-        /// </summary>
-        /// <returns>
-        /// A collection that holds all inline text elements from the Windows.UI.Xaml.Controls.TextBlock. The default is an empty collection.</returns>
-        public InlineCollectionWrapper Inlines { get; } = new InlineCollectionWrapper();
-
-        /// <summary>
-        /// Gets or sets the orientation.
-        /// </summary>
-        public Orientation Orientation
-        {
-            get
-            {
-                return (Orientation)GetValue(OrientationProperty);
-            }
-
-            set
-            {
-                SetValue(OrientationProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the Text TextBlock is hidden if its value is empty
-        /// </summary>
-        public bool HideTextIfEmpty
-        {
-            get
-            {
-                return (bool)GetValue(HideTextIfEmptyProperty);
-            }
-
-            set
-            {
-                SetValue(HideTextIfEmptyProperty, value);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
deleted file mode 100644
index b30dfea1d3d..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
+++ /dev/null
@@ -1,76 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Defines a control for providing a header for read-only text.
-    /// </summary>
-    [TemplatePart(Name = "HeaderContentPresenter", Type = typeof(ContentPresenter))]
-    [ContentProperty(Name = nameof(Inlines))]
-    [Obsolete("The HeaderedTextBlock has been replaced with the more generic HeaderedContentControl.")]
-    public partial class HeaderedTextBlock : Control
-    {
-        private ContentPresenter _headerContentPresenter;
-        private TextBlock _textContent;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HeaderedTextBlock"/> class.
-        /// </summary>
-        public HeaderedTextBlock()
-        {
-            DefaultStyleKey = typeof(HeaderedTextBlock);
-        }
-
-        /// <summary>
-        /// Called when applying the control template.
-        /// </summary>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _headerContentPresenter = GetTemplateChild("HeaderContentPresenter") as ContentPresenter;
-            _textContent = GetTemplateChild("TextContent") as TextBlock;
-
-            UpdateVisibility();
-            Inlines.AddItemsToTextBlock(_textContent);
-            UpdateForOrientation(this.Orientation);
-        }
-
-        private void UpdateVisibility()
-        {
-            if (_headerContentPresenter != null)
-            {
-                _headerContentPresenter.Visibility = _headerContentPresenter.Content == null
-                                                     ? Visibility.Collapsed
-                                                     : Visibility.Visible;
-            }
-
-            if (_textContent != null)
-            {
-                _textContent.Visibility = string.IsNullOrWhiteSpace(_textContent.Text) && HideTextIfEmpty
-                                                    ? Visibility.Collapsed
-                                                    : Visibility.Visible;
-            }
-        }
-
-        private void UpdateForOrientation(Orientation orientationValue)
-        {
-            switch (orientationValue)
-            {
-                case Orientation.Vertical:
-                    VisualStateManager.GoToState(this, "Vertical", true);
-                    break;
-                case Orientation.Horizontal:
-                    VisualStateManager.GoToState(this, "Horizontal", true);
-                    break;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
deleted file mode 100644
index 6f94a07ba82..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
-
-    <Style x:Key="HeaderedTextBlockTextStyle"
-           TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
-        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-        <Setter Property="TextWrapping" Value="Wrap" />
-        <Setter Property="TextLineBounds" Value="TrimToBaseline" />
-        <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Light" />
-        <Setter Property="LineHeight" Value="28" />
-    </Style>
-
-    <Style TargetType="controls:HeaderedTextBlock">
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="Orientation" Value="Vertical" />
-        <Setter Property="TextStyle" Value="{ThemeResource HeaderedTextBlockTextStyle}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:HeaderedTextBlock">
-                    <StackPanel x:Name="Panel"
-                                Orientation="{TemplateBinding Orientation}">
-                        <ContentPresenter x:Name="HeaderContentPresenter"
-                                          Grid.ColumnSpan="4"
-                                          x:DeferLoadStrategy="Lazy"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          AutomationProperties.Name="Header content"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-                                          IsHitTestVisible="False"
-                                          Visibility="Collapsed" />
-
-                        <TextBlock x:Name="TextContent"
-                                   AutomationProperties.Name="Text content"
-                                   Style="{TemplateBinding TextStyle}"
-                                   Text="{TemplateBinding Text}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="OrientationStates">
-                                <VisualState x:Name="Vertical" />
-                                <VisualState x:Name="Horizontal">
-                                    <VisualState.Setters>
-                                        <Setter Target="TextContent.Margin" Value="10,0,0,0" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </StackPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 6174415e0f3..9b240477475 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -17,7 +17,6 @@
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
         - HeaderedContentControl: Provides a header to content.
         - HeaderedItemsControl: Provides a header to items.
-        - HeaderedTextBlock: Provide a header for read-only text.
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
index 0dd5cea5b9e..8a263d98309 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
@@ -5,7 +5,6 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=headeredtextblock/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=pulltorefreshlistview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
index 66cce5b66ab..d3b003e8b80 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
@@ -213,14 +213,6 @@
     <value>Notification</value>
     <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Close tab</value>
-    <comment>Narrator Resource for TabView Close Button.</comment>
-  </data>
-  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Close tab</value>
-    <comment>Tooltip for TabView Close Button.</comment>
-  </data>
   <data name="WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
     <value>Remove</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
deleted file mode 100644
index 893776ff0be..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
+++ /dev/null
@@ -1,36 +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 System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Event arguments for <see cref="TabView.TabClosing"/> event.
-    /// </summary>
-    public class TabClosingEventArgs : CancelEventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabClosingEventArgs"/> class.
-        /// </summary>
-        /// <param name="item">Item being closed.</param>
-        /// <param name="tab"><see cref="TabViewItem"/> container being closed.</param>
-        public TabClosingEventArgs(object item, TabViewItem tab)
-        {
-            Item = item;
-            Tab = tab;
-        }
-
-        /// <summary>
-        /// Gets the Item being closed.
-        /// </summary>
-        public object Item { get; private set; }
-
-        /// <summary>
-        /// Gets the Tab being closed.
-        /// </summary>
-        public TabViewItem Tab { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
deleted file mode 100644
index dcf351aab9b..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
+++ /dev/null
@@ -1,35 +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;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// A class used by the <see cref="TabView"/> TabDraggedOutside Event
-    /// </summary>
-    public class TabDraggedOutsideEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabDraggedOutsideEventArgs"/> class.
-        /// </summary>
-        /// <param name="item">data context of element dragged</param>
-        /// <param name="tab"><see cref="TabViewItem"/> container being dragged.</param>
-        public TabDraggedOutsideEventArgs(object item, TabViewItem tab)
-        {
-            Item = item;
-            Tab = tab;
-        }
-
-        /// <summary>
-        /// Gets or sets the Item/Data Context of the item being dragged outside of the <see cref="TabView"/>.
-        /// </summary>
-        public object Item { get; set; }
-
-        /// <summary>
-        /// Gets the Tab being dragged outside of the <see cref="TabView"/>.
-        /// </summary>
-        public TabViewItem Tab { get; private set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
deleted file mode 100644
index 16885700b35..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
+++ /dev/null
@@ -1,221 +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 System.Linq;
-using Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView methods related to calculating the width of the <see cref="TabViewItem"/> Headers.
-    /// </summary>
-    public partial class TabView
-    {
-        // Attached property for storing widths of tabs if set by other means during layout.
-        private static double GetOriginalWidth(TabViewItem obj)
-        {
-            return (double)obj.GetValue(OriginalWidthProperty);
-        }
-
-        private static void SetOriginalWidth(TabViewItem obj, double value)
-        {
-            obj.SetValue(OriginalWidthProperty, value);
-        }
-
-        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
-        private static readonly DependencyProperty OriginalWidthProperty =
-            DependencyProperty.RegisterAttached("OriginalWidth", typeof(double), typeof(TabView), new PropertyMetadata(null));
-
-        private static void OnLayoutEffectingPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            var tabview = sender as TabView;
-            if (tabview != null && tabview._hasLoaded)
-            {
-                tabview.TabView_SizeChanged(tabview, null);
-            }
-        }
-
-        private void TabView_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            // We need to do this calculation here in Size Changed as the
-            // Columns don't have their Actual Size calculated in Measure or Arrange.
-            if (_hasLoaded && _tabViewContainer != null)
-            {
-                // Look for our special columns to calculate size of other 'stuff'
-                var taken = _tabViewContainer.ColumnDefinitions.Sum(cd => GetIgnoreColumn(cd) ? 0 : cd.ActualWidth);
-
-                // Get the column we want to work on for available space
-                var tabc = _tabViewContainer.ColumnDefinitions.FirstOrDefault(cd => GetConstrainColumn(cd));
-                if (tabc != null)
-                {
-                    var available = ActualWidth - taken;
-                    var required = 0.0;
-                    var mintabwidth = double.MaxValue;
-
-                    if (TabWidthBehavior == TabWidthMode.Actual)
-                    {
-                        if (_tabScroller != null)
-                        {
-                            // If we have a scroll container, get its size.
-                            required = _tabScroller.ExtentWidth;
-                        }
-
-                        // Restore original widths
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            if (tab.ReadLocalValue(OriginalWidthProperty) != DependencyProperty.UnsetValue)
-                            {
-                                tab.Width = GetOriginalWidth(tab);
-                            }
-                        }
-                    }
-                    else if (available > 0)
-                    {
-                        // Calculate the width for each tab from the provider and determine how much space they take.
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
-
-                            double width = double.NaN;
-
-                            switch (TabWidthBehavior)
-                            {
-                                case TabWidthMode.Equal:
-                                    width = ProvideEqualWidth(tab, item, available);
-                                    break;
-                                case TabWidthMode.Compact:
-                                    width = ProvideCompactWidth(tab, item, available);
-                                    break;
-                            }
-
-                            if (tab.ReadLocalValue(OriginalWidthProperty) == DependencyProperty.UnsetValue)
-                            {
-                                SetOriginalWidth(tab, tab.Width);
-                            }
-
-                            if (width > double.Epsilon)
-                            {
-                                tab.Width = width;
-                                required += Math.Max(Math.Min(width, tab.MaxWidth), tab.MinWidth);
-                            }
-                            else
-                            {
-                                tab.Width = GetOriginalWidth(tab);
-                                required += tab.ActualWidth;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // Fix negative bounds.
-                        available = 0.0;
-
-                        // Still need to determine a 'minimum' width (if available)
-                        // TODO: Consolidate this logic with above better?
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
-                        }
-                    }
-
-                    if (!(mintabwidth < double.MaxValue))
-                    {
-                        mintabwidth = 0.0; // No Containers, no visual, 0 size.
-                    }
-
-                    if (available > mintabwidth)
-                    {
-                        // Constrain the column based on our required and available space
-                        tabc.MaxWidth = available;
-                    }
-
-                    //// TODO: If it's less, should we move the selected tab to only be the one shown by default?
-
-                    if (available <= mintabwidth || Math.Abs(available - mintabwidth) < double.Epsilon)
-                    {
-                        tabc.Width = new GridLength(mintabwidth);
-                    }
-                    else if (required >= available)
-                    {
-                        // Fix size as we don't have enough space for all the tabs.
-                        tabc.Width = new GridLength(available);
-                    }
-                    else
-                    {
-                        // We haven't filled up our space, so we want to expand to take as much as needed.
-                        tabc.Width = GridLength.Auto;
-                    }
-                }
-            }
-        }
-
-        private double ProvideEqualWidth(TabViewItem tab, object item, double availableWidth)
-        {
-            if (double.IsNaN(SelectedTabWidth))
-            {
-                if (Items.Count <= 1)
-                {
-                    return availableWidth;
-                }
-
-                return Math.Max(tab.MinWidth, availableWidth / Items.Count);
-            }
-            else if (Items.Count() <= 1)
-            {
-                // Default case of a single tab, make it full size.
-                return Math.Min(SelectedTabWidth, availableWidth);
-            }
-            else
-            {
-                var width = (availableWidth - SelectedTabWidth) / (Items.Count - 1);
-
-                // Constrain between Min and Selected (Max)
-                if (width < tab.MinWidth)
-                {
-                    width = tab.MinWidth;
-                }
-                else if (width > SelectedTabWidth)
-                {
-                    width = SelectedTabWidth;
-                }
-
-                // If it's selected make it full size, otherwise whatever the size should be.
-                return tab.IsSelected
-                    ? Math.Min(SelectedTabWidth, availableWidth)
-                    : width;
-            }
-        }
-
-        private double ProvideCompactWidth(TabViewItem tab, object item, double availableWidth)
-        {
-            // If we're selected and have a value for that, then just return that.
-            if (tab.IsSelected && !double.IsNaN(SelectedTabWidth))
-            {
-                return SelectedTabWidth;
-            }
-
-            // Otherwise use min size.
-            return tab.MinWidth;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
deleted file mode 100644
index 61f61623b6f..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
+++ /dev/null
@@ -1,115 +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.Reflection;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls.Primitives;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView methods related to tracking Items and ItemsSource changes.
-    /// </summary>
-    public partial class TabView
-    {
-        // Temporary tracking of previous collections for removing events.
-        private MethodInfo _removeItemsSourceMethod;
-
-        /// <inheritdoc/>
-        protected override void OnItemsChanged(object e)
-        {
-            IVectorChangedEventArgs args = (IVectorChangedEventArgs)e;
-
-            base.OnItemsChanged(e);
-
-            if (args.CollectionChange == CollectionChange.ItemRemoved && SelectedIndex == -1)
-            {
-                // If we remove the selected item we should select the previous item
-                int startIndex = (int)args.Index + 1;
-                if (startIndex > Items.Count)
-                {
-                    startIndex = 0;
-                }
-
-                SelectedIndex = FindNextTabIndex(startIndex, -1);
-            }
-
-            // Update Sizing (in case there are less items now)
-            TabView_SizeChanged(this, null);
-        }
-
-        private void ItemContainerGenerator_ItemsChanged(object sender, ItemsChangedEventArgs e)
-        {
-            var action = (CollectionChange)e.Action;
-            if (action == CollectionChange.Reset)
-            {
-                // Reset collection to reload later.
-                _hasLoaded = false;
-            }
-        }
-
-        private void SetInitialSelection()
-        {
-            if (SelectedItem == null)
-            {
-                // If we have an index, but didn't get the selection, make the selection
-                if (SelectedIndex >= 0 && SelectedIndex < Items.Count)
-                {
-                    SelectedItem = Items[SelectedIndex];
-                }
-
-                // Otherwise, select the first item by default
-                else if (Items.Count >= 1)
-                {
-                    SelectedItem = Items[0];
-                }
-            }
-        }
-
-        // Finds the next visible & enabled tab index.
-        private int FindNextTabIndex(int startIndex, int direction)
-        {
-            int index = startIndex;
-            if (direction != 0)
-            {
-                for (int i = 0; i < Items.Count; i++)
-                {
-                    index += direction;
-
-                    if (index >= Items.Count)
-                    {
-                        index = 0;
-                    }
-                    else if (index < 0)
-                    {
-                        index = Items.Count - 1;
-                    }
-
-                    var tabItem = ContainerFromIndex(index) as TabViewItem;
-                    if (tabItem != null && tabItem.IsEnabled && tabItem.Visibility == Visibility.Visible)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return index;
-        }
-
-        private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
-        {
-            // Use reflection to store a 'Remove' method of any possible collection in ItemsSource
-            // Cache for efficiency later.
-            if (ItemsSource != null)
-            {
-                _removeItemsSourceMethod = ItemsSource.GetType().GetMethod("Remove");
-            }
-            else
-            {
-                _removeItemsSourceMethod = null;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
deleted file mode 100644
index 5d33b33f1cc..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
+++ /dev/null
@@ -1,245 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView properties.
-    /// </summary>
-    public partial class TabView
-    {
-        /// <summary>
-        /// Gets or sets the content to appear to the left or above the tab strip.
-        /// </summary>
-        public object TabStartHeader
-        {
-            get { return (object)GetValue(TabStartHeaderProperty); }
-            set { SetValue(TabStartHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabStartHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabStartHeaderProperty =
-            DependencyProperty.Register(nameof(TabStartHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabStartHeader"/>.
-        /// </summary>
-        public DataTemplate TabStartHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabStartHeaderTemplateProperty); }
-            set { SetValue(TabStartHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabStartHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabStartHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabStartHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the content to appear next to the tab strip.
-        /// </summary>
-        public object TabActionHeader
-        {
-            get { return (object)GetValue(TabActionHeaderProperty); }
-            set { SetValue(TabActionHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabActionHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabActionHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabActionHeaderProperty =
-            DependencyProperty.Register(nameof(TabActionHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabActionHeader"/>.
-        /// </summary>
-        public DataTemplate TabActionHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabActionHeaderTemplateProperty); }
-            set { SetValue(TabActionHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabActionHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabActionHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabActionHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabActionHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the content to appear to the right or below the tab strip.
-        /// </summary>
-        public object TabEndHeader
-        {
-            get { return (object)GetValue(TabEndHeaderProperty); }
-            set { SetValue(TabEndHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabEndHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabEndHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabEndHeaderProperty =
-            DependencyProperty.Register(nameof(TabEndHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabEndHeader"/>.
-        /// </summary>
-        public DataTemplate TabEndHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabEndHeaderTemplateProperty); }
-            set { SetValue(TabEndHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabEndHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabEndHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabEndHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabEndHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the default <see cref="DataTemplate"/> for the <see cref="TabViewItem.HeaderTemplate"/>.
-        /// </summary>
-        public DataTemplate ItemHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(ItemHeaderTemplateProperty); }
-            set { SetValue(ItemHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ItemHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty ItemHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(ItemHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether by default a Tab can be closed or not if no value to <see cref="TabViewItem.IsClosable"/> is provided.
-        /// </summary>
-        public bool CanCloseTabs
-        {
-            get { return (bool)GetValue(CanCloseTabsProperty); }
-            set { SetValue(CanCloseTabsProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="CanCloseTabs"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="CanCloseTabs"/> dependency property.</returns>
-        public static readonly DependencyProperty CanCloseTabsProperty =
-            DependencyProperty.Register(nameof(CanCloseTabs), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether a <see cref="TabViewItem"/> Close Button should be included in layout calculations.
-        /// </summary>
-        public bool IsCloseButtonOverlay
-        {
-            get { return (bool)GetValue(IsCloseButtonOverlayProperty); }
-            set { SetValue(IsCloseButtonOverlayProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IsCloseButtonOverlay"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="IsCloseButtonOverlay"/> dependency property.</returns>
-        public static readonly DependencyProperty IsCloseButtonOverlayProperty =
-            DependencyProperty.Register(nameof(IsCloseButtonOverlay), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating the size of the selected tab.  By default this is set to Auto and the selected tab size doesn't change.
-        /// </summary>
-        public double SelectedTabWidth
-        {
-            get { return (double)GetValue(SelectedTabWidthProperty); }
-            set { SetValue(SelectedTabWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="SelectedTabWidth"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="SelectedTabWidth"/> dependency property.</returns>
-        public static readonly DependencyProperty SelectedTabWidthProperty =
-            DependencyProperty.Register(nameof(SelectedTabWidth), typeof(double), typeof(TabView), new PropertyMetadata(double.NaN, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the current <see cref="TabWidthMode"/> which determins how tab headers' width behave.
-        /// </summary>
-        public TabWidthMode TabWidthBehavior
-        {
-            get { return (TabWidthMode)GetValue(TabWidthBehaviorProperty); }
-            set { SetValue(TabWidthBehaviorProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabWidthBehavior"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabWidthBehavior"/> dependency property.</returns>
-        public static readonly DependencyProperty TabWidthBehaviorProperty =
-            DependencyProperty.Register(nameof(TabWidthBehavior), typeof(TabWidthMode), typeof(TabView), new PropertyMetadata(TabWidthMode.Actual, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets the attached property value to indicate if this grid column should be ignored when calculating header sizes.
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <returns>Boolean indicating if this column is ignored by TabViewHeader logic.</returns>
-        public static bool GetIgnoreColumn(ColumnDefinition obj)
-        {
-            return (bool)obj.GetValue(IgnoreColumnProperty);
-        }
-
-        /// <summary>
-        /// Sets the attached property value for <see cref="IgnoreColumnProperty"/>
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <param name="value">Boolean value</param>
-        public static void SetIgnoreColumn(ColumnDefinition obj, bool value)
-        {
-            obj.SetValue(IgnoreColumnProperty, value);
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IgnoreColumnProperty"/> attached property.
-        /// </summary>
-        /// <returns>The identifier for the IgnoreColumn attached property.</returns>
-        public static readonly DependencyProperty IgnoreColumnProperty =
-            DependencyProperty.RegisterAttached("IgnoreColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
-
-        /// <summary>
-        /// Gets the attached value indicating this column should be restricted for the <see cref="TabViewItem"/> headers.
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <returns>True if this column should be constrained.</returns>
-        public static bool GetConstrainColumn(ColumnDefinition obj)
-        {
-            return (bool)obj.GetValue(ConstrainColumnProperty);
-        }
-
-        /// <summary>
-        /// Sets the attached property value for the <see cref="ConstrainColumnProperty"/>
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <param name="value">Boolean value.</param>
-        public static void SetConstrainColumn(ColumnDefinition obj, bool value)
-        {
-            obj.SetValue(ConstrainColumnProperty, value);
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ConstrainColumnProperty"/> attached property.
-        /// </summary>
-        /// <returns>The identifier for the ConstrainColumn attached property.</returns>
-        public static readonly DependencyProperty ConstrainColumnProperty =
-            DependencyProperty.RegisterAttached("ConstrainColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
deleted file mode 100644
index 0e86ab398f5..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
+++ /dev/null
@@ -1,320 +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 System.ComponentModel;
-using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView is a control for displaying a set of tabs and their content.
-    /// </summary>
-    [Obsolete("Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui")]
-    [TemplatePart(Name = TabContentPresenterName, Type = typeof(ContentPresenter))]
-    [TemplatePart(Name = TabViewContainerName, Type = typeof(Grid))]
-    [TemplatePart(Name = TabsItemsPresenterName, Type = typeof(ItemsPresenter))]
-    [TemplatePart(Name = TabsScrollViewerName, Type = typeof(ScrollViewer))]
-    [TemplatePart(Name = TabsScrollBackButtonName, Type = typeof(ButtonBase))]
-    [TemplatePart(Name = TabsScrollForwardButtonName, Type = typeof(ButtonBase))]
-    public partial class TabView : ListViewBase
-    {
-        private const int ScrollAmount = 50; // TODO: Should this be based on TabWidthMode
-
-        private const string TabContentPresenterName = "TabContentPresenter";
-        private const string TabViewContainerName = "TabViewContainer";
-        private const string TabsItemsPresenterName = "TabsItemsPresenter";
-        private const string TabsScrollViewerName = "ScrollViewer";
-        private const string TabsScrollBackButtonName = "ScrollBackButton";
-        private const string TabsScrollForwardButtonName = "ScrollForwardButton";
-
-        private ContentPresenter _tabContentPresenter;
-        private Grid _tabViewContainer;
-        private ItemsPresenter _tabItemsPresenter;
-        private ScrollViewer _tabScroller;
-        private ButtonBase _tabScrollBackButton;
-        private ButtonBase _tabScrollForwardButton;
-
-        private bool _hasLoaded;
-        private bool _isDragging;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabView"/> class.
-        /// </summary>
-        public TabView()
-        {
-            DefaultStyleKey = typeof(TabView);
-
-            // Container Generation Hooks
-            RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
-            ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
-
-            // Drag and Layout Hooks
-            DragItemsStarting += TabView_DragItemsStarting;
-            DragItemsCompleted += TabView_DragItemsCompleted;
-            SizeChanged += TabView_SizeChanged;
-
-            // Selection Hook
-            SelectionChanged += TabView_SelectionChanged;
-        }
-
-        /// <summary>
-        /// Occurs when a tab is dragged by the user outside of the <see cref="TabView"/>.  Generally, this paradigm is used to create a new-window with the torn-off tab.
-        /// The creation and handling of the new-window is left to the app's developer.
-        /// </summary>
-        public event EventHandler<TabDraggedOutsideEventArgs> TabDraggedOutside;
-
-        /// <summary>
-        /// Occurs when a tab's Close button is clicked.  Set <see cref="CancelEventArgs.Cancel"/> to true to prevent automatic Tab Closure.
-        /// </summary>
-        public event EventHandler<TabClosingEventArgs> TabClosing;
-
-        /// <inheritdoc/>
-        protected override DependencyObject GetContainerForItemOverride() => new TabViewItem();
-
-        /// <inheritdoc/>
-        protected override bool IsItemItsOwnContainerOverride(object item)
-        {
-            return item is TabViewItem;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            if (_tabItemsPresenter != null)
-            {
-                _tabItemsPresenter.SizeChanged -= TabView_SizeChanged;
-            }
-
-            if (_tabScroller != null)
-            {
-                _tabScroller.Loaded -= ScrollViewer_Loaded;
-            }
-
-            _tabContentPresenter = GetTemplateChild(TabContentPresenterName) as ContentPresenter;
-            _tabViewContainer = GetTemplateChild(TabViewContainerName) as Grid;
-            _tabItemsPresenter = GetTemplateChild(TabsItemsPresenterName) as ItemsPresenter;
-            _tabScroller = GetTemplateChild(TabsScrollViewerName) as ScrollViewer;
-
-            if (_tabItemsPresenter != null)
-            {
-                _tabItemsPresenter.SizeChanged += TabView_SizeChanged;
-            }
-
-            if (_tabScroller != null)
-            {
-                _tabScroller.Loaded += ScrollViewer_Loaded;
-            }
-        }
-
-        private void ScrollViewer_Loaded(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.Loaded -= ScrollViewer_Loaded;
-
-            if (_tabScrollBackButton != null)
-            {
-                _tabScrollBackButton.Click -= ScrollTabBackButton_Click;
-            }
-
-            if (_tabScrollForwardButton != null)
-            {
-                _tabScrollForwardButton.Click -= ScrollTabForwardButton_Click;
-            }
-
-            _tabScrollBackButton = _tabScroller.FindDescendantByName(TabsScrollBackButtonName) as ButtonBase;
-            _tabScrollForwardButton = _tabScroller.FindDescendantByName(TabsScrollForwardButtonName) as ButtonBase;
-
-            if (_tabScrollBackButton != null)
-            {
-                _tabScrollBackButton.Click += ScrollTabBackButton_Click;
-            }
-
-            if (_tabScrollForwardButton != null)
-            {
-                _tabScrollForwardButton.Click += ScrollTabForwardButton_Click;
-            }
-        }
-
-        private void ScrollTabBackButton_Click(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.ChangeView(Math.Max(0, _tabScroller.HorizontalOffset - ScrollAmount), null, null);
-        }
-
-        private void ScrollTabForwardButton_Click(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.ChangeView(Math.Min(_tabScroller.ScrollableWidth, _tabScroller.HorizontalOffset + ScrollAmount), null, null);
-        }
-
-        private void TabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (_isDragging)
-            {
-                // Skip if we're dragging, we'll reset when we're done.
-                return;
-            }
-
-            if (_tabContentPresenter != null)
-            {
-                if (SelectedItem == null)
-                {
-                    _tabContentPresenter.Content = null;
-                    _tabContentPresenter.ContentTemplate = null;
-                }
-                else
-                {
-                    if (ContainerFromItem(SelectedItem) is TabViewItem container)
-                    {
-                        _tabContentPresenter.Content = container.Content;
-                        _tabContentPresenter.ContentTemplate = container.ContentTemplate;
-                    }
-                }
-            }
-
-            // If our width can be effected by the selection, need to run algorithm.
-            if (!double.IsNaN(SelectedTabWidth))
-            {
-                TabView_SizeChanged(sender, null);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
-        {
-            base.PrepareContainerForItemOverride(element, item);
-
-            var tabitem = element as TabViewItem;
-
-            tabitem.Loaded -= TabViewItem_Loaded;
-            tabitem.Closing -= TabViewItem_Closing;
-            tabitem.Loaded += TabViewItem_Loaded;
-            tabitem.Closing += TabViewItem_Closing;
-
-            if (tabitem.Header == null)
-            {
-                tabitem.Header = item;
-            }
-
-            if (tabitem.HeaderTemplate == null)
-            {
-                var headertemplatebinding = new Binding()
-                {
-                    Source = this,
-                    Path = new PropertyPath(nameof(ItemHeaderTemplate)),
-                    Mode = BindingMode.OneWay
-                };
-                tabitem.SetBinding(TabViewItem.HeaderTemplateProperty, headertemplatebinding);
-            }
-
-            if (tabitem.IsClosable != true && tabitem.ReadLocalValue(TabViewItem.IsClosableProperty) == DependencyProperty.UnsetValue)
-            {
-                var iscloseablebinding = new Binding()
-                {
-                    Source = this,
-                    Path = new PropertyPath(nameof(CanCloseTabs)),
-                    Mode = BindingMode.OneWay,
-                };
-                tabitem.SetBinding(TabViewItem.IsClosableProperty, iscloseablebinding);
-            }
-        }
-
-        private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
-        {
-            var tabitem = sender as TabViewItem;
-
-            tabitem.Loaded -= TabViewItem_Loaded;
-
-            // Only need to do this once.
-            if (!_hasLoaded)
-            {
-                _hasLoaded = true;
-
-                // Need to set a tab's selection on load, otherwise ListView resets to null.
-                SetInitialSelection();
-
-                // Need to make sure ContentPresenter is set to content based on selection.
-                TabView_SelectionChanged(this, null);
-
-                // Need to make sure we've registered our removal method.
-                ItemsSource_PropertyChanged(this, null);
-
-                // Make sure we complete layout now.
-                TabView_SizeChanged(this, null);
-            }
-        }
-
-        private void TabViewItem_Closing(object sender, TabClosingEventArgs e)
-        {
-            var item = ItemFromContainer(e.Tab);
-
-            var args = new TabClosingEventArgs(item, e.Tab);
-            TabClosing?.Invoke(this, args);
-
-            if (!args.Cancel)
-            {
-                if (ItemsSource != null)
-                {
-                    _removeItemsSourceMethod?.Invoke(ItemsSource, new object[] { item });
-                }
-                else
-                {
-                    Items.Remove(item);
-                }
-            }
-        }
-
-        private void TabView_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
-        {
-            // Keep track of drag so we don't modify content until done.
-            _isDragging = true;
-        }
-
-        private void TabView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            _isDragging = false;
-
-            // args.DropResult == None when outside of area (e.g. create new window)
-            if (args.DropResult == DataPackageOperation.None)
-            {
-                var item = args.Items.FirstOrDefault();
-                var tab = ContainerFromItem(item) as TabViewItem;
-
-                if (tab == null && item is FrameworkElement fe)
-                {
-                    tab = fe.FindParent<TabViewItem>();
-                }
-
-                if (tab == null)
-                {
-                    // We still don't have a TabViewItem, most likely is a static TabViewItem in the template being dragged and not selected.
-                    // This is a fallback scenario for static tabs.
-                    // Note: This can be wrong if two TabViewItems share the exact same Content (i.e. a string), this should be unlikely in any practical scenario.
-                    for (int i = 0; i < Items.Count; i++)
-                    {
-                        var tabItem = ContainerFromIndex(i) as TabViewItem;
-                        if (ReferenceEquals(tabItem.Content, item))
-                        {
-                            tab = tabItem;
-                            break;
-                        }
-                    }
-                }
-
-                TabDraggedOutside?.Invoke(this, new TabDraggedOutsideEventArgs(item, tab));
-            }
-            else
-            {
-                // If dragging the active tab, there's an issue with the CP blanking.
-                TabView_SelectionChanged(this, null);
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
deleted file mode 100644
index d3310aadf06..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
+++ /dev/null
@@ -1,736 +0,0 @@
-<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:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{ThemeResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
-    <Thickness x:Key="TabViewItemHeaderMargin">0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderIconMargin">0,0,8,0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderCloseMargin">8,0,-8,0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderBorderThickness">0,1,1,0</Thickness>
-    <x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMaxWidth">NaN</x:Double>
-    <x:Double x:Key="TabViewItemHeaderCloseWidth">32</x:Double>
-
-    <converters:EmptyObjectToObjectConverter x:Key="NullVisibilityConverter"
-                                             EmptyValue="Collapsed"
-                                             NotEmptyValue="Visible" />
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-    <!--  65 is the size of both scroll buttons + 1 for layout rounding.  -->
-    <converters:DoubleToVisibilityConverter x:Key="GreaterThanToleranceVisibilityConverter"
-                                            GreaterThan="65.0" />
-
-    <converters:BoolToObjectConverter x:Key="CloseCollapsingSizeConverter"
-                                      FalseValue="{StaticResource TabViewItemHeaderCloseWidth}"
-                                      TrueValue="NaN" />
-
-    <!--  Default style for compatibility with WPF migrators.  -->
-    <Style TargetType="local:TabView">
-        <Setter Property="Background" Value="{ThemeResource TabViewBackground}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="IsSwipeEnabled" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
-        <Setter Property="ScrollViewer.IsHorizontalRailEnabled" Value="False" />
-        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
-        <Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="False" />
-        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True" />
-        <!--  Need UseLayoutRounding as Width being dynamically changed in same cases to fill up an entire space, otherwise gap.  -->
-        <Setter Property="UseLayoutRounding" Value="False" />
-        <Setter Property="ItemContainerTransitions">
-            <Setter.Value>
-                <TransitionCollection>
-                    <AddDeleteThemeTransition />
-                    <ContentThemeTransition />
-                    <ReorderThemeTransition />
-                    <EntranceThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <!--  Note: We have to use StackPanel here due to other issues using ItemsStackPanel or VirtualizingStackPanel  -->
-                    <StackPanel Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template" Value="{StaticResource TabViewTemplate}" />
-    </Style>
-
-    <ControlTemplate x:Key="TabViewTemplate"
-                     TargetType="local:TabView">
-        <Grid x:Name="TabViewContainer">
-            <Grid.RowDefinitions>
-                <!--  0 Header  -->
-                <RowDefinition Height="Auto" />
-                <!--  1 Tabs  -->
-                <RowDefinition Height="Auto" />
-                <!--  2 Content  -->
-                <RowDefinition Height="*" />
-                <!--  3 Footer  -->
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <!--  0 TabStartHeader  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  1 Tabs  -->
-                <ColumnDefinition Width="Auto"
-                                  local:TabView.ConstrainColumn="True"
-                                  local:TabView.IgnoreColumn="True" />
-                <!--  2 Reserved: Overflow Drop-down  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  3 Auto Add Button  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  4 Padding  -->
-                <ColumnDefinition Width="*"
-                                  local:TabView.IgnoreColumn="True" />
-                <!--  5 TabEndHeader  -->
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <ContentPresenter Grid.Row="0"
-                              Grid.ColumnSpan="6"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}" />
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="0"
-                              Content="{TemplateBinding TabStartHeader}"
-                              ContentTemplate="{TemplateBinding TabStartHeaderTemplate}" />
-
-            <ScrollViewer x:Name="ScrollViewer"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          AutomationProperties.AccessibilityView="Raw"
-                          BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
-                          HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                          HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                          IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                          IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                          IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}"
-                          IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                          IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}"
-                          Style="{StaticResource TabViewScrollViewer}"
-                          TabNavigation="{TemplateBinding TabNavigation}"
-                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                          VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                          ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
-                <ItemsPresenter x:Name="TabsItemsPresenter"
-                                Padding="{TemplateBinding Padding}" />
-            </ScrollViewer>
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="3"
-                              HorizontalAlignment="Left"
-                              Content="{TemplateBinding TabActionHeader}"
-                              ContentTemplate="{TemplateBinding TabActionHeaderTemplate}" />
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="5"
-                              Content="{TemplateBinding TabEndHeader}"
-                              ContentTemplate="{TemplateBinding TabEndHeaderTemplate}" />
-
-            <ContentPresenter x:Name="TabContentPresenter"
-                              Grid.Row="2"
-                              Grid.ColumnSpan="6"
-                              Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              BorderThickness="{TemplateBinding BorderThickness}" />
-
-            <ContentPresenter Grid.Row="3"
-                              Grid.ColumnSpan="6"
-                              Content="{TemplateBinding Footer}"
-                              ContentTemplate="{TemplateBinding FooterTemplate}" />
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Based on Style for ListViewItemExpanded Template - https://msdn.microsoft.com/en-us/library/windows/apps/mt299136.aspx  -->
-    <ControlTemplate x:Key="TabViewItemHeaderTemplate"
-                     TargetType="local:TabViewItem">
-        <Grid x:Name="LayoutRoot"
-              ex:FrameworkElementExtensions.AncestorType="local:TabView"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Control.IsTemplateFocusTarget="True"
-              FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-              RenderTransformOrigin="0.5,0.5">
-            <Grid.RenderTransform>
-                <ScaleTransform x:Name="LayoutRootScale" />
-            </Grid.RenderTransform>
-            <Rectangle x:Name="SelectionIndicator"
-                       Height="2"
-                       Margin="0,-1"
-                       VerticalAlignment="Top"
-                       Fill="{ThemeResource TabViewSelectionIndicatorForeground}"
-                       Opacity="0" />
-
-            <Grid Padding="{TemplateBinding Padding}">
-                <Grid x:Name="ContentPresenterGrid">
-                    <Grid.RenderTransform>
-                        <TranslateTransform x:Name="ContentPresenterTranslateTransform" />
-                    </Grid.RenderTransform>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <!--  Modifications of default ListViewItem Template for our Tab Here  -->
-                    <Viewbox x:Name="IconBox"
-                             MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
-                             MaxHeight="{ThemeResource TabViewItemHeaderIconSize}"
-                             Margin="{ThemeResource TabViewItemHeaderIconMargin}"
-                             Visibility="{Binding Icon, Converter={StaticResource NullVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-                        <ContentPresenter x:Name="Icon"
-                                          Content="{TemplateBinding Icon}"
-                                          Foreground="{TemplateBinding Foreground}" />
-                    </Viewbox>
-                    <ContentPresenter x:Name="ContentPresenter"
-                                      Grid.Column="1"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      Content="{TemplateBinding Header}"
-                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                      ContentTransitions="{TemplateBinding ContentTransitions}"
-                                      FontWeight="{TemplateBinding FontWeight}"
-                                      OpticalMarginAlignment="TrimSideBearings" />
-                    <!--  Use grid to toggle visibility based on IsClosable property and inner border for hover animations.  -->
-                    <Border x:Name="CloseButtonContainer"
-                            Grid.Column="2"
-                            Width="{Binding (ex:FrameworkElementExtensions.Ancestor).IsCloseButtonOverlay, Converter={StaticResource CloseCollapsingSizeConverter}, ElementName=LayoutRoot}"
-                            HorizontalAlignment="Right"
-                            Visibility="{Binding IsClosable, Converter={StaticResource BoolToVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border x:Name="CloseButtonBorder"
-                                Width="{StaticResource TabViewItemHeaderCloseWidth}"
-                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
-                                Background="{TemplateBinding Background}"
-                                Visibility="Collapsed">
-                            <Button x:Name="CloseButton"
-                                    x:Uid="/Microsoft.Toolkit.Uwp.UI.Controls/Resources/WindowsCommunityToolkit_TabView_CloseButton"
-                                    Style="{StaticResource TabViewItemCloseButtonStyle}">
-                                &#xE711;
-                            </Button>
-                        </Border>
-                    </Border>
-                </Grid>
-            </Grid>
-
-            <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-
-                    <VisualState x:Name="PointerOver">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="Pressed">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPressed}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="SelectionIndicator.Opacity" Value="0.4" />
-                        </VisualState.Setters>
-                    </VisualState>
-
-                    <VisualState x:Name="Selected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="PointerOverSelected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="PressedSelected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DisabledStates">
-                    <VisualState x:Name="Enabled" />
-
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DataVirtualizationStates">
-                    <VisualState x:Name="DataAvailable" />
-
-                    <VisualState x:Name="DataPlaceholder" />
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="ReorderHintStates">
-                    <VisualState x:Name="NoReorderHint" />
-
-                    <VisualState x:Name="BottomReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Bottom"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="TopReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Top"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="RightReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Right"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="LeftReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Left"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualStateGroup.Transitions>
-                        <VisualTransition GeneratedDuration="0:0:0.2"
-                                          To="NoReorderHint" />
-                    </VisualStateGroup.Transitions>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DragStates">
-                    <VisualState x:Name="NotDragging" />
-
-                    <VisualState x:Name="Dragging">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemDragThemeOpacity}"
-                                             Duration="0" />
-                            <DragItemThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="DraggingTarget" />
-
-                    <VisualState x:Name="MultipleDraggingPrimary" />
-
-                    <VisualState x:Name="MultipleDraggingSecondary" />
-
-                    <VisualState x:Name="DraggedPlaceholder" />
-
-                    <VisualState x:Name="Reordering">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemReorderThemeOpacity}"
-                                             Duration="0:0:0.240" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="ReorderingTarget">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
-                                             Duration="0:0:0.240" />
-                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
-                                             Storyboard.TargetProperty="ScaleX"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
-                                             Duration="0:0:0.240" />
-                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
-                                             Storyboard.TargetProperty="ScaleY"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
-                                             Duration="0:0:0.240" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="MultipleReorderingPrimary" />
-
-                    <VisualState x:Name="ReorderedPlaceholder">
-                        <Storyboard>
-                            <FadeOutThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="DragOver">
-                        <Storyboard>
-                            <DropTargetItemThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualStateGroup.Transitions>
-                        <VisualTransition GeneratedDuration="0:0:0.2"
-                                          To="NotDragging" />
-                    </VisualStateGroup.Transitions>
-                </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Based on Style for Windows.UI.Xaml.Controls.ListViewItem  -->
-    <Style TargetType="local:TabViewItem">
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource TabViewItemHeaderBorderThickness}" />
-        <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource TabViewItemHeaderForeground}" />
-        <Setter Property="Margin" Value="{ThemeResource TabViewItemHeaderMargin}" />
-        <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="IsHoldingEnabled" Value="True" />
-        <Setter Property="Padding" Value="14,0" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="MinWidth" Value="{ThemeResource TabViewItemHeaderMinWidth}" />
-        <Setter Property="MinHeight" Value="{ThemeResource TabViewItemHeaderMinHeight}" />
-        <Setter Property="MaxWidth" Value="{ThemeResource TabViewItemHeaderMaxWidth}" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="FocusVisualMargin" Value="0" />
-        <Setter Property="IsClosable" Value="False" />
-        <Setter Property="Template" Value="{StaticResource TabViewItemHeaderTemplate}" />
-    </Style>
-
-    <Style x:Key="TabViewItemCloseButtonStyle"
-           TargetType="Button">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumHighBrush}" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Margin" Value="6,0,6,0" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid x:Name="RootGrid"
-                          Background="{TemplateBinding Background}">
-                        <ContentPresenter x:Name="ContentPresenter"
-                                          Padding="{TemplateBinding Padding}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          BorderBrush="{TemplateBinding BorderBrush}"
-                                          BorderThickness="{TemplateBinding BorderThickness}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal">
-                                    <Storyboard>
-                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ButtonPointerOverForegroundThemeBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                   Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>-->
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledTransparentBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="TabViewScrollViewer"
-           TargetType="ScrollViewer">
-        <Setter Property="HorizontalScrollMode" Value="Auto" />
-        <Setter Property="VerticalScrollMode" Value="Auto" />
-        <Setter Property="IsHorizontalRailEnabled" Value="True" />
-        <Setter Property="IsVerticalRailEnabled" Value="True" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="ZoomMode" Value="Disabled" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Visible" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="1,0,0,0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollViewer">
-                    <Border x:Name="Root"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <RepeatButton x:Name="ScrollBackButton"
-                                          VerticalAlignment="Stretch"
-                                          Background="Transparent"
-                                          BorderThickness="1"
-                                          Delay="50"
-                                          FontFamily="Segoe MDL2 Assets"
-                                          Interval="100"
-                                          Style="{StaticResource RepeatButtonRevealStyle}"
-                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                                &#xE76B;
-                            </RepeatButton>
-
-                            <ScrollContentPresenter x:Name="ScrollContentPresenter"
-                                                    Grid.Column="1"
-                                                    TabFocusNavigation="Once"
-                                                    Margin="{TemplateBinding Padding}" />
-
-                            <RepeatButton x:Name="ScrollForwardButton"
-                                          Grid.Column="2"
-                                          VerticalAlignment="Stretch"
-                                          Background="Transparent"
-                                          BorderThickness="1"
-                                          Delay="50"
-                                          FontFamily="Segoe MDL2 Assets"
-                                          Interval="100"
-                                          Style="{StaticResource RepeatButtonRevealStyle}"
-                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                                &#xE76C;
-                            </RepeatButton>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
deleted file mode 100644
index 3ce0f3e5483..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
+++ /dev/null
@@ -1,79 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Item Container for a <see cref="TabView"/>.
-    /// </summary>
-    public partial class TabViewItem
-    {
-        /// <summary>
-        /// Gets or sets the header content for the tab.
-        /// </summary>
-        public object Header
-        {
-            get { return (object)GetValue(HeaderProperty); }
-            set { SetValue(HeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Header"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="Header"/> dependency property.</returns>
-        public static readonly DependencyProperty HeaderProperty =
-            DependencyProperty.Register(nameof(Header), typeof(object), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets the icon to appear in the tab header.
-        /// </summary>
-        public IconElement Icon
-        {
-            get { return (IconElement)GetValue(IconProperty); }
-            set { SetValue(IconProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Icon"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="Icon"/> dependency property.</returns>
-        public static readonly DependencyProperty IconProperty =
-            DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets the template to override for the tab header.
-        /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-            set { SetValue(HeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="HeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty HeaderTemplateProperty =
-            DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the tab can be closed by the user with the close button.
-        /// </summary>
-        public bool IsClosable
-        {
-            get { return (bool)GetValue(IsClosableProperty); }
-            set { SetValue(IsClosableProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IsClosable"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="IsClosable"/> dependency property.</returns>
-        public static readonly DependencyProperty IsClosableProperty =
-            DependencyProperty.Register(nameof(IsClosable), typeof(bool), typeof(TabViewItem), new PropertyMetadata(null));
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
deleted file mode 100644
index 69a968fd839..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
+++ /dev/null
@@ -1,116 +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 Windows.Devices.Input;
-using Windows.System;
-using Windows.UI.Core;
-using Windows.UI.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Item Container for a <see cref="TabView"/>.
-    /// </summary>
-    [TemplatePart(Name = TabCloseButtonName, Type = typeof(ButtonBase))]
-    public partial class TabViewItem : ListViewItem
-    {
-        private const string TabCloseButtonName = "CloseButton";
-
-        private ButtonBase _tabCloseButton;
-
-        private bool _isMiddleClick;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabViewItem"/> class.
-        /// </summary>
-        public TabViewItem()
-        {
-            DefaultStyleKey = typeof(TabViewItem);
-        }
-
-        /// <summary>
-        /// Fired when the Tab's close button is clicked.
-        /// </summary>
-        public event EventHandler<TabClosingEventArgs> Closing;
-
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            if (_tabCloseButton != null)
-            {
-                _tabCloseButton.Click -= TabCloseButton_Click;
-            }
-
-            _tabCloseButton = GetTemplateChild(TabCloseButtonName) as ButtonBase;
-
-            if (_tabCloseButton != null)
-            {
-                _tabCloseButton.Click += TabCloseButton_Click;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerRoutedEventArgs e)
-        {
-            _isMiddleClick = false;
-
-            if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
-            {
-                PointerPoint pointerPoint = e.GetCurrentPoint(this);
-
-                // Record if middle button is pressed
-                if (pointerPoint.Properties.IsMiddleButtonPressed)
-                {
-                    _isMiddleClick = true;
-                }
-
-                // Disable unwanted behaviour inherited by ListViewItem:
-                // Disable "Ctrl + Left click" to deselect tab
-                // Or variant like "Ctrl + Shift + Left click"
-                // Or "Ctrl + Alt + Left click"
-                if (pointerPoint.Properties.IsLeftButtonPressed)
-                {
-                    var ctrl = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control);
-                    if (ctrl.HasFlag(CoreVirtualKeyStates.Down))
-                    {
-                        // return here so the event won't be picked up by the base class
-                        // but keep this event unhandled so it can be picked up further
-                        return;
-                    }
-                }
-            }
-
-            base.OnPointerPressed(e);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPointerReleased(PointerRoutedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-
-            // Close on Middle-Click
-            if (_isMiddleClick)
-            {
-                TabCloseButton_Click(this, null);
-            }
-
-            _isMiddleClick = false;
-        }
-
-        private void TabCloseButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (IsClosable)
-            {
-                Closing?.Invoke(this, new TabClosingEventArgs(Content, this));
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
deleted file mode 100644
index 65b1ce03844..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
+++ /dev/null
@@ -1,36 +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 Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Possible modes for how to layout a <see cref="TabViewItem"/> Header's Width in the <see cref="TabView"/>.
-    /// </summary>
-    public enum TabWidthMode
-    {
-        /// <summary>
-        /// Each tab header takes up as much space as it needs.  This is similar to how WPF and Visual Studio Code behave.
-        /// Suggest to keep <see cref="TabView.IsCloseButtonOverlay"/> set to false.
-        /// <see cref="TabView.SelectedTabWidth"/> is ignored.
-        /// In this scenario, tab width behavior is effectively turned off.  This can be useful when using custom styling or a custom panel for layout of <see cref="TabViewItem"/> as well.
-        /// </summary>
-        Actual,
-
-        /// <summary>
-        /// Each tab header will use the minimal space set by <see cref="FrameworkElement.MinWidth"/> on the <see cref="TabViewItem"/>.
-        /// Suggest to set the <see cref="TabView.SelectedTabWidth"/> to show more content for the selected item.
-        /// </summary>
-        Compact,
-
-        /// <summary>
-        /// Each tab header will fill to fit the available space.  If <see cref="TabView.SelectedTabWidth"/> is set, that will be used as a Maximum Width.
-        /// This is similar to how Microsoft Edge behaves when used with the <see cref="TabView.SelectedTabWidth"/>.
-        /// Suggest to set <see cref="TabView.IsCloseButtonOverlay"/> to true.
-        /// Suggest to set <see cref="TabView.SelectedTabWidth"/> to 200 and the TabViewItemHeaderMinWidth Resource to 90.
-        /// </summary>
-        Equal,
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 592fbb45626..9c17a3717bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -9,7 +9,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
@@ -27,7 +26,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
index 6799439d67a..cdc4af642c5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
@@ -181,13 +181,6 @@ public class TileControl : ContentControl
         /// </summary>
         public event EventHandler ImageLoaded;
 
-        /// <summary>
-        /// Gets a value indicating whether the platform supports Composition.
-        /// </summary>
-        [Obsolete("This property is now obsolete and will be removed in a future version of the Toolkit.")]
-        public static bool IsCompositionSupported => !DesignTimeHelpers.IsRunningInLegacyDesignerMode &&
-                                                     ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
-
         /// <summary>
         /// Initializes a new instance of the <see cref="TileControl"/> class.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index e2bc71350ef..27fe2b2f0bc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -13,7 +13,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
@@ -33,8 +32,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabView" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabViewItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index 5e81855f128..a39030a11a4 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -86,14 +86,6 @@ public static bool IsDecimal(this string str)
         /// <returns><c>true</c> if the string contains only letters; otherwise, <c>false</c>.</returns>
         public static bool IsCharacterString(this string str) => Regex.IsMatch(str, CharactersRegex);
 
-        /// <summary>
-        /// Returns a string representation of an object.
-        /// </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) => value?.ToString();
-
         /// <summary>
         /// Returns a string with HTML comments, scripts, styles, and tags removed.
         /// </summary>

From 5066dff24fe88a29ddc28696656d7e414449d186 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 11:22:56 +0200
Subject: [PATCH 380/595] Added MessageHandler<TMessage> delegate, removed
 closures

---
 .../Messaging/IMessenger.cs                   | 15 +++-
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 70 +++++++++++--------
 .../Messaging/MessengerExtensions.cs          | 10 +--
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 39e38d5af01..d1a6e1513df 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -7,6 +7,17 @@
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
+    /// <summary>
+    /// A <see langword="delegate"/> used to represent actions to invoke when a message is received.
+    /// The recipient is given as an input argument to allow message registrations to avoid creating
+    /// closures: if an instance method on a recipient needs to be invoked it is possible to just
+    /// cast the recipient to the right type and then access the local method from that instance.
+    /// </summary>
+    /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+    /// <param name="recipient">The recipient that is receiving the message.</param>
+    /// <param name="message">The message being received.</param>
+    public delegate void MessageHandler<TMessage>(object recipient, TMessage message);
+
     /// <summary>
     /// An interface for a type providing the ability to exchange messages between different objects.
     /// </summary>
@@ -32,9 +43,9 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="token">A token used to determine the receiving channel to use.</param>
-        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <param name="action">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+        void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> action)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 4e5e780d4dc..9049cdd1593 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -23,11 +23,16 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// </code>
     /// Then, register your a recipient for this message:
     /// <code>
-    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, m =>
+    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, (r, m) =>
     /// {
     ///     // Handle the message here...
     /// });
     /// </code>
+    /// The message handler here is a lambda expression taking two parameters: the recipient and the message.
+    /// This is done to avoid the allocations for the closures that would've been generated if the expression
+    /// had captured the current instance - instead it is possible to just cast the recipient to the right type
+    /// and access private instance members from the handler directly. This allows the message handler to be a
+    /// static method, which enables the C# to perform a number of additional memory optimizations.
     /// Finally, send a message when needed, like so:
     /// <code>
     /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
@@ -62,7 +67,7 @@ public sealed class Messenger : IMessenger
         //                    |   ________(recipients registrations)___________\________/            /          __/
         //                    |  /           _______(channel registrations)_____\___________________/          /
         //                    | /           /                                    \                            /
-        // DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>> mapping = Mapping<TMessage, TToken>
+        // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TMessage>>> mapping = Mapping<TMessage, TToken>
         //                                            /               / \        /                   /
         //                      ___(Type2.tToken)____/               /   \______/___________________/
         //                     /________________(Type2.tMessage)____/          /
@@ -133,7 +138,7 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public void Register<TMessage, TToken>(object recipient, TToken token, Action<TMessage> action)
+        public void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> action)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -142,12 +147,12 @@ public void Register<TMessage, TToken>(object recipient, TToken token, Action<TM
                 // Get the <TMessage, TToken> registration list for this recipient
                 Mapping<TMessage, TToken> mapping = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, Action<TMessage>>? map = ref mapping.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, MessageHandler<TMessage>>? map = ref mapping.GetOrAddValueRef(key);
 
-                map ??= new DictionarySlim<TToken, Action<TMessage>>();
+                map ??= new DictionarySlim<TToken, MessageHandler<TMessage>>();
 
                 // Add the new registration entry
-                ref Action<TMessage>? handler = ref map.GetOrAddValueRef(token);
+                ref MessageHandler<TMessage>? handler = ref map.GetOrAddValueRef(token);
 
                 if (!(handler is null))
                 {
@@ -352,7 +357,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                 var key = new Recipient(recipient);
 
-                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, Action<TMessage>>? dictionary))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, MessageHandler<TMessage>>? dictionary))
                 {
                     return;
                 }
@@ -386,11 +391,14 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
+        public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            object[] entries;
+            object[] handlers;
+            object[] recipients;
+            ref object handlersRef = ref Unsafe.AsRef<object>(null);
+            ref object recipientsRef = ref Unsafe.AsRef<object>(null);
             int i = 0;
 
             lock (this.recipientsMap)
@@ -406,9 +414,12 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // inside one of the currently existing handlers. We can use memory pooling
                 // to reuse arrays, to minimize the average memory usage. In practice,
                 // we usually just need to pay the small overhead of copying the items.
-                entries = ArrayPool<object>.Shared.Rent(mapping!.TotalHandlersCount);
+                int totalHandlersCount = mapping!.TotalHandlersCount;
 
-                ref object entriesRef = ref MemoryMarshal.GetReference(entries.AsSpan());
+                handlers = ArrayPool<object>.Shared.Rent(totalHandlersCount);
+                recipients = ArrayPool<object>.Shared.Rent(totalHandlersCount);
+                handlersRef = ref handlers[0];
+                recipientsRef = ref recipients[0];
 
                 // Copy the handlers to the local collection.
                 // Both types being enumerate expose a struct enumerator,
@@ -423,6 +434,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // that doesn't expose the single standard Current property.
                 while (mappingEnumerator.MoveNext())
                 {
+                    object recipient = mappingEnumerator.Key.Target;
                     var pairsEnumerator = mappingEnumerator.Value.GetEnumerator();
 
                     while (pairsEnumerator.MoveNext())
@@ -430,14 +442,12 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                         // Only select the ones with a matching token
                         if (pairsEnumerator.Key.Equals(token))
                         {
-                            unsafe
-                            {
-                                // We spend quite a bit of time in these two busy loops as we go through all the
-                                // existing mappings and registrations to find the handlers we're interested in.
-                                // We can manually offset here to skip the bounds checks in this inner loop when
-                                // indexing the array (the size is already verified and guaranteed to be enough).
-                                Unsafe.Add(ref entriesRef, (IntPtr)(void*)(uint)i++) = pairsEnumerator.Value;
-                            }
+                            // We spend quite a bit of time in these two busy loops as we go through all the
+                            // existing mappings and registrations to find the handlers we're interested in.
+                            // We can manually offset here to skip the bounds checks in this inner loop when
+                            // indexing the array (the size is already verified and guaranteed to be enough).
+                            Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)i) = pairsEnumerator.Value;
+                            Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)i++) = recipient;
                         }
                     }
                 }
@@ -446,20 +456,24 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             try
             {
                 // Invoke all the necessary handlers on the local copy of entries
-                foreach (var entry in entries.AsSpan(0, i))
+                for (int j = 0; j < i; j++)
                 {
                     // We're doing an unsafe cast to skip the type checks again.
                     // See the comments in the UnregisterAll method for more info.
-                    Unsafe.As<Action<TMessage>>(entry)(message);
+                    MessageHandler<TMessage> handler = Unsafe.As<MessageHandler<TMessage>>(Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)j));
+
+                    handler(Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)j), message);
                 }
             }
             finally
             {
                 // As before, we also need to clear it first to avoid having potentially long
                 // lasting memory leaks due to leftover references being stored in the pool.
-                entries.AsSpan(0, i).Clear();
+                handlers.AsSpan(0, i).Clear();
+                recipients.AsSpan(0, i).Clear();
 
-                ArrayPool<object>.Shared.Return(entries);
+                ArrayPool<object>.Shared.Return(handlers);
+                ArrayPool<object>.Shared.Return(recipients);
             }
 
             return message;
@@ -534,7 +548,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
         /// This type is defined for simplicity and as a workaround for the lack of support for using type aliases
         /// over open generic types in C# (using type aliases can only be used for concrete, closed types).
         /// </remarks>
-        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, Action<TMessage>>>, IMapping
+        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TMessage>>>, IMapping
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -586,7 +600,7 @@ private interface IMapping : IDictionarySlim<Recipient>
             /// <summary>
             /// The registered recipient.
             /// </summary>
-            private readonly object target;
+            public readonly object Target;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="Recipient"/> struct.
@@ -595,14 +609,14 @@ private interface IMapping : IDictionarySlim<Recipient>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public Recipient(object target)
             {
-                this.target = target;
+                Target = target;
             }
 
             /// <inheritdoc/>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public bool Equals(Recipient other)
             {
-                return ReferenceEquals(this.target, other.target);
+                return ReferenceEquals(Target, other.Target);
             }
 
             /// <inheritdoc/>
@@ -615,7 +629,7 @@ public override bool Equals(object? obj)
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public override int GetHashCode()
             {
-                return RuntimeHelpers.GetHashCode(this.target);
+                return RuntimeHelpers.GetHashCode(this.Target);
             }
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index a344b76a4f3..5e2473db331 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -174,7 +174,7 @@ static Action<IMessenger, object, TToken> GetRegistrationAction(Type type, Metho
         public static void Register<TMessage>(this IMessenger messenger, IRecipient<TMessage> recipient)
             where TMessage : class
         {
-            messenger.Register<TMessage, Unit>(recipient, default, recipient.Receive);
+            messenger.Register<TMessage, Unit>(recipient, default, (r, m) => Unsafe.As<IRecipient<TMessage>>(r).Receive(m));
         }
 
         /// <summary>
@@ -191,7 +191,7 @@ public static void Register<TMessage, TToken>(this IMessenger messenger, IRecipi
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            messenger.Register<TMessage, TToken>(recipient, token, recipient.Receive);
+            messenger.Register<TMessage, TToken>(recipient, token, (r, m) => Unsafe.As<IRecipient<TMessage>>(r).Receive(m));
         }
 
         /// <summary>
@@ -200,13 +200,13 @@ public static void Register<TMessage, TToken>(this IMessenger messenger, IRecipi
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
         /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <param name="action">The <see cref="Action{T}"/> to invoke when a message is received.</param>
+        /// <param name="handler">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
-        public static void Register<TMessage>(this IMessenger messenger, object recipient, Action<TMessage> action)
+        public static void Register<TMessage>(this IMessenger messenger, object recipient, MessageHandler<TMessage> handler)
             where TMessage : class
         {
-            messenger.Register(recipient, default(Unit), action);
+            messenger.Register(recipient, default(Unit), handler);
         }
 
         /// <summary>

From f886f2878fdfdfb0554d6fef6628ee06e8cf1885 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 11:30:22 +0200
Subject: [PATCH 381/595] Fixed some XML comments

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 9049cdd1593..01da10a831c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -42,7 +42,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// in the current scope. This is helpful to keep the registration and handling logic separate.
     /// Following up from the previous example, consider a class having this method:
     /// <code>
-    /// private void Receive(LoginCompletedMessage message)
+    /// private static void Receive(object recipient, LoginCompletedMessage message)
     /// {
     ///     // Handle the message there
     /// }
@@ -51,8 +51,8 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <code>
     /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, Receive);
     /// </code>
-    /// The C# compiler will automatically convert that expression to an <see cref="Action{T}"/> instance
-    /// compatible with the <see cref="MessengerExtensions.Register{T}(IMessenger,object,Action{T})"/> method.
+    /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TMessage}"/> instance
+    /// compatible with the <see cref="MessengerExtensions.Register{T}(IMessenger,object,MessageHandler{T})"/> method.
     /// This will also work if multiple overloads of that method are available, each handling a different
     /// message type: the C# compiler will automatically pick the right one for the current message type.
     /// For info on the other available features, check the <see cref="IMessenger"/> interface.

From c45bb99dd30f27e2dfa2d6784d705ddfd040f182 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 11:32:16 +0200
Subject: [PATCH 382/595] Updated unit tests

---
 .../Mvvm/Test_Messenger.Request.cs            | 28 +++++++++----------
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 22 +++++++--------
 .../Mvvm/Test_ObservableRecipient.cs          |  4 +--
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index 07fef8d9300..e47855a3c0f 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -20,7 +20,7 @@ public void Test_Messenger_RequestMessage_Ok()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(NumberRequestMessage m)
+            void Receive(object recipient, NumberRequestMessage m)
             {
                 Assert.IsFalse(m.HasReceivedResponse);
 
@@ -54,7 +54,7 @@ public void Test_Messenger_RequestMessage_Fail_MultipleReplies()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(NumberRequestMessage m)
+            void Receive(object recipient, NumberRequestMessage m)
             {
                 m.Reply(42);
                 m.Reply(42);
@@ -76,7 +76,7 @@ public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(AsyncNumberRequestMessage m)
+            void Receive(object recipient, AsyncNumberRequestMessage m)
             {
                 Assert.IsFalse(m.HasReceivedResponse);
 
@@ -106,7 +106,7 @@ async Task<int> GetNumberAsync()
                 return 42;
             }
 
-            void Receive(AsyncNumberRequestMessage m)
+            void Receive(object recipient, AsyncNumberRequestMessage m)
             {
                 Assert.IsFalse(m.HasReceivedResponse);
 
@@ -140,7 +140,7 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(AsyncNumberRequestMessage m)
+            void Receive(object recipient, AsyncNumberRequestMessage m)
             {
                 m.Reply(42);
                 m.Reply(42);
@@ -162,7 +162,7 @@ public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(NumbersCollectionRequestMessage m)
+            void Receive(object recipient, NumbersCollectionRequestMessage m)
             {
             }
 
@@ -183,9 +183,9 @@ public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies()
                 recipient2 = new object(),
                 recipient3 = new object();
 
-            void Receive1(NumbersCollectionRequestMessage m) => m.Reply(1);
-            void Receive2(NumbersCollectionRequestMessage m) => m.Reply(2);
-            void Receive3(NumbersCollectionRequestMessage m) => m.Reply(3);
+            void Receive1(object recipient, NumbersCollectionRequestMessage m) => m.Reply(1);
+            void Receive2(object recipient, NumbersCollectionRequestMessage m) => m.Reply(2);
+            void Receive3(object recipient, NumbersCollectionRequestMessage m) => m.Reply(3);
 
             messenger.Register<NumbersCollectionRequestMessage>(recipient1, Receive1);
             messenger.Register<NumbersCollectionRequestMessage>(recipient2, Receive2);
@@ -212,7 +212,7 @@ public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies()
             var messenger = new Messenger();
             var recipient = new object();
 
-            void Receive(AsyncNumbersCollectionRequestMessage m)
+            void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
             {
             }
 
@@ -241,10 +241,10 @@ async Task<int> GetNumberAsync()
                 return 3;
             }
 
-            void Receive1(AsyncNumbersCollectionRequestMessage m) => m.Reply(1);
-            void Receive2(AsyncNumbersCollectionRequestMessage m) => m.Reply(Task.FromResult(2));
-            void Receive3(AsyncNumbersCollectionRequestMessage m) => m.Reply(GetNumberAsync());
-            void Receive4(AsyncNumbersCollectionRequestMessage m) => m.Reply(_ => GetNumberAsync());
+            void Receive1(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(1);
+            void Receive2(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(Task.FromResult(2));
+            void Receive3(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(GetNumberAsync());
+            void Receive4(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(_ => GetNumberAsync());
 
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient1, Receive1);
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient2, Receive2);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 33d6e8cd19b..96818789f5e 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -58,7 +58,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA>(recipient, m => { });
+            messenger.Register<MessageA>(recipient, (r, m) => { });
 
             messenger.Unregister<MessageA>(recipient);
 
@@ -72,7 +72,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
 
             messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
 
@@ -86,7 +86,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
 
             messenger.UnregisterAll(recipient, nameof(MessageA));
 
@@ -100,7 +100,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
 
             messenger.UnregisterAll(recipient);
 
@@ -116,7 +116,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Default.Register<MessageA>(a, m => result = m.Text);
+            Messenger.Default.Register<MessageA>(a, (r, m) => result = m.Text);
 
             Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
 
@@ -143,7 +143,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Default.Register<MessageA>(a, m => result = m.Text);
+            Messenger.Default.Register<MessageA>(a, (r, m) => result = m.Text);
 
             Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
 
@@ -170,7 +170,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Default.Register<MessageA, string>(a, nameof(MessageA), m => result = m.Text);
+            Messenger.Default.Register<MessageA, string>(a, nameof(MessageA), (r, m) => result = m.Text);
 
             Assert.IsTrue(Messenger.Default.IsRegistered<MessageA, string>(a, nameof(MessageA)));
 
@@ -195,11 +195,11 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA>(recipient, m => { });
+            messenger.Register<MessageA>(recipient, (r, m) => { });
 
             Assert.ThrowsException<InvalidOperationException>(() =>
             {
-                messenger.Register<MessageA>(recipient, m => { });
+                messenger.Register<MessageA>(recipient, (r, m) => { });
             });
         }
 
@@ -210,11 +210,11 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
             var messenger = new Messenger();
             var recipient = new object();
 
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
 
             Assert.ThrowsException<InvalidOperationException>(() =>
             {
-                messenger.Register<MessageA, string>(recipient, nameof(MessageA), m => { });
+                messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
             });
         }
 
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index d5e330e1e53..76ff145d86f 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -59,7 +59,7 @@ public void Test_ObservableRecipient_Broadcast()
 
             PropertyChangedMessage<int> message = null;
 
-            messenger.Register<PropertyChangedMessage<int>>(messenger, m => message = m);
+            messenger.Register<PropertyChangedMessage<int>>(messenger, (r, m) => message = m);
 
             viewmodel.Data = 42;
 
@@ -97,7 +97,7 @@ protected override void OnActivated()
             {
                 IsActivatedCheck = true;
 
-                Messenger.Register<SampleMessage>(this, m => { });
+                Messenger.Register<SampleMessage>(this, (r, m) => { });
             }
 
             protected override void OnDeactivated()

From eef4d0af8e809fda7d3a7dc5a57ca64ef90337df Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 12:50:27 +0200
Subject: [PATCH 383/595] Fixed an index exception in Messenger.Send

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 01da10a831c..e85f1ef4bc2 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -6,7 +6,6 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.Collections.Extensions;
 
@@ -404,17 +403,19 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             lock (this.recipientsMap)
             {
                 // Check whether there are any registered recipients
-                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
-                {
-                    return message;
-                }
+                _ = TryGetMapping(out Mapping<TMessage, TToken>? mapping);
 
                 // We need to make a local copy of the currently registered handlers,
                 // since users might try to unregister (or register) new handlers from
                 // inside one of the currently existing handlers. We can use memory pooling
                 // to reuse arrays, to minimize the average memory usage. In practice,
                 // we usually just need to pay the small overhead of copying the items.
-                int totalHandlersCount = mapping!.TotalHandlersCount;
+                int totalHandlersCount = mapping?.TotalHandlersCount ?? 0;
+
+                if (totalHandlersCount == 0)
+                {
+                    return message;
+                }
 
                 handlers = ArrayPool<object>.Shared.Rent(totalHandlersCount);
                 recipients = ArrayPool<object>.Shared.Rent(totalHandlersCount);
@@ -428,7 +429,7 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // handlers for different tokens. We can reuse the same variable
                 // to count the number of matching handlers to invoke later on.
                 // This will be the array slice with valid actions in the rented buffer.
-                var mappingEnumerator = mapping.GetEnumerator();
+                var mappingEnumerator = mapping!.GetEnumerator();
 
                 // Explicit enumerator usage here as we're using a custom one
                 // that doesn't expose the single standard Current property.

From dea8b8913f27bf56c107a24057f9deaa09ab7287 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 13:17:15 +0200
Subject: [PATCH 384/595] Tweaked XML docs and comments

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs |  4 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index d1a6e1513df..a3838d2b117 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -43,9 +43,9 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="token">A token used to determine the receiving channel to use.</param>
-        /// <param name="action">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
+        /// <param name="handler">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> action)
+        void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> handler)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index e85f1ef4bc2..8ead8d4b73b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -36,7 +36,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <code>
     /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
     /// </code>
-    /// Additionally, the method group syntax can also be used to specify the action
+    /// Additionally, the method group syntax can also be used to specify the message handler
     /// to invoke when receiving a message, if a method with the right signature is available
     /// in the current scope. This is helpful to keep the registration and handling logic separate.
     /// Following up from the previous example, consider a class having this method:
@@ -137,7 +137,7 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> action)
+        public void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> handler)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -151,14 +151,14 @@ public void Register<TMessage, TToken>(object recipient, TToken token, MessageHa
                 map ??= new DictionarySlim<TToken, MessageHandler<TMessage>>();
 
                 // Add the new registration entry
-                ref MessageHandler<TMessage>? handler = ref map.GetOrAddValueRef(token);
+                ref MessageHandler<TMessage>? registeredHandler = ref map.GetOrAddValueRef(token);
 
-                if (!(handler is null))
+                if (!(registeredHandler is null))
                 {
                     ThrowInvalidOperationExceptionForDuplicateRegistration();
                 }
 
-                handler = action;
+                registeredHandler = handler;
 
                 // Update the total counter for handlers for the current type parameters
                 mapping.TotalHandlersCount++;
@@ -428,7 +428,7 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // The array is oversized at this point, since it also includes
                 // handlers for different tokens. We can reuse the same variable
                 // to count the number of matching handlers to invoke later on.
-                // This will be the array slice with valid actions in the rented buffer.
+                // This will be the array slice with valid handler in the rented buffer.
                 var mappingEnumerator = mapping!.GetEnumerator();
 
                 // Explicit enumerator usage here as we're using a custom one

From c876f6113ae881cb52f561f41cd5eaf077a4dc71 Mon Sep 17 00:00:00 2001
From: Herrick Spencer <code@herrickspencer.com>
Date: Fri, 14 Aug 2020 01:22:09 -0700
Subject: [PATCH 385/595] Massive spelling fixes

---
 .editorconfig                                 |  2 +-
 GazeInputTest/MainPage.xaml                   |  2 +-
 .../Buffers/MemoryBufferWriter{T}.cs          |  2 +-
 .../Extensions/ReadOnlySpanExtensions.cs      |  2 +-
 .../Helpers/BitHelper.cs                      |  2 +-
 .../Helpers/Internals/SpanHelper.Hash.cs      |  2 +-
 .../NullableRef{T}.cs                         |  2 +-
 .../Markdown/Blocks/CodeBlock.cs              |  2 +-
 .../Rss/BaseRssParser.cs                      |  2 +-
 .../Rss/Enums/RssType.cs                      |  2 +-
 Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs   |  2 +-
 Microsoft.Toolkit.Parsers/Rss/RssHelper.cs    |  2 +-
 .../Uwp/UwpSignatureManager.cs                |  2 +-
 .../PlatformSpecific/Uwp/UwpStorageManager.cs |  2 +-
 .../Services/LinkedIn/LinkedInService.cs      |  4 +-
 .../Services/Twitter/TwitterService.cs        |  4 +-
 .../Services/Weibo/WeiboService.cs            |  2 +-
 .../BluetoothLEHelper/GattNativeUuid.cs       |  4 +-
 .../GazeInput.h                               | 16 +++----
 .../GazePointer.cpp                           |  4 +-
 .../IGazeFilter.h                             |  2 +-
 .../PointerState.h                            |  2 +-
 .../BindableProgressBarValue.cs               |  2 +-
 .../Tiles/Elements/Element_TileBinding.cs     |  2 +-
 .../TileBindingContentPhotos.cs               |  4 +-
 .../Tiles/TileBinding.cs                      |  2 +-
 .../Tiles/TileVisual.cs                       |  2 +-
 .../Toasts/Elements/Element_ToastBinding.cs   |  2 +-
 Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs   |  2 +-
 .../Pages/SampleController.xaml.cs            |  2 +-
 .../SamplePages/BladeView/BladeCode.bind      |  2 +-
 .../CameraPreview/CameraPreviewPage.xaml.cs   |  2 +-
 .../DispatcherQueueHelperCode.bind            |  2 +-
 .../SamplePages/Loading/LoadingPage.xaml.cs   |  2 +-
 .../MasterDetailsViewCode.bind                |  2 +-
 .../MasterDetailsViewPage.xaml.cs             |  2 +-
 .../ScrollViewerExtensionsXaml.bind           |  2 +-
 .../StaggeredLayout/StaggeredLayoutPage.xaml  |  2 +-
 .../SystemInformationCode.bind                |  2 +-
 .../SystemInformationPage.xaml.cs             |  2 +-
 .../SamplePages/TabView/TabViewXaml.bind      |  2 +-
 .../Twitter Service/TwitterPage.xaml.cs       |  2 +-
 Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs |  2 +-
 Microsoft.Toolkit.Uwp.SampleApp/readme.md     |  6 +--
 .../Services/Facebook/FacebookService.cs      |  4 +-
 .../ExpressionNodes/Matrix3x2Node.cs          | 12 +++---
 .../ExpressionNodes/Matrix4x4Node.cs          | 10 ++---
 .../ExpressionNodes/Vector2Node.cs            | 10 ++---
 .../ExpressionNodes/Vector3Node.cs            | 10 ++---
 .../ExpressionNodes/Vector4Node.cs            | 12 +++---
 .../ReferenceNodes/PointLightReferenceNode.cs |  4 +-
 .../ReferenceNodes/SpotLightReferenceNode.cs  |  4 +-
 .../Extensions/AnimationExtensions.Blur.cs    |  4 +-
 .../Extensions/AnimationExtensions.cs         |  2 +-
 .../ReorderGridAnimation.cs                   |  2 +-
 .../SurfaceLoader.cs                          |  4 +-
 .../CollectionViews/CollectionView.cs         |  8 ++--
 .../EnumerableCollectionView.cs               |  2 +-
 .../CollectionViews/ListCollectionView.cs     |  2 +-
 .../DataGridGroupItemAutomationPeer.cs        |  2 +-
 .../Automation/DataGridItemAutomationPeer.cs  |  2 +-
 .../DataGrid/DataGrid.cs                      | 16 +++----
 .../DataGrid/DataGridClipboardCellContent.cs  |  4 +-
 .../DataGrid/DataGridColumn.cs                |  8 ++--
 .../DataGrid/DataGridColumns.cs               | 12 +++---
 .../DataGrid/DataGridRow.cs                   | 20 ++++-----
 .../DataGrid/DataGridRows.cs                  | 10 ++---
 .../Utilities/IndexToValueTable.cs            |  4 +-
 .../Utilities/ValidationUtil.cs               |  2 +-
 .../Carousel/Carousel.cs                      |  2 +-
 .../Carousel/CarouselPanel.cs                 | 12 +++---
 .../GridSplitter/GridSplitter.Events.cs       |  4 +-
 .../GridSplitter/GripperHoverWrapper.cs       |  2 +-
 ...initeCanvasVirtualDrawingSurface.Render.cs |  2 +-
 .../LayoutTransformControl.cs                 |  2 +-
 .../PropertyChangeEventSource.cs              |  2 +-
 .../MasterDetailsView.Properties.cs           |  2 +-
 .../Menu/Menu.Logic.cs                        |  2 +-
 .../OrbitView/OrbitView.cs                    |  2 +-
 .../OrbitView/OrbitViewDataItem.cs            |  4 +-
 .../RadialProgressBar/RadialProgressBar.cs    |  6 +--
 .../TabView/TabView.Properties.cs             |  2 +-
 .../TabView/TabViewItem.cs                    |  2 +-
 .../TextToolbar/Formats/Format.cs             |  6 +--
 .../TextToolbar/Formats/Formatter.cs          |  2 +-
 .../ToolbarItems/ToolbarSeparator.cs          |  2 +-
 .../InterspersedObservableCollection.cs       |  4 +-
 .../TokenizingTextBox.Selection.cs            |  6 +--
 .../TokenizingTextBox/TokenizingTextBox.cs    |  6 +--
 .../TokenizingTextBoxItem.AutoSuggestBox.cs   |  2 +-
 .../WrapPanel/WrapPanel.Data.cs               |  2 +-
 .../WrapPanel/WrapPanel.cs                    |  2 +-
 .../Brushes/RadialGradientBrush.cs            |  2 +-
 .../Helpers/SurfaceLoader.Instance.cs         |  2 +-
 .../Converters/DoubleToObjectConverter.cs     |  2 +-
 ...eworkElementExtensions.RelativeAncestor.cs |  2 +-
 .../Hyperlink/HyperlinkExtensions.cs          | 12 +++---
 ...llViewerExtensions.MiddleClickScrolling.cs |  4 +-
 .../ScrollViewerExtensions.Properties.cs      |  2 +-
 .../SurfaceDialTextbox/SurfaceDialTextbox.cs  | 42 +++++++++----------
 .../Extensions/TextBoxMask/TextBoxMask.cs     |  4 +-
 .../UserHandPreferenceStateTrigger.cs         |  2 +-
 .../Deferred/DeferredCancelEventArgs.cs       |  4 +-
 .../Helpers/CameraHelper/CameraHelper.cs      |  2 +-
 .../Helpers/DeepLinkParser/DeepLinkParser.cs  |  2 +-
 .../Helpers/NotifyTaskCompletion.cs           |  2 +-
 build/build.ps1                               |  6 +--
 contributing.md                               |  4 +-
 108 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index bae686022ef..50eeccedc3f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -323,5 +323,5 @@ dotnet_diagnostic.SA1634.severity = none
 dotnet_diagnostic.SA1652.severity = none
 
 dotnet_diagnostic.SA1629.severity = none # DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes.
-dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline intializers. It's also debatable if we want this or not.
+dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not.
 dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this.
\ No newline at end of file
diff --git a/GazeInputTest/MainPage.xaml b/GazeInputTest/MainPage.xaml
index 7e15659b033..58d8b46280d 100644
--- a/GazeInputTest/MainPage.xaml
+++ b/GazeInputTest/MainPage.xaml
@@ -43,7 +43,7 @@
             </ToggleButton>
             <ProgressBar Grid.Row="1" x:Name="ProgressShow" Maximum="100" />
         </Grid>
-        <TextBlock Grid.Row="2" Grid.Column="0" x:Name="DeviceAvailable"  Text="Device availablility not yet detected"/>
+        <TextBlock Grid.Row="2" Grid.Column="0" x:Name="DeviceAvailable"  Text="Device availability not yet detected"/>
         <Grid Grid.Row="2" Grid.Column="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
index ec0c0fcc5d9..2873d698c6a 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.HighPerformance.Buffers
 {
     /// <summary>
-    /// Represents an utput sink into which <typeparamref name="T"/> data can be written, backed by a <see cref="Memory{T}"/> instance.
+    /// Represents an output sink into which <typeparamref name="T"/> data can be written, backed by a <see cref="Memory{T}"/> instance.
     /// </summary>
     /// <typeparam name="T">The type of items to write to the current instance.</typeparam>
     /// <remarks>
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index cf2be137c38..9d8d6b9616a 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -99,7 +99,7 @@ public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<
             // The result is then negated, producing the value 0xFFFFFFFF
             // for valid indices, or 0 otherwise. The generated mask
             // is then combined with the original index. This leaves
-            // the index intact if it was valid, otherwise zeroes it.
+            // the index intact if it was valid, otherwise zeros it.
             // The computed offset is finally used to access the
             // lookup table, and it is guaranteed to never go out of
             // bounds unless the input span was just empty, which for a
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
index efe4d9ba4e8..234806443d0 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
@@ -54,7 +54,7 @@ public static bool HasFlag(uint value, int n)
         /// decrement the input parameter <paramref name="x"/> to ensure that the range of accepted
         /// values fits within the available 32 bits of the lookup table in use.
         /// For more info on this optimization technique, see <see href="https://egorbo.com/llvm-range-checks.html"/>.
-        /// Here is how the code from the lik above would be implemented using this method:
+        /// Here is how the code from the link above would be implemented using this method:
         /// <code>
         /// bool IsReservedCharacter(char c)
         /// {
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs
index 4cda8754176..9ad86f923e0 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs
@@ -105,7 +105,7 @@ public static unsafe int GetDjb2LikeByteHash(ref byte r0, IntPtr length)
             // and the final loop to combine the partial hash values.
             // Note that even when we use the vectorized path we don't need to do
             // any preprocessing to try to get memory aligned, as that would cause
-            // the hashcodes to potentially be different for the same data.
+            // the hash codes to potentially be different for the same data.
             if (Vector.IsHardwareAccelerated &&
                 (byte*)length >= (byte*)(Vector<byte>.Count << 3))
             {
diff --git a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs b/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
index ee4fc9c8750..df4b5ef350a 100644
--- a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
+++ b/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
@@ -59,7 +59,7 @@ public bool HasValue
             get
             {
                 // We know that the span will always have a length of either
-                // 1 or 0, se instead of using a cmp instruction and setting the
+                // 1 or 0, so instead of using a cmp instruction and setting the
                 // zero flag to produce our boolean value, we can just cast
                 // the length to byte without overflow checks (doing a cast will
                 // also account for the byte endianness of the current system),
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs b/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs
index 007162e0596..373d14c2e70 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs
+++ b/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs
@@ -27,7 +27,7 @@ public CodeBlock()
         public string Text { get; set; }
 
         /// <summary>
-        /// Gets or sets the Language specified in prefix, e.g. ```c# (Github Style Parsing).<para/>
+        /// Gets or sets the Language specified in prefix, e.g. ```c# (GitHub Style Parsing).<para/>
         /// This does not guarantee that the Code Block has a language, or no language, some valid code might not have been prefixed, and this will still return null. <para/>
         /// To ensure all Code is Highlighted (If desired), you might have to determine the language from the provided string, such as looking for key words.
         /// </summary>
diff --git a/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs b/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
index d268cf5d10c..2a80eb8c5f9 100644
--- a/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.Toolkit.Parsers.Rss
 {
     /// <summary>
-    /// Base class for Rss Parser(s).
+    /// Base class for RSS Parser(s).
     /// </summary>
     internal abstract class BaseRssParser
     {
diff --git a/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs b/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
index 99ae9570887..4cfd3ad206c 100644
--- a/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Toolkit.Parsers.Rss
 {
     /// <summary>
-    /// Type of Rss.
+    /// Type of RSS.
     /// </summary>
     internal enum RssType
     {
diff --git a/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs b/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
index e693f0994ac..5afbb3901f1 100644
--- a/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Parsers.Rss
 {
     /// <summary>
-    /// Rss reader implementation to parse Rss content.
+    /// RSS reader implementation to parse RSS content.
     /// </summary>
     internal class Rss2Parser : BaseRssParser
     {
diff --git a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs b/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
index 5b4b19d5af3..16df5e81fe2 100644
--- a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
+++ b/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Toolkit.Parsers.Rss
 {
     /// <summary>
-    /// Class with utilities for Rss related works.
+    /// Class with utilities for RSS related works.
     /// </summary>
     internal static class RssHelper
     {
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpSignatureManager.cs b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpSignatureManager.cs
index 67a6974bdbc..f257995031c 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpSignatureManager.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpSignatureManager.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Services.PlatformSpecific.Uwp
 {
     /// <summary>
-    /// Uwp specific signature generator using cryptographic library
+    /// UWP specific signature generator using cryptographic library
     /// </summary>
     internal class UwpSignatureManager : ISignatureManager
     {
diff --git a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpStorageManager.cs b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpStorageManager.cs
index ef4d814f80f..9fbfc6be3bd 100644
--- a/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpStorageManager.cs
+++ b/Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpStorageManager.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Services.PlatformSpecific.Uwp
 {
     /// <summary>
-    /// Uwp specific implementation for IStorageManager using ApplicationData and LocalSettings
+    /// UWP specific implementation for IStorageManager using ApplicationData and LocalSettings
     /// </summary>
     internal class UwpStorageManager : IStorageManager
     {
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index 251e5fb711d..282c7edd39a 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -113,7 +113,7 @@ public Task LogoutAsync()
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevant token information for Uwp.
+        /// Initialize underlying provider with relevant token information for UWP.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>
@@ -138,7 +138,7 @@ public bool Initialize(string clientId, string clientSecret, string callbackUri)
 
 #if NET462
         /// <summary>
-        /// Initialize underlying provider with relevant token information for Uwp.
+        /// Initialize underlying provider with relevant token information for UWP.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
         /// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index 703657cf2fb..4772c1fa24f 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -151,7 +151,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens, IAuthenticationBroker aut
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevant token information for Uwp.
+        /// Initialize underlying provider with relevant token information for UWP.
         /// </summary>
         /// <param name="consumerKey">Consumer key.</param>
         /// <param name="consumerSecret">Consumer secret.</param>
@@ -175,7 +175,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens)
 
 #if NET462
         /// <summary>
-        /// Initialize underlying provider with relevant token information for Uwp.
+        /// Initialize underlying provider with relevant token information for UWP.
         /// </summary>
         /// <param name="consumerKey">Consumer key.</param>
         /// <param name="consumerSecret">Consumer secret.</param>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
index f5f8dd7ec99..ea8a33e994a 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
@@ -136,7 +136,7 @@ public bool Initialize(WeiboOAuthTokens oAuthTokens, IAuthenticationBroker authe
 
 #if WINRT
         /// <summary>
-        /// Initialize underlying provider with relevant token information for Uwp.
+        /// Initialize underlying provider with relevant token information for UWP.
         /// </summary>
         /// <param name="appKey">App key.</param>
         /// <param name="appSecret">App secret.</param>
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
index 08f247aa60e..6bc6be1d8e5 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
+++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
@@ -648,12 +648,12 @@ public enum GattNativeUuid : ushort
         String = 0x2A3D,
 
         /// <summary>
-        /// The temperature in celsius
+        /// The temperature in Celsius
         /// </summary>
         TemperatureInCelsius = 0x2A1F,
 
         /// <summary>
-        /// The temperature in fahrenheit
+        /// The temperature in Fahrenheit
         /// </summary>
         TemperatureInFahrenheit = 0x2A20,
 
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
index 42ef822a8d9..2c9f630b0d4 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.h
@@ -23,27 +23,27 @@ public ref class GazeInput sealed
 public:
 
     /// <summary>
-    /// Identifyes the Interaction dependency property
+    /// Identifies the Interaction dependency property
     /// </summary>
     static property DependencyProperty^ InteractionProperty { DependencyProperty^ get(); }
 
     /// <summary>
-    /// Identifyes the IsCursorVisible dependency property
+    /// Identifies the IsCursorVisible dependency property
     /// </summary>
     static property DependencyProperty^ IsCursorVisibleProperty { DependencyProperty^ get(); }
 
     /// <summary>
-    /// Identifyes the CursorRadius dependency property
+    /// Identifies the CursorRadius dependency property
     /// </summary>
     static property DependencyProperty^ CursorRadiusProperty { DependencyProperty^ get(); }
 
     /// <summary>
-    /// Identifyes the GazeElement dependency property
+    /// Identifies the GazeElement dependency property
     /// </summary>
     static property DependencyProperty^ GazeElementProperty { DependencyProperty^ get(); }
 
     /// <summary>
-    /// Identifyes the FixationDuration dependency property
+    /// Identifies the FixationDuration dependency property
     /// </summary>
     static property DependencyProperty^ FixationDurationProperty { DependencyProperty^ get(); }
 
@@ -73,7 +73,7 @@ public ref class GazeInput sealed
     static property DependencyProperty^ MaxDwellRepeatCountProperty { DependencyProperty^ get(); }
 
     /// <summary>
-    /// Identifyes the IsSwitchEnabled dependency property
+    /// Identifies the IsSwitchEnabled dependency property
     /// </summary>
     static property DependencyProperty^ IsSwitchEnabledProperty { DependencyProperty^ get(); }
 
@@ -128,7 +128,7 @@ public ref class GazeInput sealed
     static TimeSpan GetFixationDuration(UIElement^ element);
 
     /// <summary>
-    /// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
+    /// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typically achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
     /// </summary>
     static TimeSpan GetDwellDuration(UIElement^ element);
 
@@ -183,7 +183,7 @@ public ref class GazeInput sealed
     static void SetFixationDuration(UIElement^ element, TimeSpan span);
 
     /// <summary>
-    /// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
+    /// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typically achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
     /// </summary>
     static void SetDwellDuration(UIElement^ element, TimeSpan span);
 
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
index 9f4840bf23c..9ae9c31754e 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cpp
@@ -467,8 +467,8 @@ void GazePointer::ActivateGazeTargetItem(GazeTargetItem^ target)
 
 GazeTargetItem^ GazePointer::ResolveHitTarget(Point gazePoint, TimeSpan timestamp)
 {
-    // TODO: The existance of a GazeTargetItem should be used to indicate that
-    // the target item is invokable. The method of invokation should be stored
+    // TODO: The existence of a GazeTargetItem should be used to indicate that
+    // the target item is invokable. The method of invocation should be stored
     // within the GazeTargetItem when it is created and not recalculated when
     // subsequently needed.
 
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
index c22d7cefe07..489bbc96558 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.h
@@ -38,7 +38,7 @@ private ref struct GazeFilterArgs sealed
     TimeSpan _timestamp;
 };
 
-// Every filter must provide an Wpdate method which transforms sample data 
+// Every filter must provide an Update method which transforms sample data 
 // and returns filtered output
 private interface class IGazeFilter
 {
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
index 2de72ba5eb1..37ad3bbe183 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.h
@@ -35,7 +35,7 @@ public enum class PointerState
     Fixation = 3,
 
     /// <summary>
-    /// User is conciously dwelling on the control with an intent to invoke, e.g. click a button
+    /// User is consciously dwelling on the control with an intent to invoke, e.g. click a button
     /// </summary>
     Dwell = 4,
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BindableValues/BindableProgressBarValue.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BindableValues/BindableProgressBarValue.cs
index 94d43c03572..81510aed5d2 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BindableValues/BindableProgressBarValue.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BindableValues/BindableProgressBarValue.cs
@@ -80,7 +80,7 @@ public static implicit operator AdaptiveProgressBarValue(BindableProgressBarValu
         }
 
         /// <summary>
-        /// Creates an <see cref="BindableProgressBarValue"/> that has tbe raw double value.
+        /// Creates an <see cref="BindableProgressBarValue"/> that has the raw double value.
         /// </summary>
         /// <param name="d">The raw value</param>
         public static implicit operator BindableProgressBarValue(double d)
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/Elements/Element_TileBinding.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/Elements/Element_TileBinding.cs
index d403cb801b5..8dfe545f273 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/Elements/Element_TileBinding.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/Elements/Element_TileBinding.cs
@@ -61,7 +61,7 @@ public Element_TileBinding(TileTemplateNameV3 template)
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
+        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
         /// </summary>
         [NotificationXmlAttribute("lang")]
         public string Language { get; set; }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/SpecialTemplates/TileBindingContentPhotos.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/SpecialTemplates/TileBindingContentPhotos.cs
index 546bb55077e..e01704c58c3 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/SpecialTemplates/TileBindingContentPhotos.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/SpecialTemplates/TileBindingContentPhotos.cs
@@ -7,12 +7,12 @@
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
-    /// Animates through a slideshow of photos. Supported on all sizes.
+    /// Animates through a slide show of photos. Supported on all sizes.
     /// </summary>
     public sealed class TileBindingContentPhotos : ITileBindingContent
     {
         /// <summary>
-        /// Gets the collection of slideshow images. Up to 12 images can be provided (Mobile will only display up to 9), which will be used for the slideshow. Adding more than 12 will throw an exception.
+        /// Gets the collection of slide show images. Up to 12 images can be provided (Mobile will only display up to 9), which will be used for the slide show. Adding more than 12 will throw an exception.
         /// </summary>
         public IList<TileBasicImage> Images { get; private set; } = new LimitedList<TileBasicImage>(12);
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileBinding.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileBinding.cs
index a21f496f3cc..987af6245cd 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileBinding.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileBinding.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     public sealed class TileBinding
     {
         /// <summary>
-        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
+        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
         /// </summary>
         public string Language { get; set; }
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileVisual.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileVisual.cs
index 5ad10c29d1b..5f82f87746b 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileVisual.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileVisual.cs
@@ -111,7 +111,7 @@ private static bool TryReuseTextElementForLockDetailedText(int lineNumber, strin
                 throw new ArgumentNullException("binding cannot be null");
             }
 
-            // If a text element already has an id with the line number (only look at immediate children, since the lockscreen will ignore things under groups/subgroups)
+            // If a text element already has an id with the line number (only look at immediate children, since the lock screen will ignore things under groups/subgroups)
             Element_AdaptiveText matchingIdTextElement = binding.Children.OfType<Element_AdaptiveText>().FirstOrDefault(i => i.Id != null && i.Id.Equals(lineNumber.ToString()));
 
             if (matchingIdTextElement != null)
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_ToastBinding.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_ToastBinding.cs
index 6a2bc44d057..b4dd8d784b9 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_ToastBinding.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_ToastBinding.cs
@@ -37,7 +37,7 @@ public Element_ToastBinding(ToastTemplateType template)
         public Uri BaseUri { get; set; }
 
         /// <summary>
-        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
+        /// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
         /// </summary>
         [NotificationXmlAttribute("lang")]
         public string Language { get; set; }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
index c858a9c40aa..85d00408e02 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
@@ -104,7 +104,7 @@ private async System.Threading.Tasks.Task RunAppInitialization(string launchPara
         {
             ThemeInjector.InjectThemeResources(Application.Current.Resources);
 
-            // Go fullscreen on Xbox
+            // Go full screen on Xbox
             if (AnalyticsInfo.VersionInfo.GetDeviceFormFactor() == DeviceFormFactor.Xbox)
             {
                 Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().SetDesiredBoundsMode(ApplicationViewBoundsMode.UseCoreWindow);
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
index f5cb6329feb..289912e9b7d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
@@ -292,7 +292,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
                     }
                 }
 
-                // Hide the Github button if there isn't a CodeUrl.
+                // Hide the GitHub button if there isn't a CodeUrl.
                 if (string.IsNullOrEmpty(CurrentSample.CodeUrl))
                 {
                     GithubButton.Visibility = Visibility.Collapsed;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladeCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladeCode.bind
index 54f3ed2ae77..d88f0c83100 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladeCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeView/BladeCode.bind
@@ -74,7 +74,7 @@
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
                    Style="{StaticResource SubtitleTextBlockStyle}"
-                   Text="This is a blade with custom titlebar colors." />
+                   Text="This is a blade with custom title bar colors." />
       </controls:BladeItem>
 
       <controls:BladeItem x:Name="FourthBlade"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
index e4c011e89ab..00d2685e00b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewPage.xaml.cs
@@ -38,7 +38,7 @@ public CameraPreviewPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            // Using a semaphore lock for synchronicity.
+            // Using a semaphore lock for synchronization.
             // This method gets called multiple times when accessing the page from Latest Pages
             // and creates unused duplicate references to Camera and memory leaks.
             await semaphoreSlim.WaitAsync();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperCode.bind
index bda6b73042b..9d15b063286 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperCode.bind
@@ -4,7 +4,7 @@ var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 // The use it from any other thread
 int crossThreadReturnedValue = await Task.Run<int>( async () =>
 	{
-		// Task.Run() will guarantee the given piece of code be executed on a seperate thread pool. 
+		// Task.Run() will guarantee the given piece of code be executed on a separate thread pool. 
 		// This is used to simulate the scenario of updating the UI element from a different thread.
 		int returnedFromUIThread = await dispatcherQueue.ExecuteOnUIThreadAsync<int>(() =>
 			{
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index e4bcc10d58e..9d17d078c8d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -57,7 +57,7 @@ private void Load()
                 }
             });
 
-            SampleController.Current.RegisterNewCommand("Loading control with logo and bluring when requested", async (sender, args) =>
+            SampleController.Current.RegisterNewCommand("Loading control with logo and blurring when requested", async (sender, args) =>
             {
                 if (loadingContentControl != null)
                 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
index 99497a756fd..f28e7c75ecc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
@@ -13,6 +13,6 @@ var Emails = new List<Email>
 {
     new Email { From = "Steve Johnson", Subject = "Lunch Tomorrow", Body = "Are you available for lunch tomorrow? A client would like to discuss a project with you." },
     new Email { From = "Becky Davidson", Subject = "Kids game", Body = "Don't forget the kids have their soccer game this Friday. We have to supply end of game snacks." },
-    new Email { From = "OneDrive", Subject = "Check out your event recap", Body = "Your new album.\r\nYou uploaded some photos to yuor OneDrive and automatically created an album for you." },
+    new Email { From = "OneDrive", Subject = "Check out your event recap", Body = "Your new album.\r\nYou uploaded some photos to your OneDrive and automatically created an album for you." },
     new Email { From = "Twitter", Subject = "Follow randomPerson, APersonYouMightKnow", Body = "Here are some people we think you might like to follow:\r\n.@randomPerson\r\nAPersonYouMightKnow" },
 };
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
index bf7758af228..378c3093cf5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
@@ -37,7 +37,7 @@ public MasterDetailsViewPage()
                 {
                     From = "OneDrive",
                     Subject = "Check out your event recap",
-                    Body = "Your new album.\r\nYou uploaded some photos to yuor OneDrive and automatically created an album for you.",
+                    Body = "Your new album.\r\nYou uploaded some photos to your OneDrive and automatically created an album for you.",
                     Thumbnail = new Uri("ms-appx:///SamplePages/MasterDetailsView/OneDriveLogo.png")
                 },
                 new Email
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind
index 59737c4f9a2..555377bdebe 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind
@@ -71,7 +71,7 @@
     <!--This is the panel that will be animated in sync with the main ScrollViewer control inside
         the ListView in the page, using the ScrollViewerExtensions leveraging composition ExpressionAnimations.
         We use x:Name here to be able to reference the panel from code behind and start the animation.
-        To inspect the C# code beind used, switch to the "Code" tab in this sample page.-->
+        To inspect the C# code being used, switch to the "Code" tab in this sample page.-->
     <StackPanel x:Name="shapesPanel"
                 HorizontalAlignment="Center"
                 Margin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
index 1b245955036..ce234cac4c0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
@@ -13,7 +13,7 @@
         <controls:StaggeredLayout x:Key="WrapLayoutPlaceholder"/>
     </Page.Resources>
 
-    <!-- Needed fpr 1803 and below -->
+    <!-- Needed for 1803 and below -->
     <winui:ItemsRepeaterScrollHost>
         <ScrollViewer>
             <winui:ItemsRepeater/>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationCode.bind
index 7fc9a563dcb..7d605ff0df7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationCode.bind
@@ -49,7 +49,7 @@
         // To get the time the launch count was reset, not including this instance
         public string LastResetTime => SystemInformation.Instance.LastResetTime.ToString(Culture.DateTimeFormat);
 
-        // To get the number of times the app has been launched sicne the last reset.
+        // To get the number of times the app has been launched since the last reset.
         public long LaunchCount => SystemInformation.Instance.LaunchCount;
 
         // To get the number of times the app has been launched.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml.cs
index f6c68407e71..2c1c4d84344 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml.cs
@@ -73,7 +73,7 @@ public string LastResetTime
         public static readonly DependencyProperty LastResetTimeProperty =
             DependencyProperty.Register(nameof(LastResetTime), typeof(string), typeof(SystemInformationPage), new PropertyMetadata(string.Empty));
 
-        // To get the number of times the app has been launched sicne the last reset.
+        // To get the number of times the app has been launched since the last reset.
         public long LaunchCount
         {
             get { return (long)GetValue(LaunchCountProperty); }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
index e81732aa2a3..8790aa966ac 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
@@ -47,7 +47,7 @@
         <TextBlock Padding="16">The TabView control has multiple uses.</TextBlock>
       </controls:TabViewItem>
       <controls:TabViewItem Header="Tab 2 Has Longer Text" Icon="Audio">
-        <TextBlock Padding="16">It has a lot of versitility out of the box for different scenarios.</TextBlock>
+        <TextBlock Padding="16">It has a lot of versatility out of the box for different scenarios.</TextBlock>
       </controls:TabViewItem>
       <controls:TabViewItem Header="Tab 3" Icon="Video">
         <TextBlock Padding="16">You can enable drag-and-drop and reorder the tabs too.</TextBlock>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Twitter Service/TwitterPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Twitter Service/TwitterPage.xaml.cs
index 1259e763f67..ff22659ecf7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Twitter Service/TwitterPage.xaml.cs	
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Twitter Service/TwitterPage.xaml.cs	
@@ -112,7 +112,7 @@ private async void GetLocation_OnClick(object sender, RoutedEventArgs e)
             }
             catch (Exception ex)
             {
-                await new MessageDialog($"An error occured finding your location. Message: {ex.Message}").ShowAsync();
+                await new MessageDialog($"An error occurred finding your location. Message: {ex.Message}").ShowAsync();
                 TrackingManager.TrackException(ex);
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs
index 8c78d6d18ed..d2f9ca0754b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs
@@ -66,7 +66,7 @@ public void SetAppTitle(string title)
         }
 
         /// <summary>
-        /// Attach a ScrollViewer to Parallax hosting the backround image
+        /// Attach a ScrollViewer to Parallax hosting the background image
         /// </summary>
         /// <param name="viewer">The ScrollViewer</param>
         public void AttachScroll(ScrollViewer viewer)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/readme.md b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
index 41f9e8bad8a..a314fad44a3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/readme.md
+++ b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
@@ -6,7 +6,7 @@ This document describes how to add a new sample page for a new control you want
 
 
 ## 1. Add Sample page and .bind template
-First you need to create a Xaml page in the folder /SamplePages/YourControl.  This will be the logical page used to by the app to navigate to the sample and contain code.
+First you need to create a Xaml page in the folder /SamplePages/YourControl.  This will be the logical page used to by the app to navigate to the sample and contains code.
 
 If providing 'live' XAML, a .bind file is loaded and dynamically fed to the XamlReader.Load method to convert into actual controls.  This changes a few things about how samples need to be written (detailed below), but allows developers to actually change the sample and see the results live.
 
@@ -163,7 +163,7 @@ Select the category where you want your page to be listed and add the following
 
 Some features used by samples aren't available on all the OS versions that the Sample App runs on.  In order to make sure a sample is valid for the host OS, add the `ApiCheck` key/value in your JSON definition.
 
-The value is a string which is the fully-qualified typename to check for the presence of.  You can also accompany this with the `BadgeUpdateVersionRequred` which uses the string provided to show a short message on the sample information so uplevel implementors know the minimum version required.
+The value is a string which is the fully-qualified typename to check for the presence of.  You can also accompany this with the `BadgeUpdateVersionRequred` which uses the string provided to show a short message on the sample information so up level implementors know the minimum version required.
 
 ```json
     {
@@ -188,7 +188,7 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 > NOTE: When building and running the app in release mode, the branch will automatically be changed to **master** before loading. 
 
-> NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on github, the sample app will use the packaged version
+> NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on gitHub, the sample app will use the packaged version
 
 > NOTE: To test your documentation in the sample app while running in debug mode, the docs repository will need to be cloned in the same folder as this repository and named **WindowsCommunityToolkitDocs**. For example, this folder structure works best:
 > ```
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
index fb3bedd36aa..8e767aad7c7 100644
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
+++ b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
@@ -50,7 +50,7 @@ public FacebookService()
         /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="oAuthTokens">Token instance.</param>
-        /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
+        /// <param name="requiredPermissions">List of required permissions. public_profile and user_posts permissions will be used by default.</param>
         /// <returns>Success or failure.</returns>
         public bool Initialize(FacebookOAuthTokens oAuthTokens, FacebookPermissions requiredPermissions = FacebookPermissions.PublicProfile | FacebookPermissions.UserPosts)
         {
@@ -66,7 +66,7 @@ public bool Initialize(FacebookOAuthTokens oAuthTokens, FacebookPermissions requ
         /// Initialize underlying provider with relevant token information.
         /// </summary>
         /// <param name="appId">Application ID (Provided by Facebook developer site)</param>
-        /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
+        /// <param name="requiredPermissions">List of required permissions. public_profile and user_posts permissions will be used by default.</param>
         /// <param name="windowsStoreId">Windows Store SID</param>
         /// <returns>Success or failure.</returns>
         public bool Initialize(string appId, FacebookPermissions requiredPermissions = FacebookPermissions.PublicProfile | FacebookPermissions.UserPosts, string windowsStoreId = null)
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
index ead4440f700..5c8ca867818 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
@@ -235,7 +235,7 @@ public ScalarNode Channel32
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s">The subchanel.</param>
+        /// <param name="s">The subchannel.</param>
         /// <returns>ScalarNode</returns>
         public ScalarNode GetSubchannels(Subchannel s)
         {
@@ -245,7 +245,7 @@ public ScalarNode GetSubchannels(Subchannel s)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <returns>Vector2Node</returns>
         public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
@@ -256,7 +256,7 @@ public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <returns>Vector3Node</returns>
@@ -268,7 +268,7 @@ public Vector3Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -281,7 +281,7 @@ public Vector4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3, S
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -296,7 +296,7 @@ public Matrix3x2Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
index 81f2b59bd04..7b00d426046 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
@@ -316,7 +316,7 @@ public ScalarNode GetSubchannels(Subchannel s)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <returns>Vector2Node</returns>
         public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
@@ -327,7 +327,7 @@ public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <returns>Vector3Node</returns>
@@ -339,7 +339,7 @@ public Vector3Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3)
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -352,7 +352,7 @@ public Vector4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3, S
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -367,7 +367,7 @@ public Matrix3x2Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <summary>
         /// Create a new type by re-arranging the Matrix subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
index 44c997f05d6..9b17ea11c77 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
@@ -210,7 +210,7 @@ public ScalarNode GetSubchannels(Subchannel s)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <returns>Vector2Node.</returns>
         public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
@@ -221,7 +221,7 @@ public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <returns>Vector3Node</returns>
@@ -233,7 +233,7 @@ public Vector3Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -246,7 +246,7 @@ public Vector4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3, S
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -261,7 +261,7 @@ public Matrix3x2Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
index b2824c03efb..f527d4fda54 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
@@ -233,7 +233,7 @@ public ScalarNode GetSubchannels(Subchannel s)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <returns>Vector2Node</returns>
         public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
@@ -244,7 +244,7 @@ public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <returns>Vector3Node</returns>
@@ -256,7 +256,7 @@ public Vector3Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -269,7 +269,7 @@ public Vector4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3, S
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -284,7 +284,7 @@ public Matrix3x2Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
index b14e00f042f..3aeaf76d43b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
@@ -246,7 +246,7 @@ public Vector3Node XYZ
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s">The subchanel.</param>
+        /// <param name="s">The subchannel.</param>
         /// <returns>ScalarNode</returns>
         public ScalarNode GetSubchannels(Subchannel s)
         {
@@ -256,7 +256,7 @@ public ScalarNode GetSubchannels(Subchannel s)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <returns>Vector2Node</returns>
         public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
@@ -267,7 +267,7 @@ public Vector2Node GetSubchannels(Subchannel s1, Subchannel s2)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <returns>Vector3Node</returns>
@@ -279,7 +279,7 @@ public Vector3Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3)
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -292,7 +292,7 @@ public Vector4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3, S
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
@@ -307,7 +307,7 @@ public Matrix3x2Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <summary>
         /// Create a new type by re-arranging the Vector subchannels.
         /// </summary>
-        /// <param name="s1">The first subchanel.</param>
+        /// <param name="s1">The first subchannel.</param>
         /// <param name="s2">The second subchannel.</param>
         /// <param name="s3">The third subchannel.</param>
         /// <param name="s4">The fourth subchannel.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs
index d16c7b5423e..f80cfc364cb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs
@@ -53,9 +53,9 @@ public ScalarNode LinearAttenuation
         }
 
         /// <summary>
-        /// Gets the quadratic attentuation.
+        /// Gets the quadratic attenuation.
         /// </summary>
-        /// <value>The quadratic attentuation.</value>
+        /// <value>The quadratic attenuation.</value>
         public ScalarNode QuadraticAttentuation
         {
             get { return ReferenceProperty<ScalarNode>("QuadraticAttentuation"); }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
index 1423a1e67d2..20f627a94f5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
@@ -53,9 +53,9 @@ public ScalarNode LinearAttenuation
         }
 
         /// <summary>
-        /// Gets the quadratic attentuation.
+        /// Gets the quadratic attenuation.
         /// </summary>
-        /// <value>The quadratic attentuation.</value>
+        /// <value>The quadratic attenuation.</value>
         public ScalarNode QuadraticAttentuation
         {
             get { return ReferenceProperty<ScalarNode>("QuadraticAttentuation"); }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
index c368465de86..c18d3e78958 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
@@ -34,7 +34,7 @@ public static partial class AnimationExtensions
             ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
 
         /// <summary>
-        /// Animates the gaussian blur of the UIElement.
+        /// Animates the Gaussian blur of the UIElement.
         /// </summary>
         /// <param name="associatedObject">The associated object.</param>
         /// <param name="value">The blur amount.</param>
@@ -64,7 +64,7 @@ public static AnimationSet Blur(
         }
 
         /// <summary>
-        /// Animates the gaussian blur of the UIElement.
+        /// Animates the Gaussian blur of the UIElement.
         /// </summary>
         /// <param name="animationSet">The animation set.</param>
         /// <param name="value">The blur amount.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
index 4ecb6db00a5..7692b9a3d0e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.cs
@@ -125,7 +125,7 @@ private static void EnsureEasingsCached()
             // and we don't want to deal with caching a disposed easing function
             void Add(EasingType type, EasingMode mode, Vector2 p1, Vector2 p2)
             {
-                // In order to generate a usable hashcode for our ValueTuple without collisions
+                // In order to generate a usable hash code for our ValueTuple without collisions
                 // we can't use enum values for both type & mode, so we have to string one of them.
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
                 _compositionEasingFunctions[(type.ToString(), mode)] = (p1, p2);
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
index 6873c8bb0c5..b8e86ad1596 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
@@ -49,7 +49,7 @@ public static double GetDuration(DependencyObject obj)
         /// Sets a value for the duration, in milliseconds, the animation should take.
         /// </summary>
         /// <param name="obj">the object to set the value on.</param>
-        /// <param name="value">The duration in milliseonds.</param>
+        /// <param name="value">The duration in milliseconds.</param>
         public static void SetDuration(DependencyObject obj, double value)
         {
             obj.SetValue(DurationProperty, value);
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/SurfaceLoader.cs b/Microsoft.Toolkit.Uwp.UI.Animations/SurfaceLoader.cs
index 8de05e2055f..8610c13fb83 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/SurfaceLoader.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/SurfaceLoader.cs
@@ -31,7 +31,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     public class SurfaceLoader
     {
         /// <summary>
-        /// A flag to store the intialized state.
+        /// A flag to store the initialized state.
         /// </summary>
         private static bool _intialized;
 
@@ -46,7 +46,7 @@ public class SurfaceLoader
         private static CanvasDevice _canvasDevice;
 
         /// <summary>
-        /// The composition graphic device to determinde which GPU is handling the request.
+        /// The composition graphic device to determine which GPU is handling the request.
         /// </summary>
         private static CompositionGraphicsDevice _compositionDevice;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
index 87fa414b086..87fe287020b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
@@ -237,7 +237,7 @@ public virtual CultureInfo Culture
         /// Enter a Defer Cycle.
         /// Defer cycles are used to coalesce changes to the ICollectionView.
         /// </summary>
-        /// <returns>An IDisposable deferal object.</returns>
+        /// <returns>An IDisposable deferral object.</returns>
         public virtual IDisposable DeferRefresh()
         {
 #if FEATURE_IEDITABLECOLLECTIONVIEW
@@ -611,7 +611,7 @@ public abstract int Count
         }
 
         /// <summary>
-        /// Gets a value indicating whether the resulting (filtered) view is emtpy.
+        /// Gets a value indicating whether the resulting (filtered) view is empty.
         /// </summary>
         public abstract bool IsEmpty
         {
@@ -772,7 +772,7 @@ protected bool OKToChangeCurrent()
         }
 
         /// <summary>
-        /// Raise a CurrentChanging event that is not cancelable.
+        /// Raise a CurrentChanging event that is not cancel-able.
         /// Internally, CurrentPosition is set to -1.
         /// This is called by CollectionChanges (Remove and Refresh) that affect the CurrentItem.
         /// </summary>
@@ -1258,7 +1258,7 @@ private enum CollectionViewFlags
         internal const string IsCurrentBeforeFirstPropertyName = "IsCurrentBeforeFirst";
         internal const string IsCurrentAfterLastPropertyName = "IsCurrentAfterLast";
 
-        // since there's nothing in the uncancelable event args that is mutable,
+        // since there's nothing in the uncancel-able event args that is mutable,
         // just create one instance to be used universally.
         private static readonly CurrentChangingEventArgs UncancelableCurrentChangingEventArgs = new CurrentChangingEventArgs(false);
         private static readonly string IEnumerableT = typeof(IEnumerable<>).Name;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/EnumerableCollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/EnumerableCollectionView.cs
index a7ea3a6eaa3..8a1d9d0e1db 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/EnumerableCollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/EnumerableCollectionView.cs
@@ -207,7 +207,7 @@ public override ReadOnlyObservableCollection<object> Groups
         /// Enter a Defer Cycle.
         /// Defer cycles are used to coalesce changes to the ICollectionView.
         /// </summary>
-        /// <returns>An IDisposable deferal object.</returns>
+        /// <returns>An IDisposable deferral object.</returns>
         public override IDisposable DeferRefresh()
         {
             return _view.DeferRefresh();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs
index 9f1370b8576..1c264306da8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs
@@ -441,7 +441,7 @@ public override int Count
         }
 
         /// <summary>
-        /// Gets a value indicating whether the resulting (filtered) view is emtpy.
+        /// Gets a value indicating whether the resulting (filtered) view is empty.
         /// </summary>
         public override bool IsEmpty
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
index 5652d70296d..7113caf7c43 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
@@ -377,7 +377,7 @@ protected override bool IsOffscreenCore()
         /// <summary>
         /// Gets a value indicating whether the UIElement associated with this DataGridGroupItemAutomationPeer contains protected content.
         /// </summary>
-        /// <returns>Trye if the UIElement contains protected content.</returns>
+        /// <returns>True if the UIElement contains protected content.</returns>
         protected override bool IsPasswordCore()
         {
             return this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.IsPassword() : false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
index e7f5764c62d..325420318bf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -343,7 +343,7 @@ protected override bool IsOffscreenCore()
         /// <summary>
         /// Gets a value indicating whether the UIElement associated with this DataGridItemAutomationPeer contains protected content.
         /// </summary>
-        /// <returns>Trye if the UIElement contains protected content.</returns>
+        /// <returns>True if the UIElement contains protected content.</returns>
         protected override bool IsPasswordCore()
         {
             return this.OwningRowPeer != null ? this.OwningRowPeer.IsPassword() : false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
index 0f88d1b7a05..703734b2d04 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -361,12 +361,12 @@ private enum ScrollBarsSeparatorVisualState
         public event EventHandler<DataGridRowDetailsEventArgs> RowDetailsVisibilityChanged;
 
         /// <summary>
-        /// Occurs when the row has been successfully committed or cancelled.
+        /// Occurs when the row has been successfully committed or canceled.
         /// </summary>
         public event EventHandler<DataGridRowEditEndedEventArgs> RowEditEnded;
 
         /// <summary>
-        /// Occurs immediately before the row has been successfully committed or cancelled.
+        /// Occurs immediately before the row has been successfully committed or canceled.
         /// </summary>
         public event EventHandler<DataGridRowEditEndingEventArgs> RowEditEnding;
 
@@ -3308,7 +3308,7 @@ protected override Size MeasureOverride(Size availableSize)
                 // Update our estimates now that the DataGrid has all of the information necessary
                 UpdateRowDetailsHeightEstimate();
 
-                // Update frozen columns to account for columns added prior to loading or autogenerated columns
+                // Update frozen columns to account for columns added prior to loading or auto-generated columns
                 if (this.FrozenColumnCountWithFiller > 0)
                 {
                     ProcessFrozenColumnCount(this);
@@ -3388,7 +3388,7 @@ protected override void OnApplyTemplate()
 
                 _columnHeadersPresenter.OwningGrid = this;
 
-                // Columns were added before before our Template was applied, add the ColumnHeaders now
+                // Columns were added before our Template was applied, add the ColumnHeaders now
                 List<DataGridColumn> sortedInternal = new List<DataGridColumn>(this.ColumnsItemsInternal);
                 sortedInternal.Sort(new DisplayIndexComparer());
                 foreach (DataGridColumn column in sortedInternal)
@@ -5932,7 +5932,7 @@ private bool EndCellEdit(DataGridEditAction editAction, bool exitEditingMode, bo
                 OnCellEditEnding(e);
                 if (e.Cancel)
                 {
-                    // CellEditEnding has been cancelled
+                    // CellEditEnding has been canceled
                     return false;
                 }
 
@@ -6062,7 +6062,7 @@ private bool EndRowEdit(DataGridEditAction editAction, bool exitEditingMode, boo
                 OnRowEditEnding(e);
                 if (e.Cancel)
                 {
-                    // RowEditEnding has been cancelled
+                    // RowEditEnding has been canceled
                     return false;
                 }
 
@@ -6115,7 +6115,7 @@ private bool EndRowEdit(DataGridEditAction editAction, bool exitEditingMode, boo
             {
                 // Some EditableCollectionViews (ListCollectionView in particular) do not raise CurrentChanged when CommitEdit
                 // changes the position of the CurrentItem.  Instead, they raise a PropertyChanged event for PositionChanged.
-                // We recognize that case here and setup the CurrentItem again if one exists but it was removed and readded
+                // We recognize that case here and setup the CurrentItem again if one exists but it was removed and re-added
                 // during Commit.  This is better than reacting to PositionChanged which would double the work in most cases
                 // and likely introduce regressions.
                 UpdateStateOnCurrentChanged(this.DataConnection.CollectionView.CurrentItem, this.DataConnection.CollectionView.CurrentPosition);
@@ -8663,7 +8663,7 @@ private bool UpdateStateOnTapped(TappedRoutedEventArgs args, int columnIndex, in
                     // Selecting a single row or multi-selecting with Ctrl.
                     if (this.SelectionMode == DataGridSelectionMode.Single || !ctrl)
                     {
-                        // Unselect the currectly selected rows except the new selected row.
+                        // Unselect the correctly selected rows except the new selected row.
                         action = DataGridSelectionAction.SelectCurrent;
                     }
                     else
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridClipboardCellContent.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridClipboardCellContent.cs
index 72177c12847..b635e8f0f9d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridClipboardCellContent.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridClipboardCellContent.cs
@@ -63,7 +63,7 @@ public object Item
         /// Field-by-field comparison to avoid reflection-based ValueType.Equals.
         /// </summary>
         /// <param name="obj">DataGridClipboardCellContent to compare.</param>
-        /// <returns>True iff this and data are equal</returns>
+        /// <returns>True if this and data are equal</returns>
         public override bool Equals(object obj)
         {
             if (!(obj is DataGridClipboardCellContent))
@@ -100,7 +100,7 @@ public override int GetHashCode()
         /// </summary>
         /// <param name="clipboardCellContent1">The first DataGridClipboardCellContent.</param>
         /// <param name="clipboardCellContent2">The second DataGridClipboardCellContent.</param>
-        /// <returns>True iff clipboardCellContent1 and clipboardCellContent2 are NOT equal.</returns>
+        /// <returns>True if clipboardCellContent1 and clipboardCellContent2 are NOT equal.</returns>
         public static bool operator !=(DataGridClipboardCellContent clipboardCellContent1, DataGridClipboardCellContent clipboardCellContent2)
         {
             if (clipboardCellContent1._column == clipboardCellContent2._column && clipboardCellContent1._content == clipboardCellContent2._content)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumn.cs
index fee5a1b7b13..c0c52580f78 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumn.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumn.cs
@@ -851,7 +851,7 @@ public FrameworkElement GetCellContent(DataGridRow dataGridRow)
 
             if (dataGridRow.OwningGrid == this.OwningGrid)
             {
-                Debug.Assert(this.Index >= 0, "Expected positif Index.");
+                Debug.Assert(this.Index >= 0, "Expected positive Index.");
                 Debug.Assert(this.Index < this.OwningGrid.ColumnsItemsInternal.Count, "Expected smaller Index.");
 
                 DataGridCell dataGridCell = dataGridRow.Cells[this.Index];
@@ -881,7 +881,7 @@ public FrameworkElement GetCellContent(object dataItem)
                 throw DataGridError.DataGrid.NoOwningGrid(this.GetType());
             }
 
-            Debug.Assert(this.Index >= 0, "Expected positif Index.");
+            Debug.Assert(this.Index >= 0, "Expected positive Index.");
             Debug.Assert(this.Index < this.OwningGrid.ColumnsItemsInternal.Count, "Expected smaller Index.");
 
             DataGridRow dataGridRow = this.OwningGrid.GetRowFromItem(dataItem);
@@ -1051,7 +1051,7 @@ internal DataGridLength CoerceWidth(DataGridLength width)
         }
 
         /// <summary>
-        /// If the DataGrid is using using layout rounding, the pixel snapping will force all widths to
+        /// If the DataGrid is using layout rounding, the pixel snapping will force all widths to
         /// whole numbers. Since the column widths aren't visual elements, they don't go through the normal
         /// rounding process, so we need to do it ourselves.  If we don't, then we'll end up with some
         /// pixel gaps and/or overlaps between columns.
@@ -1188,7 +1188,7 @@ internal FrameworkElement GenerateElementInternal(DataGridCell cell, object data
         }
 
         /// <summary>
-        /// Gets the value of a cell according to the the specified binding.
+        /// Gets the value of a cell according to the specified binding.
         /// </summary>
         /// <param name="item">The item associated with a cell.</param>
         /// <param name="binding">The binding to get the value of.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs
index 97b55a71caf..bb43011e97b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs
@@ -474,7 +474,7 @@ internal void OnColumnMinWidthChanged(DataGridColumn column, double oldValue)
                 }
                 else if (column.Width.DisplayValue == oldValue && column.Width.DesiredValue < column.Width.DisplayValue)
                 {
-                    // If the column was previously limited by its minimum value but but can be smaller now,
+                    // If the column was previously limited by its minimum value but can be smaller now,
                     // attempt to resize the column to its desired width.
                     column.Resize(column.Width.Value, column.Width.UnitType, column.Width.DesiredValue, column.Width.DesiredValue, false);
                 }
@@ -823,7 +823,7 @@ internal DataGridCellCoordinates OnRemovingColumn(DataGridColumn dataGridColumn)
         }
 
         /// <summary>
-        /// Called when a column property changes, and its cells need to adjust that that column change.
+        /// Called when a column property changes, and its cells need to adjust that column change.
         /// </summary>
         internal void RefreshColumnElements(DataGridColumn dataGridColumn, string propertyName)
         {
@@ -966,7 +966,7 @@ private bool AddGeneratedColumn(DataGridAutoGeneratingColumnEventArgs e)
             {
                 if (e.Column != null)
                 {
-                    // Set the IsAutoGenerated flag here in case the user provides a custom autogenerated column
+                    // Set the IsAutoGenerated flag here in case the user provides a custom auto-generated column
                     e.Column.IsAutoGenerated = true;
                 }
 
@@ -1121,7 +1121,7 @@ private void AutoGenerateColumnsPrivate()
             _autoGeneratingColumnOperationCount++;
             try
             {
-                // Always remove existing autogenerated columns before generating new ones
+                // Always remove existing auto-generated columns before generating new ones
                 RemoveAutoGeneratedColumns();
                 GenerateColumnsFromProperties();
                 EnsureRowsPresenterVisibility();
@@ -1558,7 +1558,7 @@ private void FlushDisplayIndexChanged(bool raiseEvent)
 
         private void GenerateColumnsFromProperties()
         {
-            // Autogenerated Columns are added at the end so the user columns appear first
+            // Auto-generated Columns are added at the end so the user columns appear first
             if (this.DataConnection.DataProperties != null && this.DataConnection.DataProperties.Length > 0)
             {
                 List<KeyValuePair<int, DataGridAutoGeneratingColumnEventArgs>> columnOrderPairs = new List<KeyValuePair<int, DataGridAutoGeneratingColumnEventArgs>>();
@@ -1738,7 +1738,7 @@ private void RemoveAutoGeneratedColumns()
                         index++;
                     }
 
-                    // Remove the autogenerated columns
+                    // Remove the auto-generated columns
                     while (index < this.ColumnsInternal.Count && this.ColumnsInternal[index].IsAutoGenerated)
                     {
                         this.ColumnsInternal.RemoveAt(index);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRow.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRow.cs
index 7f5d9e825e6..dab3530737e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRow.cs
@@ -394,7 +394,7 @@ internal double ActualBottomGridLineHeight
             {
                 if (_bottomGridLine != null && this.OwningGrid != null && this.OwningGrid.AreRowBottomGridLinesRequired)
                 {
-                    // Unfortunately, _bottomGridLine has no size yet so we can't get its actualheight
+                    // Unfortunately, _bottomGridLine has no size yet so we can't get its actual height
                     return DataGrid.HorizontalGridLinesThickness;
                 }
 
@@ -453,7 +453,7 @@ internal DataGridCell FillerCell
         {
             get
             {
-                Debug.Assert(this.OwningGrid != null, "Exptected non-null owning DataGrid.");
+                Debug.Assert(this.OwningGrid != null, "Expected non-null owning DataGrid.");
 
                 if (_fillerCell == null)
                 {
@@ -628,13 +628,13 @@ internal double TargetHeight
             }
         }
 
-        // Returns the actual template that should be sued for Details: either explicity set on this row
+        // Returns the actual template that should be sued for Details: either explicitly set on this row
         // or inherited from the DataGrid
         private DataTemplate ActualDetailsTemplate
         {
             get
             {
-                Debug.Assert(this.OwningGrid != null, "Exptected non-null owning DataGrid.");
+                Debug.Assert(this.OwningGrid != null, "Expected non-null owning DataGrid.");
                 DataTemplate currentDetailsTemplate = this.DetailsTemplate;
 
                 return currentDetailsTemplate != null ? currentDetailsTemplate : this.OwningGrid.RowDetailsTemplate;
@@ -778,7 +778,7 @@ protected override Size MeasureOverride(Size availableSize)
                 return base.MeasureOverride(availableSize);
             }
 
-            // Allow the DataGrid specific componets to adjust themselves based on new values
+            // Allow the DataGrid specific components to adjust themselves based on new values
             if (_headerElement != null)
             {
                 _headerElement.InvalidateMeasure();
@@ -1070,11 +1070,11 @@ internal void DetachFromDataGrid(bool recycle)
             this.Slot = -1;
         }
 
-        // Make sure the row's background is set to its correct value.  It could be explicity set or inherit
+        // Make sure the row's background is set to its correct value.  It could be explicitly set or inherit
         // DataGrid.RowBackground or DataGrid.AlternatingRowBackground
         internal void EnsureBackground()
         {
-            // Inherit the DataGrid's RowBackground properties only if this row doesn't explicity have a background set
+            // Inherit the DataGrid's RowBackground properties only if this row doesn't explicitly have a background set
             if (this.RootElement != null && this.OwningGrid != null)
             {
                 Debug.Assert(this.Index != -1, "Expected Index other than -1.");
@@ -1111,11 +1111,11 @@ internal void EnsureBackground()
             }
         }
 
-        // Make sure the row's foreground is set to its correct value.  It could be explicity set or inherit
+        // Make sure the row's foreground is set to its correct value.  It could be explicitly set or inherit
         // DataGrid.RowForeground or DataGrid.AlternatingRowForeground
         internal void EnsureForeground()
         {
-            // Inherit the DataGrid's RowForeground properties only if this row doesn't explicity have a foreground set
+            // Inherit the DataGrid's RowForeground properties only if this row doesn't explicitly have a foreground set
             if (this.OwningGrid != null)
             {
                 Debug.Assert(this.Index != -1, "Expected Index other than -1.");
@@ -1246,7 +1246,7 @@ internal void SetDetailsVisibilityInternal(
             Visibility visibility,
             bool raiseNotification)
         {
-            Debug.Assert(this.OwningGrid != null, "Exptected non-null owning DataGrid.");
+            Debug.Assert(this.OwningGrid != null, "Expected non-null owning DataGrid.");
             Debug.Assert(this.Index != -1, "Expected Index other than -1.");
 
             if (_appliedDetailsVisibility != visibility)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs
index 330de25883d..e71be5bb0e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs
@@ -347,7 +347,7 @@ internal Visibility GetRowDetailsVisibility(int rowIndex, DataGridRowDetailsVisi
             Debug.Assert(rowIndex != -1, "Expected rowIndex other than -1.");
             if (_showDetailsTable.Contains(rowIndex))
             {
-                // The user explicity set DetailsVisibility on a row so we should respect that
+                // The user explicitly set DetailsVisibility on a row so we should respect that
                 return _showDetailsTable.GetValueAt(rowIndex);
             }
             else
@@ -1423,7 +1423,7 @@ private int GetDetailsCountInclusive(int lowerBound, int upperBound)
 
             if (this.RowDetailsVisibilityMode == DataGridRowDetailsVisibilityMode.Visible)
             {
-                // Total rows minus ones which explicity turned details off
+                // Total rows minus ones which explicitly turned details off
                 return indexCount - _showDetailsTable.GetIndexCount(lowerBound, upperBound, Visibility.Collapsed);
             }
             else if (this.RowDetailsVisibilityMode == DataGridRowDetailsVisibilityMode.Collapsed)
@@ -2253,7 +2253,7 @@ private void OnInsertedElement_Phase1(int slot, UIElement element, bool isCollap
 
         private void OnInsertedElement_Phase2(int slot, bool updateVerticalScrollBarOnly, bool isCollapsed)
         {
-            Debug.Assert(slot >= 0, "Expected positve slot.");
+            Debug.Assert(slot >= 0, "Expected positive slot.");
 
             if (!isCollapsed)
             {
@@ -2780,7 +2780,7 @@ private bool SlotIsDisplayed(int slot)
             if (slot >= this.DisplayData.FirstScrollingSlot &&
                 slot <= this.DisplayData.LastScrollingSlot)
             {
-                // Additional row takes the spot of a displayed row - it is necessarilly displayed
+                // Additional row takes the spot of a displayed row - it is necessarily displayed
                 return true;
             }
             else if (this.DisplayData.FirstScrollingSlot == -1 &&
@@ -2974,7 +2974,7 @@ private void ScrollSlotsByHeight(double height)
                 if (DoubleUtil.LessThan(firstRowHeight, this.NegVerticalOffset))
                 {
                     // We've scrolled off more of the first row than what's possible.  This can happen
-                    // if the first row got shorter (Ex: Collpasing RowDetails) or if the user has a recycling
+                    // if the first row got shorter (Ex: Collapsing RowDetails) or if the user has a recycling
                     // cleanup issue.  In this case, simply try to display the next row as the first row instead
                     if (newFirstScrollingSlot < this.SlotCount - 1)
                     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/IndexToValueTable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/IndexToValueTable.cs
index a850e54665f..c480f908252 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/IndexToValueTable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/IndexToValueTable.cs
@@ -153,7 +153,7 @@ public bool ContainsAll(int startIndex, int endIndex)
         /// </summary>
         /// <param name="index">index to search for</param>
         /// <param name="value">value expected</param>
-        /// <returns>true if the given index is contained in the table with the the given value</returns>
+        /// <returns>true if the given index is contained in the table with the given value</returns>
         public bool ContainsIndexAndValue(int index, T value)
         {
             int lowerRangeIndex = this.FindRangeIndex(index);
@@ -830,7 +830,7 @@ private void InsertIndexesPrivate(int startIndex, int count, int lowerRangeIndex
         {
             Debug.Assert(count > 0, "Expected a strictly positive count parameter.");
 
-            // Same as AddRange after we fix the indicies affected by the insertion
+            // Same as AddRange after we fix the indices affected by the insertion
             int startRangeIndex = (lowerRangeIndex >= 0) ? lowerRangeIndex : 0;
             for (int i = startRangeIndex; i < _list.Count; i++)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs
index a2dfbc93ca5..47506ab7bbd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs
@@ -253,7 +253,7 @@ public static bool IsCriticalException(Exception exception)
 
         /// <summary>
         /// Gets a list of active bindings on the specified FrameworkElement.  Bindings are gathered
-        /// according to the same conditions BindingGroup uses to find bindings of descendent elements
+        /// according to the same conditions BindingGroup uses to find bindings of descendant elements
         /// within the visual tree.
         /// </summary>
         /// <param name="element">Root FrameworkElement to search under</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
index 88a948539b0..615ec02db67 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
@@ -120,7 +120,7 @@ public int ItemMargin
         /// <summary>
         /// Gets or sets a value indicating whether the items rendered transformations should be opposite compared to the selected item
         /// If false, all the items (except the selected item) will have the exact same transformations
-        /// If true, all the items where index > selected index will have an opposite tranformation (Rotation X Y and Z will be multiply by -1)
+        /// If true, all the items where index > selected index will have an opposite transformation (Rotation X Y and Z will be multiply by -1)
         /// </summary>
         public bool InvertPositive
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
index b5b9dff9138..378fe7d4a5e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
@@ -66,7 +66,7 @@ public Carousel Carousel
         }
 
         /// <summary>
-        /// Tapp an item
+        /// Tap an item
         /// </summary>
         private void OnTapped(object sender, TappedRoutedEventArgs e)
         {
@@ -208,7 +208,7 @@ internal void UpdatePosition()
                 // Apply projection
                 ApplyProjection(item, props, storyboard);
 
-                // Zindex and Opacity
+                // Z index and Opacity
                 var deltaFromSelectedIndex = Math.Abs(Carousel.SelectedIndex - i);
                 int zindex = (Carousel.Items.Count * 100) - deltaFromSelectedIndex;
                 Canvas.SetZIndex(item, zindex);
@@ -320,7 +320,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 // apply the projection to the current object
                 ApplyProjection(container, proj);
 
-                // calculate zindex and opacity
+                // calculate z index and opacity
                 int zindex = (Children.Count * 100) - deltaFromSelectedIndex;
                 Canvas.SetZIndex(container, zindex);
             }
@@ -404,7 +404,7 @@ private Proj GetProjectionFromManipulation(UIElement element, double delta)
             var rotationY = Carousel.ItemRotationY;
             var rotationZ = Carousel.ItemRotationZ;
 
-            // if the relativeposition is inside the bounds so calculate the proportionals
+            // if the relative position is inside the bounds so calculate the proportionals
             if (relativePosition <= maxBounds)
             {
                 depth = relativePosition * depth / maxBounds;
@@ -432,10 +432,10 @@ private Proj GetProjectionFromSelectedIndex(int childIndex)
             // margin
             var margin = Carousel.ItemMargin;
 
-            // we want the middle image to be indice 0, to be sure the centered image is with no rotation
+            // we want the middle image to be index 0, to be sure the centered image is with no rotation
             var relativeIndex = childIndex - Carousel.SelectedIndex;
 
-            // size beetween each element
+            // size between each element
             var widthOrHeight = Carousel.Orientation == Orientation.Horizontal ? desiredWidth : desiredHeight;
 
             // calculate the position with the margin applied
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs
index 3766119fc77..d64d1123afd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs
@@ -205,7 +205,7 @@ private bool VerticalMove(double verticalChange)
                 // change sibling row height to the new height relative to current row
                 // respect the other star row height by setting it's height to it's actual height with stars
 
-                // We need to validate current and sibling height to not cause any un expected behavior
+                // We need to validate current and sibling height to not cause any unexpected behavior
                 if (!IsValidRowHeight(CurrentRow, verticalChange) ||
                     !IsValidRowHeight(SiblingRow, verticalChange * -1))
                 {
@@ -271,7 +271,7 @@ private bool HorizontalMove(double horizontalChange)
                 // change sibling column width to the new width relative to current column
                 // respect the other star column width by setting it's width to it's actual width with stars
 
-                // We need to validate current and sibling width to not cause any un expected behavior
+                // We need to validate current and sibling width to not cause any unexpected behavior
                 if (!IsValidColumnWidth(CurrentColumn, horizontalChange) ||
                     !IsValidColumnWidth(SiblingColumn, horizontalChange * -1))
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
index cbcbda962be..8f654bf730b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
@@ -75,7 +75,7 @@ private void Element_PointerExited(object sender, PointerRoutedEventArgs e)
         {
             if (_isDragging)
             {
-                // if dragging don't update the curser just update the splitter cursor with the last window cursor,
+                // if dragging don't update the cursor just update the splitter cursor with the last window cursor,
                 // because the splitter is still using the arrow cursor and will revert to original case when drag completes
                 _splitterPreviousPointer = _previousCursor;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
index 18f75ee78d6..884811d6969 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
@@ -49,7 +49,7 @@ internal void ReDraw(Rect viewPort, float zoom)
             {
                 /* CanvasComposition.CreateDrawingSession has an internal
                  * limit on the size of the updateRectInPixels parameter,
-                 * which we dont know, so we can get an ArgumentException
+                 * which we don't know, so we can get an ArgumentException
                  * if there is a lot of extreme zooming and panning
                  * Therefore, the only solution is to silently catch the
                  * exception and allow the app to continue
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
index 21f8576983e..eed290eb35f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
@@ -238,7 +238,7 @@ protected override Size MeasureOverride(Size availableSize)
                 measureSize = _childActualSize;
             }
 
-            // Perform a mesaure on the _layoutRoot (containing Child)
+            // Perform a measure on the _layoutRoot (containing Child)
             _layoutRoot.Measure(measureSize);
 
             // Transform DesiredSize to find its width/height
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
index 752bf5cf473..7b0abe2a868 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
@@ -82,7 +82,7 @@ public PropertyChangeEventSource(
         {
             _source = source;
 
-            // Bind to the property to be able to get its changes relayed as events throug the ValueChanged event.
+            // Bind to the property to be able to get its changes relayed as events through the ValueChanged event.
             var binding =
                 new Binding
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
index 941967a0ac3..e7b7a22ca54 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
@@ -323,7 +323,7 @@ public CommandBar DetailsCommandBar
         }
 
         /// <summary>
-        /// Gets or sets the Threshold width that witll trigger the control to go into compact mode
+        /// Gets or sets the Threshold width that will trigger the control to go into compact mode
         /// </summary>
         public double CompactModeThresholdWidth
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs
index 296f5d7cfb5..6d968f2aab0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs
@@ -24,7 +24,7 @@ public partial class Menu
         private const string AltValue = "ALT";
 
         /// <summary>
-        /// Gets or sets the current flyout placement, internal because the child menu item needs it to respect the menu direction of submenus
+        /// Gets or sets the current flyout placement, internal because the child menu item needs it to respect the menu direction of sub-menus
         /// </summary>
         internal FlyoutPlacementMode? CurrentFlyoutPlacement { get; set; }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
index 15d504178ab..1b7c445edc0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
@@ -20,7 +20,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// ItemsControl that lays out items in a circle with support for odbits and anchors
+    /// ItemsControl that lays out items in a circle with support for orbits and anchors
     /// </summary>
     [TemplatePart(Name = "AnchorCanvas", Type = typeof(Canvas))]
     [TemplatePart(Name = "OrbitGrid", Type = typeof(Grid))]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
index c76fdcd5d0b..375947a0e6b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
@@ -15,7 +15,7 @@ public class OrbitViewDataItem : DependencyObject
     {
         /// <summary>
         /// Gets or sets a value indicating the distance from the center.
-        /// Expected value betweeen 0 and 1
+        /// Expected value between 0 and 1
         /// </summary>
         public double Distance
         {
@@ -47,7 +47,7 @@ public string Label
 
         /// <summary>
         /// Gets or sets a value indicating the diameter of the item.
-        /// Expected value betweeen 0 and 1
+        /// Expected value between 0 and 1
         /// </summary>
         public double Diameter
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs
index b92c619aaf8..d2fc0af0f6c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// An alternative impementation of a progress bar.
+    /// An alternative implementation of a progress bar.
     /// Progression is represented by a loop filling up in a clockwise fashion.
     /// Like the traditional progress bar, it inherits from RangeBase, so Minimum, Maximum and Value properties work the same way.
     /// </summary>
@@ -84,7 +84,7 @@ protected override void OnApplyTemplate()
         }
 
         /// <summary>
-        /// Gets or sets the thickness of the circular ouline and segment
+        /// Gets or sets the thickness of the circular outline and segment
         /// </summary>
         public double Thickness
         {
@@ -98,7 +98,7 @@ public double Thickness
         public static readonly DependencyProperty ThicknessProperty = DependencyProperty.Register(nameof(Thickness), typeof(double), typeof(RadialProgressBar), new PropertyMetadata(0.0, ThicknessChangedHandler));
 
         /// <summary>
-        /// Gets or sets the color of the circular ouline on which the segment is drawn
+        /// Gets or sets the color of the circular outline on which the segment is drawn
         /// </summary>
         public Brush Outline
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
index 5d33b33f1cc..31cc672f20c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
@@ -173,7 +173,7 @@ public double SelectedTabWidth
             DependencyProperty.Register(nameof(SelectedTabWidth), typeof(double), typeof(TabView), new PropertyMetadata(double.NaN, OnLayoutEffectingPropertyChanged));
 
         /// <summary>
-        /// Gets or sets the current <see cref="TabWidthMode"/> which determins how tab headers' width behave.
+        /// Gets or sets the current <see cref="TabWidthMode"/> which determines how tab headers' width behave.
         /// </summary>
         public TabWidthMode TabWidthBehavior
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
index 69a968fd839..97666fea66e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
@@ -72,7 +72,7 @@ protected override void OnPointerPressed(PointerRoutedEventArgs e)
                     _isMiddleClick = true;
                 }
 
-                // Disable unwanted behaviour inherited by ListViewItem:
+                // Disable unwanted behavior inherited by ListViewItem:
                 // Disable "Ctrl + Left click" to deselect tab
                 // Or variant like "Ctrl + Shift + Left click"
                 // Or "Ctrl + Alt + Left click"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
index 76fa0c020e7..8d8aa5b7661 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
@@ -10,17 +10,17 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats
     public enum Format
     {
         /// <summary>
-        /// Utilises the Built-In RichText Formatter
+        /// Utilizes the Built-In RichText Formatter
         /// </summary>
         RichText,
 
         /// <summary>
-        /// Utilises the Built-In Markdown Formatter
+        /// Utilizes the Built-In Markdown Formatter
         /// </summary>
         MarkDown,
 
         /// <summary>
-        /// Utilises the provided Custom Formatter using the Formatter Property
+        /// Utilizes the provided Custom Formatter using the Formatter Property
         /// </summary>
         Custom
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
index 25669a72fe1..4419bdcaeb0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
@@ -42,7 +42,7 @@ protected virtual void Model_EditorChanged(object sender, EditorChangedArgs e)
         }
 
         /// <summary>
-        /// Called for Changes to Selction (Requires unhook if switching RichEditBox).
+        /// Called for Changes to Selection (Requires unhook if switching RichEditBox).
         /// </summary>
         /// <param name="sender">Editor</param>
         /// <param name="e">Args</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs
index b698b7a52a5..35c3a5905f1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons
 {
     /// <summary>
-    /// Seperates a collection of <see cref="IToolbarItem"/>
+    /// Separates a collection of <see cref="IToolbarItem"/>
     /// </summary>
     public class ToolbarSeparator : AppBarSeparator, IToolbarItem
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
index fdc0122ba2a..74fc28fd5d1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
@@ -148,7 +148,7 @@ private void MoveKeysForward(int pivot, int amount)
         /// <param name="amount">by how many</param>
         private void MoveKeysBackward(int pivot, int amount)
         {
-            // Sort in regular order to work from the earliest indicies onwards
+            // Sort in regular order to work from the earliest indices onwards
             var keys = _interspersedObjects.Keys.OrderBy(v => v).ToArray();
             foreach (var key in keys)
             {
@@ -259,7 +259,7 @@ private int ToOuterIndexAfterRemoval(int innerIndexToProject)
         }
 
         /// <summary>
-        /// Inserts an item to intersperse with the underlying collection, but not be part of the underyling collection itself.
+        /// Inserts an item to intersperse with the underlying collection, but not be part of the underlying collection itself.
         /// </summary>
         /// <param name="index">Position to insert the item at.</param>
         /// <param name="obj">Item to intersperse</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
index c952b2defc0..278b57df77e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
@@ -26,7 +26,7 @@ private enum MoveDirection
 
         /// <summary>
         /// Adjust the selected item and range based on keyboard input.
-        /// This is used to override the listview behavious for up/down arrow manipulation vs left/right for a horizontal control
+        /// This is used to override the listview behaviors for up/down arrow manipulation vs left/right for a horizontal control
         /// </summary>
         /// <param name="direction">direction to move the selection</param>
         /// <returns>True if the focus was moved, false otherwise</returns>
@@ -106,7 +106,7 @@ private bool MoveFocusAndSelection(MoveDirection direction)
                         SelectedIndex = index;
 
                         // This looks like a bug in the underlying ListViewBase control.
-                        // Might need to be reviewed if the base behaviour is fixed
+                        // Might need to be reviewed if the base behavior is fixed
                         // When two consecutive items are selected and the navigation moves between them,
                         // the first time that happens the old focused item is not unselected
                         if (SelectedItems.Count > 1)
@@ -141,7 +141,7 @@ internal void SelectAllTokensAndText()
             {
                 this.SelectAllSafe();
 
-                // need to synchronize the select all and the focus behaviour on the text box
+                // need to synchronize the select all and the focus behavior on the text box
                 // because there is no way to identify that the focus has been set from this point
                 // to avoid instantly clearing the selection of tokens
                 PauseTokenClearOnFocus = true;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
index bbcf95fb5e4..67971826868 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
@@ -88,7 +88,7 @@ private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProp
         private void TokenizingTextBox_ItemClick(object sender, ItemClickEventArgs e)
         {
             // If the user taps an item in the list, make sure to clear any text selection as required
-            // Note, token selection is cleared by the listview default behaviour
+            // Note, token selection is cleared by the listview default behavior
             if (!IsControlPressed)
             {
                 // Set class state flag to prevent click item being immediately deselected
@@ -165,7 +165,7 @@ internal async Task<bool> TokenizingTextBox_PreviewKeyDown(VirtualKey key)
                     return MoveFocusAndSelection(MoveDirection.Next);
 
                 case VirtualKey.A:
-                    // modify the select-all behaviour to ensure the text in the edit box gets selected.
+                    // modify the select-all behavior to ensure the text in the edit box gets selected.
                     if (IsControlPressed)
                     {
                         this.SelectAllTokensAndText();
@@ -538,7 +538,7 @@ private void GuardAgainstPlaceholderTextLayoutIssue()
             {
                 placeholder.Visibility = Visibility.Collapsed;
 
-                // After we ensure we've hid the control, make it visible again (this is inperceptable to the user).
+                // After we ensure we've hid the control, make it visible again (this is imperceptible to the user).
                 _ = CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() =>
                 {
                     placeholder.Visibility = Visibility.Visible;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
index 372960905e2..190a0973f23 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
@@ -218,7 +218,7 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 
         private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
         {
-            // Verify if the usual behaviour of clearing token selection is required
+            // Verify if the usual behavior of clearing token selection is required
             if (Owner.PauseTokenClearOnFocus == false && !TokenizingTextBox.IsShiftPressed)
             {
                 // Clear any selected tokens
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
index 749d3d5db07..ff27c846922 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is recieved a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
+    /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is received a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
     /// </summary>
     public partial class WrapPanel
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
index 121569ff89d..527bc406e39 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
@@ -184,7 +184,7 @@ protected override Size MeasureOverride(Size availableSize)
             }
 
             // update value with the last line
-            // if the the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
+            // if the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
             // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
             // for the last condition it is zeros so adding it will make no difference
             // this way is faster than an if condition in every loop for checking the last item
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs b/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs
index 0e2f693e72a..308f5030f4f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs
@@ -48,7 +48,7 @@ public RadialGradientBrush()
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RadialGradientBrush"/> class
-        /// with with two colors specified for GradientStops at
+        /// with two colors specified for GradientStops at
         /// offsets 0.0 and 1.0.
         /// </summary>
         /// <param name="startColor"> The Color at offset 0.0. </param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Helpers/SurfaceLoader.Instance.cs b/Microsoft.Toolkit.Uwp.UI.Media/Helpers/SurfaceLoader.Instance.cs
index 213a714e588..23852ab0159 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Helpers/SurfaceLoader.Instance.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Helpers/SurfaceLoader.Instance.cs
@@ -77,7 +77,7 @@ public static SurfaceLoader GetInstance(Compositor compositor)
         private CanvasDevice canvasDevice;
 
         /// <summary>
-        /// The <see cref="CompositionGraphicsDevice"/> instance to determinde which GPU is handling the request.
+        /// The <see cref="CompositionGraphicsDevice"/> instance to determine which GPU is handling the request.
         /// </summary>
         private CompositionGraphicsDevice compositionDevice;
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
index 0c8e82a9029..0d7a43b9852 100644
--- a/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/DoubleToObjectConverter.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// <summary>
     /// This class converts a double value into an other object.
     /// Can be used to convert doubles to visibility, a couple of colors, couple of images, etc.
-    /// If GreaterThan and LessThan are both set, the logic looks for a value inbetween the two values.
+    /// If GreaterThan and LessThan are both set, the logic looks for a value between the two values.
     /// Otherwise the logic looks for the value to be GreaterThan or LessThan the specified value.
     /// The ConverterParameter can be used to invert the logic.
     /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index 1b04197e110..8da09f58150 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -41,7 +41,7 @@ public static void SetAncestor(DependencyObject obj, object value)
         /// <summary>
         /// Gets the Type of Ancestor to look for from this element.
         /// </summary>
-        /// <returns>Blah blah</returns>
+        /// <returns>Type of Ancestor to look for from this element</returns>
         public static Type GetAncestorType(DependencyObject obj)
         {
             return (Type)obj.GetValue(AncestorTypeProperty);
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
index e4697182b60..751c902659a 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
@@ -25,28 +25,28 @@ public static class HyperlinkExtensions
         public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached("CommandParameter", typeof(object), typeof(Hyperlink), new PropertyMetadata(null));
 
         /// <summary>
-        /// Gets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// Gets the <see cref="ICommand"/> instance associated with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
         /// </summary>
         /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="ICommand"/> instance</param>
-        /// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
+        /// <returns>The <see cref="ICommand"/> instance associated with the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
         public static ICommand GetCommand(Hyperlink obj) => (ICommand)obj.GetValue(CommandProperty);
 
         /// <summary>
-        /// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// Sets the <see cref="ICommand"/> instance associated with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
         /// </summary>
         /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="ICommand"/> instance to</param>
         /// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/></param>
         public static void SetCommand(Hyperlink obj, ICommand value) => obj.SetValue(CommandProperty, value);
 
         /// <summary>
-        /// Gets the <see cref="CommandProperty"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// Gets the <see cref="CommandProperty"/> instance associated with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
         /// </summary>
         /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="CommandProperty"/> value</param>
-        /// <returns>The <see cref="CommandProperty"/> value associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
+        /// <returns>The <see cref="CommandProperty"/> value associated with the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
         public static object GetCommandParameter(Hyperlink obj) => obj.GetValue(CommandParameterProperty);
 
         /// <summary>
-        /// Sets the <see cref="CommandProperty"/> assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// Sets the <see cref="CommandProperty"/> associated with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
         /// </summary>
         /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="CommandProperty"/> instance to</param>
         /// <param name="value">The <see cref="object"/> to set the <see cref="CommandProperty"/> to</param>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs
index ba287769b23..9b956d7510a 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs
@@ -208,7 +208,7 @@ private static void ScrollViewer_PointerPressed(object sender, PointerRoutedEven
 
         private static void CoreWindow_PointerMoved(CoreWindow sender, PointerEventArgs args)
         {
-            // If condution that occures before scrolling begins
+            // If condition that occurs before scrolling begins
             if (_isPressed && !_isMoved)
             {
                 PointerPoint pointerPoint = args.CurrentPoint;
@@ -220,7 +220,7 @@ private static void CoreWindow_PointerMoved(CoreWindow sender, PointerEventArgs
                     var offsetX = _currentPosition.X - _startPosition.X;
                     var offsetY = _currentPosition.Y - _startPosition.Y;
 
-                    // Settign _isMoved if pointer goes out of threshold value
+                    // Setting _isMoved if pointer goes out of threshold value
                     if (Math.Abs(offsetX) > _threshold || Math.Abs(offsetY) > _threshold)
                     {
                         _isMoved = true;
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.Properties.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.Properties.cs
index fcb8adf1373..2d4cd219f8b 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.Properties.cs
@@ -69,7 +69,7 @@ public static void SetHorizontalScrollBarMargin(FrameworkElement obj, Thickness
         }
 
         /// <summary>
-        /// Get <see cref="EnableMiddleClickScrollingProperty"/>. Returns `true` if middle click scrolling is enabled else retuen `false`
+        /// Get <see cref="EnableMiddleClickScrollingProperty"/>. Returns `true` if middle click scrolling is enabled else return `false`
         /// </summary>
         /// <param name="obj">The <see cref="DependencyObject"/> to get the associated `bool`</param>
         /// <returns>The `bool` associated with the <see cref="DependencyObject"/></returns>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
index a3aef24fa4c..185e17a9c87 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
@@ -46,7 +46,7 @@ public class SurfaceDialTextbox
             DependencyProperty.RegisterAttached("MinValue", typeof(double), typeof(SurfaceDialTextbox), new PropertyMetadata(-100d));
 
         /// <summary>
-        /// Sets the maxium value the TextBox can have when modifying it using a Surface Dial. Default is 100.0
+        /// Sets the maximum value the TextBox can have when modifying it using a Surface Dial. Default is 100.0
         /// </summary>
         public static readonly DependencyProperty MaxValueProperty =
             DependencyProperty.RegisterAttached("MaxValue", typeof(double), typeof(SurfaceDialTextbox), new PropertyMetadata(100d));
@@ -58,7 +58,7 @@ public class SurfaceDialTextbox
             DependencyProperty.RegisterAttached("EnableTapToNextControl", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(true));
 
         /// <summary>
-        /// EnableMinMax limits the value in the textbox to your spesificed Min and Max values, see the other properties.
+        /// EnableMinMax limits the value in the textbox to your specified Min and Max values, see the other properties.
         /// </summary>
         public static readonly DependencyProperty EnableMinMaxValueProperty =
             DependencyProperty.RegisterAttached("EnableMinMaxValue", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(false));
@@ -66,7 +66,7 @@ public class SurfaceDialTextbox
         /// <summary>
         /// Getter of the EnableMinMax property
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static bool GetEnableMinMaxValue(DependencyObject obj)
         {
@@ -76,7 +76,7 @@ public static bool GetEnableMinMaxValue(DependencyObject obj)
         /// <summary>
         /// Setter of the EnableMinMax property
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetEnableMinMaxValue(DependencyObject obj, bool value)
         {
@@ -86,7 +86,7 @@ public static void SetEnableMinMaxValue(DependencyObject obj, bool value)
         /// <summary>
         /// Getter of the TapToNext flag.
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static bool GetEnableTapToNextControl(DependencyObject obj)
         {
@@ -96,7 +96,7 @@ public static bool GetEnableTapToNextControl(DependencyObject obj)
         /// <summary>
         /// Setter of the TapToNext flag.
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetEnableTapToNextControl(DependencyObject obj, bool value)
         {
@@ -106,7 +106,7 @@ public static void SetEnableTapToNextControl(DependencyObject obj, bool value)
         /// <summary>
         /// Getter of the MaxValue
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static double GetMaxValue(DependencyObject obj)
         {
@@ -116,7 +116,7 @@ public static double GetMaxValue(DependencyObject obj)
         /// <summary>
         /// Setter of the MaxValue
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetMaxValue(DependencyObject obj, double value)
         {
@@ -126,7 +126,7 @@ public static void SetMaxValue(DependencyObject obj, double value)
         /// <summary>
         /// Getter of the MinValue
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static double GetMinValue(DependencyObject obj)
         {
@@ -136,7 +136,7 @@ public static double GetMinValue(DependencyObject obj)
         /// <summary>
         /// Setter of the MinValue
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetMinValue(DependencyObject obj, double value)
         {
@@ -146,7 +146,7 @@ public static void SetMinValue(DependencyObject obj, double value)
         /// <summary>
         /// Setter of the StepValue.
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static double GetStepValue(DependencyObject obj)
         {
@@ -156,7 +156,7 @@ public static double GetStepValue(DependencyObject obj)
         /// <summary>
         /// Getter of the StepValue
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetStepValue(DependencyObject obj, double value)
         {
@@ -166,7 +166,7 @@ public static void SetStepValue(DependencyObject obj, double value)
         /// <summary>
         /// Getter of the Icon
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static RadialControllerMenuKnownIcon GetIcon(DependencyObject obj)
         {
@@ -176,7 +176,7 @@ public static RadialControllerMenuKnownIcon GetIcon(DependencyObject obj)
         /// <summary>
         /// Setter of the Icon
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetIcon(DependencyObject obj, RadialControllerMenuKnownIcon value)
         {
@@ -186,7 +186,7 @@ public static void SetIcon(DependencyObject obj, RadialControllerMenuKnownIcon v
         /// <summary>
         /// Setter of the Haptic Feedback property
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static bool GetEnableHapticFeedback(DependencyObject obj)
         {
@@ -196,7 +196,7 @@ public static bool GetEnableHapticFeedback(DependencyObject obj)
         /// <summary>
         /// Getter of the Haptic Feedback property
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetEnableHapticFeedback(DependencyObject obj, bool value)
         {
@@ -206,7 +206,7 @@ public static void SetEnableHapticFeedback(DependencyObject obj, bool value)
         /// <summary>
         /// Getter of the Force Menu Item flag
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <returns>Return value of property</returns>
         public static bool GetForceMenuItem(DependencyObject obj)
         {
@@ -216,7 +216,7 @@ public static bool GetForceMenuItem(DependencyObject obj)
         /// <summary>
         /// Setter of the Force Menu Item flag
         /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="obj">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="value">The value to set the property to.</param>
         public static void SetForceMenuItem(DependencyObject obj, bool value)
         {
@@ -255,13 +255,13 @@ public static bool IsSupported
         private static RadialControllerMenuItem _stepTextMenuItem;
 
         /// <summary>
-        /// The textbox itself needed to refernece the current TextBox that is being modified
+        /// The textbox itself needed to reference the current TextBox that is being modified
         /// </summary>
         private static TextBox _textBox;
 
         /// <summary>
         /// Gets or sets the controller for the Surface Dial. The RadialController can be set from your app logic in case you use Surface Dial in other custom cases than on a TextBox.
-        /// This helper class will do everything for you, but if you want to control the Menu Items and/or wish to use the same Surface Dial insta
+        /// This helper class will do everything for you, but if you want to control the Menu Items and/or wish to use the same Surface Dial instance
         /// This is the property for the static controller so you can access it if needed.
         /// </summary>
         public static RadialController Controller
@@ -322,7 +322,7 @@ private static void Controller_RotationChanged(RadialController sender, RadialCo
         /// <summary>
         /// Sets up the events needed for the current TextBox so it can trigger on GotFocus and LostFocus
         /// </summary>
-        /// <param name="d">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="d">The Dependency Object we are dealing with, like a TextBox.</param>
         /// <param name="e">The arguments of the changed event.</param>
         private static void StepValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index aa06c2fd5da..7a27722de68 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -45,7 +45,7 @@ private static void Textbox_Loaded(object sender, RoutedEventArgs e)
         {
             var textbox = (TextBox)sender;
 
-            // incase no value is provided us it as normal textbox
+            // in case no value is provided us it as normal textbox
             var mask = textbox.GetValue(MaskProperty) as string;
             if (string.IsNullOrWhiteSpace(mask))
             {
@@ -340,7 +340,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
 
             if (!isDeleteOrBackspace)
             {
-                // Case change happended due to user input
+                // Case change happened due to user input
                 var selectedChar = textbox.SelectionStart > 0 ?
                                     textbox.Text[textbox.SelectionStart - 1] :
                                     placeHolder;
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/UserHandPreferenceStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/UserHandPreferenceStateTrigger.cs
index b15c22c7d7b..91fd46ca4c5 100644
--- a/Microsoft.Toolkit.Uwp.UI/Triggers/UserHandPreferenceStateTrigger.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/UserHandPreferenceStateTrigger.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Triggers
 {
     /// <summary>
-    /// Trigger for switching UI based on whether the user favours their left or right hand.
+    /// Trigger for switching UI based on whether the user favors their left or right hand.
     /// </summary>
     public class UserHandPreferenceStateTrigger : StateTriggerBase
     {
diff --git a/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs b/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
index d5036335c2a..39fc89aeca2 100644
--- a/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
@@ -5,12 +5,12 @@
 namespace Microsoft.Toolkit.Uwp.Deferred
 {
     /// <summary>
-    /// <see cref="DeferredEventArgs"/> which can also be Cancelled.
+    /// <see cref="DeferredEventArgs"/> which can also be Canceled.
     /// </summary>
     public class DeferredCancelEventArgs : DeferredEventArgs
     {
         /// <summary>
-        /// Gets or sets a value indicating whether the event should be cancelled.
+        /// Gets or sets a value indicating whether the event should be canceled.
         /// </summary>
         public bool Cancel { get; set; }
     }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
index 4043fe1728c..142000987ec 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
@@ -222,7 +222,7 @@ private async Task<CameraHelperResult> InitializeMediaCaptureAsync()
                     return CameraHelperResult.NoFrameSourceAvailable;
                 }
 
-                // Get only formats of a certain framerate and compatible subtype for previewing, order them by resolution
+                // Get only formats of a certain frame-rate and compatible subtype for previewing, order them by resolution
                 FrameFormatsAvailable = PreviewFrameSource.SupportedFormats.Where(format =>
                     format.FrameRate.Numerator / format.FrameRate.Denominator >= 15 // fps
                     && (string.Compare(format.Subtype, MediaEncodingSubtypes.Nv12, true) == 0
diff --git a/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs b/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
index 5c858aeac00..1c7dbc00b5d 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/DeepLinkParser/DeepLinkParser.cs
@@ -178,7 +178,7 @@ protected virtual void SetRoot(Uri validatedUri)
             int queryStartPosition = origString.IndexOf('?');
             if (queryStartPosition == -1)
             {
-                // No querystring on the URI
+                // No query string on the URI
                 Root = origString;
             }
             else
diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
index 0f9fb1f0610..4a158d80e05 100644
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
@@ -109,7 +109,7 @@ public TResult Result
         public bool IsSuccessfullyCompleted => Task.Status == TaskStatus.RanToCompletion;
 
         /// <summary>
-        /// Gets a value indicating whether the task was cancelled.
+        /// Gets a value indicating whether the task was canceled.
         /// </summary>
         public bool IsCanceled => Task.IsCanceled;
 
diff --git a/build/build.ps1 b/build/build.ps1
index 7a24017f8cc..deed10851c4 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -169,7 +169,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
 
     if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet tools."
+        Throw "An error occurred while restoring NuGet tools."
     }
     else
     {
@@ -207,7 +207,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
 
     if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet modules."
+        Throw "An error occurred while restoring NuGet modules."
     }
     else
     {
@@ -224,7 +224,7 @@ $Script = "$path/build.cake"
 Write-Host "Bootstrapping Cake..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" --bootstrap"
 if ($LASTEXITCODE -ne 0) {
-    throw "An error occured while bootstrapping Cake."
+    throw "An error occurred while bootstrapping Cake."
 }
 
 Write-Host "Running build script..."
diff --git a/contributing.md b/contributing.md
index 4156b2effc5..b18bcaab6c9 100644
--- a/contributing.md
+++ b/contributing.md
@@ -47,7 +47,7 @@ Once merged, you can get a pre-release package of the toolkit by adding this ([N
 
 ### <a name="docs"></a> Adding Documentation
 
-Documentation is **required** when adding, removing, or updating a control or an API. To update the documentation, you must submit a seperate Pull Request in the [documentation repository](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs) (use the *master* branch). **Both Pull Requests (code and docs) must be approved by the core team before either one is merged.**
+Documentation is **required** when adding, removing, or updating a control or an API. To update the documentation, you must submit a separate Pull Request in the [documentation repository](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs) (use the *master* branch). **Both Pull Requests (code and docs) must be approved by the core team before either one is merged.**
 
 Make sure to update both Pull Requests with a link to each other.
 
@@ -82,7 +82,7 @@ This is to help as part of our effort to build an accessible toolkit (starting w
 * DO declare static dependency properties at the top of their file.
 * DO NOT seal controls.
 * DO use extension methods over static methods where possible.
-* DO NOT return true or false to give sucess status. Throw exceptions if there was a failure.
+* DO NOT return true or false to give success status. Throw exceptions if there was a failure.
 * DO use verbs like GET.
 * DO NOT use verbs that are not already used like fetch.
 

From e6733d56e542e27ada7e8a3ac21a691b2a54a999 Mon Sep 17 00:00:00 2001
From: Herrick Spencer <code@herrickspencer.com>
Date: Fri, 14 Aug 2020 01:22:38 -0700
Subject: [PATCH 386/595] Return param to 'current' per PR comment

---
 .../Adaptive/BaseTextHelper.cs                              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
index 8cf643129b1..0cbb3f154b9 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs
@@ -8,12 +8,12 @@ namespace Microsoft.Toolkit.Uwp.Notifications
 {
     internal class BaseTextHelper
     {
-        internal static Element_AdaptiveText CreateBaseElement(IBaseText baseText)
+        internal static Element_AdaptiveText CreateBaseElement(IBaseText current)
         {
             return new Element_AdaptiveText()
             {
-                Text = baseText.Text,
-                Lang = baseText.Language
+                Text = current.Text,
+                Lang = current.Language
             };
         }
     }

From 6c89c5ba0230ae12636f9735d9e9a2a772e545a7 Mon Sep 17 00:00:00 2001
From: Herrick Spencer <code@herrickspencer.com>
Date: Mon, 17 Aug 2020 10:39:07 -0700
Subject: [PATCH 387/595] Some capitalizations needed

---
 .../BluetoothLEHelper/GattNativeUuid.cs                         | 2 +-
 .../Properties/AssemblyInfo.cs                                  | 2 +-
 .../Properties/AssemblyInfo.cs                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
index 6bc6be1d8e5..c651696d7bc 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
+++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs
@@ -633,7 +633,7 @@ public enum GattNativeUuid : ushort
         PositionQuality = 0x2A69,
 
         /// <summary>
-        /// The scientific temperature in celsius
+        /// The scientific temperature in Celsius
         /// </summary>
         ScientificTemperatureInCelsius = 0x2A3C,
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
index 43fa7909370..1a907af922c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
+//inside a <PropertyGroup>.  For example, if you are using US English
 //in your source files, set the <UICulture> to en-US.  Then uncomment
 //the NeutralResourceLanguage attribute below.  Update the "en-US" in
 //the line below to match the UICulture setting in the project file.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs
index b1b1d18d1a0..c4763b5af16 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
+//inside a <PropertyGroup>.  For example, if you are using US English
 //in your source files, set the <UICulture> to en-US.  Then uncomment
 //the NeutralResourceLanguage attribute below.  Update the "en-US" in
 //the line below to match the UICulture setting in the project file.

From 7921fa74dac63109fa11f0ca862f03347607c095 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 17 Aug 2020 11:55:03 -0700
Subject: [PATCH 388/595] Removed deprecated FacebookService, and the
 Microsoft.Toolkit.Uwp.Services project.

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   2 -
 .../Facebook Service/FacebookCode.bind        |  23 -
 .../Facebook Service/FacebookLogo.png         | Bin 1301 -> 0 bytes
 .../SamplePages/Facebook Service/icon.png     | Bin 871 -> 0 bytes
 .../SamplePages/samples.json                  |  10 -
 .../Microsoft.Toolkit.Uwp.Services.csproj     |  19 -
 ...ft.Toolkit.Uwp.Services.csproj.DotSettings |   4 -
 .../Microsoft.Toolkit.Uwp.Services.rd.xml     |   5 -
 .../Services/Facebook/FacebookAlbum.cs        |  42 --
 .../Services/Facebook/FacebookDataConfig.cs   |  32 --
 .../Services/Facebook/FacebookDataHost.cs     |  18 -
 .../Services/Facebook/FacebookOAuthTokens.cs  |  22 -
 .../Services/Facebook/FacebookPermissions.cs  | 120 ----
 .../Services/Facebook/FacebookPhoto.cs        |  55 --
 .../Services/Facebook/FacebookPicture.cs      |  32 --
 .../Services/Facebook/FacebookPictureData.cs  |  17 -
 .../Facebook/FacebookPlatformImageSource.cs   |  32 --
 .../Services/Facebook/FacebookPost.cs         |  44 --
 .../Facebook/FacebookRequestSource.cs         | 121 ----
 .../Services/Facebook/FacebookService.cs      | 515 ------------------
 Windows Community Toolkit.sln                 |  34 +-
 readme.md                                     |   3 +-
 22 files changed, 4 insertions(+), 1146 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookCode.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookLogo.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/icon.png
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj.DotSettings
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookAlbum.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataConfig.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataHost.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookOAuthTokens.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPermissions.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPhoto.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPicture.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPictureData.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPlatformImageSource.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPost.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 4291bcd25b3..18981c05b81 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -300,7 +300,6 @@
     <Content Include="SamplePages\DataGrid\DataGrid.png" />
     <Content Include="SamplePages\DispatcherQueueHelper\DispatchQueueHelper.png" />
     <Content Include="SamplePages\DockPanel\DockPanel.png" />
-    <Content Include="SamplePages\Facebook Service\FacebookLogo.png" />
     <Content Include="SamplePages\LoginButton\LoginButton.png" />
     <Content Include="SamplePages\FadeHeader\FadeHeaderBehavior.png" />
     <Content Include="SamplePages\Fade\FadeBehavior.png" />
@@ -365,7 +364,6 @@
     <Content Include="SamplePages\Twitter Service\TwitterLogo.png" />
     <Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
     <Content Include="SamplePages\Twitter Service\icon.png" />
-    <Content Include="SamplePages\Facebook Service\FacebookCode.bind" />
     <Content Include="SamplePages\ViewExtensions\ViewExtensions.png" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehavior.png" />
     <Content Include="SamplePages\Visual Extensions\VisualExtensions.png" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookCode.bind
deleted file mode 100644
index 43f08e37c4a..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookCode.bind	
+++ /dev/null
@@ -1,23 +0,0 @@
-// Initialize service
-FacebookService.Instance.Initialize(AppIDText.Text);
-
-// Login to Facebook
-if (!await FacebookService.Instance.LoginAsync())
-{
-    return;
-}
-
-// Get user's feed
-ListView.ItemsSource = await FacebookService.Instance.RequestAsync(FacebookDataConfig.MyFeed, 50);
-
-// Get current user profile picture
-ProfileImage.DataContext = await FacebookService.Instance.GetUserPictureInfoAsync();
-
-// Post a message on your wall using Facebook Dialog
-await FacebookService.Instance.PostToFeedWithDialogAsync(TitleText.Text, DescriptionText.Text, UrlText.Text);
-
-// Get current user's photo albums
-await FacebookService.Instance.GetUserAlbumsAsync();
-
-// Get current user's photos by album Id
-await FacebookService.Instance.GetUserPhotosByAlbumIdAsync(addedItem.Id);
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookLogo.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookLogo.png
deleted file mode 100644
index 0222a8325a3ec3c2c1716a27702c80845aaf048e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1301
zcmeAS@N?(olHy`uVBq!ia0y~yU{nCI4{)#n$t4^1Z39v)#ZI0f96(URk<tO=p7C^X
z45^s&_U_s4&{CP>AJ?Y_KV}wo_RpHwt)bezFtBAtYxjY(3VEvk8L#IpNzE-W6ma~(
z-=esM%QNPR(j5`b!vP(uLrR3Wj&nCpU)Qmg>&$ZNif482=KQW&%XY4R=l#u<pRL;u
zTfY7#V^g@Ef$3U!Xm79olIIL=KI?C<OuyvJu-LnyL4uJfiG`y>P(i_Mh;t(6%QZZc
zvEQ|SSy|p%U+H6)7O&}gdVBAz{W~I#KRdV7eW7BRgKpuU7yo9>ym#-`kC4#ZTLxjq
zmv6uRaq;iVz>E%ttw*k$Tl-RwEp5uVt#4UYsNUN1`RD#XtLxi@(E{gKbH|!h_vY>{
zP5l`5w=Q?(zdbu+)c5~;*=X9%?{oE8@A>f1tH0mpto(kjuJl5(kdniiE}-hI1uxy^
zS{cXN>&H~TxwU@Z-2d<2E4P2+y1*f*AhrF<%WE$;bANATm2+#zxDvEHdj8x$4?B0u
zttb+n)i&2|w}Ral--e7c`upR`ZyxR95a_imb*qVxWLzW|E}p;hOVZIhEz1PM|L?f^
z{npJ|>sQU?+pj)3@`L%fn%VvfPa=3MK?=owb6<Eq|ID>_vA4r2rLJ*JPcV6ODF6EW
z9nU^AYJPlZ$K;~?Yv=#X)z@D$&uH1|f+aoJba=#1v%351_qn^vf61F$-`(}``lsaU
zK7KvdZxo-myZU}Z8HYga&v(bY`D^FC@~Zju^t*q|=d<GS*R%C=t5)4ld|SYIEa2nS
z%NLa#ctjbcbeWD^m~nTzvMm#{ngdU-`8J;=?g<B2Iu?HXv}E@A#cmA}QvB79l5ath
z;cDi~fRZ-sF7fy7{7RCw-12?m@!yqh8D;nTj^BI!^ZVyBJ$#Id^np>Do%ZYE@!y;m
z+~xN@?d`a8Tvb9q*}<WQfzgnO<p_rWshlf9r?*!lC5&hKddu7;W`L8%f@v0J<?GJH
z@3`~o?!ixQ<L2%!*x7e>u6Mta^R>5@6_4)S*pXkv+<f(Q*_(z2nPHRJfaOJ6ZD{EF
h+n(ncdlu9)$fnJ^qn_w|6j;tNc)I$ztaD0e0sz~}_iz9J

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/icon.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/icon.png
deleted file mode 100644
index 76f7cb82ef9ab90643d075b59e86e72b20f34592..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR00045P)t-s0000;
zNRc>HsXSqwI9``RUY9>tmpoXQJy@7LS(rUqmpxjSJzAJOS(rUpm_1sTJzAKVsL9IG
z<Np5sJzAGNT9-Xqm^@jRJzAJPTbVyxnLu5dLtmRkV4Ou^oJV4vNMoK!WS>iApG#(+
zOlF`=XP{7OqEKt1QEQ`9Y@<|eq*ZRES8%3UbEsQ$s9klbUUsQtdaPu7t!RF)X@9S4
zfv{|Xv2TR3Z-ujSh_!%|yMdIvf|b34mA!?RzKWc|jh@4jqQ#l0$(pIjoU6;8t<0jZ
z&ZDu;q_NMWvd^Wn&#AW2thm#yxzo15*t^Bs!pq;o%-_Y$;Kk11%F^S^)a1_A<<HjU
z(%I+K+UVBY>Du7y+TiTq<?rL@@Z{+5>h1LF?)2>L_3ZEU?(z2T@%Hlc`1JMp_4fMr
z`1|?#{QCO*`uqI*{Qdm={rvs@{r&#_{{H{}|93uRS^xk57<5ujQve4E6&o8MZE(WF
z%goT#<>lq&<@NUV_ph#GHvj+urAb6VRCr!u7*1dmjDk_X#K9vfMnfRN&CbYx1+eh}
z*sYJAgrXn}!$LG*0bFQ20*Z>g_g=9V6h*Nsc99~?|1ZYGn9DhmxZuvWnK!eW#k2jC
z?RhFq*XdOZd7TFARxG&<xQ+*|G2liX*k`~^JaE0h0+&o+fy1Md-;E9Rb+Ey$Gh2x_
zvh;d)v28!xzxzyPmv+M~dubv7JaJEifEPXp0?!u+0#9WL0(T_|14ju159dJeAz|Ro
z3<zE%5F7)+!6y?-Cl1ylKP}q@_vUprwb8~g1g3R2JIAv?mUK9(c;Ge7EetZj5e-fT
zK=6$M!RILWRA7Mx7PxfHA#0l&d=@IsUp}}ym9g}x!G%n5Bjtm8a`gYQK@j{90KwM^
z1jkVDJ_=q%!LuMZKLCQ?+d=T79|T`15PXD!cTn(3IpOf}Nj(00w;J^lw|>WE`UouW
zp9w6mzyb>_u)qQfEU>@=3*5j1`wY022d*|?7Z2<*V26hT_Bbkxs=W5YU*lzFzyg>!
xxcCJ~1%kq;Ku7>5;OAs#WEe(Z6pVsV001B)u}=Van{faD002ovPDHLkV1n4bx8VQ)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 1856644c3df..9e8e27cba22 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -621,16 +621,6 @@
     "Name": "Services",
     "Icon": "Icons/Services.png",
     "Samples": [
-      {
-        "Name": "Facebook Service",
-        "About": "The Facebook Service allows you to retrieve or publish data to Facebook graph.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Services/Services/Facebook",
-        "CodeFile": "FacebookCode.bind",
-        "Icon": "/SamplePages/Facebook Service/FacebookLogo.png",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "The underlying library, winsdkfb, which the FacebookService relies on is not currently maintained.",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/services/Facebook.md"
-      },
       {
         "Name": "Microsoft Graph Service",
         "About": "These providers help you easily authenticate and connect to the Microsoft Graph.",
diff --git a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
deleted file mode 100644
index b8407c5f573..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-
-  <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
-    <Title>Windows Community Toolkit Services</Title>
-    <Description>This library enables access to Facebook. It is part of the Windows Community Toolkit.</Description>
-    <PackageTags>UWP Toolkit Windows OAuth Facebook</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="winsdkfb" Version="0.12.20161020.4" />
-
-    <!-- This is here to prevent a conflict in certain circumstances -->
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj.DotSettings b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj.DotSettings
deleted file mode 100644
index 32e2a35dca4..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj.DotSettings
+++ /dev/null
@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cmicrosoftgraph_005Cmessage/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cmicrosoftgraph_005Cuser/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml b/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
deleted file mode 100644
index 154280e96c9..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Properties/Microsoft.Toolkit.Uwp.Services.rd.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Microsoft.Toolkit.Uwp.Services">
-  </Library>
-</Directives>
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookAlbum.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookAlbum.cs
deleted file mode 100644
index 2c61e42396f..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookAlbum.cs
+++ /dev/null
@@ -1,42 +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.Services.Facebook
-{
-    /// <summary>
-    /// Strongly types Facebook Album object. Partial for extending properties.
-    /// </summary>
-    public partial class FacebookAlbum
-    {
-        /// <summary>
-        /// Gets a string description of the strongly typed properties in this model.
-        /// </summary>
-        public static string Fields => "id, name, description, cover_photo, picture";
-
-        /// <summary>
-        /// Gets or sets id property.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets name property.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets description property.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets cover_photo property.
-        /// </summary>
-        public FacebookPhoto Cover_Photo { get; set; }
-
-        /// <summary>
-        /// Gets or sets picture property.
-        /// </summary>
-        public FacebookPictureData Picture { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataConfig.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataConfig.cs
deleted file mode 100644
index 06dbd8a9ec6..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataConfig.cs
+++ /dev/null
@@ -1,32 +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.Services.Facebook
-{
-    /// <summary>
-    /// Configuration object for specifying richer query information.
-    /// </summary>
-    public class FacebookDataConfig
-    {
-        /// <summary>
-        /// Gets a predefined config to get user feed. The feed of posts (including status updates) and links published by this person, or by others on this person's profile
-        /// </summary>
-        public static FacebookDataConfig MyFeed => new FacebookDataConfig { Query = "/me/feed" };
-
-        /// <summary>
-        /// Gets a predefined config to show only the posts that were published by this person
-        /// </summary>
-        public static FacebookDataConfig MyPosts => new FacebookDataConfig { Query = "/me/posts" };
-
-        /// <summary>
-        /// Gets a predefined config to show only the posts that this person was tagged in
-        /// </summary>
-        public static FacebookDataConfig MyTagged => new FacebookDataConfig { Query = "/me/tagged" };
-
-        /// <summary>
-        /// Gets or sets the query string for filtering service results.
-        /// </summary>
-        public string Query { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataHost.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataHost.cs
deleted file mode 100644
index e2a292487e2..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookDataHost.cs
+++ /dev/null
@@ -1,18 +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.Services.Facebook
-{
-    /// <summary>
-    /// Class used to store JSON data response from Facebook
-    /// </summary>
-    /// <typeparam name="T">Type of the inner data</typeparam>
-    internal class FacebookDataHost<T>
-    {
-        /// <summary>
-        /// Gets or sets internal data.
-        /// </summary>
-        public T Data { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookOAuthTokens.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookOAuthTokens.cs
deleted file mode 100644
index b3db6536110..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookOAuthTokens.cs
+++ /dev/null
@@ -1,22 +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.Services.Facebook
-{
-    /// <summary>
-    /// Facebook OAuth tokens.
-    /// </summary>
-    public class FacebookOAuthTokens
-    {
-        /// <summary>
-        /// Gets or sets facebook AppId.
-        /// </summary>
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Gets or sets Windows Store ID.
-        /// </summary>
-        public string WindowsStoreId { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPermissions.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPermissions.cs
deleted file mode 100644
index 907a4135fa1..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPermissions.cs
+++ /dev/null
@@ -1,120 +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;
-
-namespace Microsoft.Toolkit.Uwp.Services.Facebook
-{
-    /// <summary>
-    /// List of user related data permissions
-    /// </summary>
-    [Flags]
-    public enum FacebookPermissions
-    {
-        /// <summary>
-        /// Public profile
-        /// </summary>
-        PublicProfile = 1,
-
-        /// <summary>
-        /// Email
-        /// </summary>
-        Email = 2,
-
-        /// <summary>
-        /// Publish actions
-        /// </summary>
-        PublishActions = 4,
-
-        /// <summary>
-        /// About me
-        /// </summary>
-        UserAboutMe = 8,
-
-        /// <summary>
-        /// Birthday
-        /// </summary>
-        UserBirthday = 16,
-
-        /// <summary>
-        /// Education history
-        /// </summary>
-        UserEducationHistory = 32,
-
-        /// <summary>
-        /// Friends
-        /// </summary>
-        UserFriends = 64,
-
-        /// <summary>
-        /// Games activity
-        /// </summary>
-        UserGamesActivity = 128,
-
-        /// <summary>
-        /// Hometown
-        /// </summary>
-        UserHometown = 256,
-
-        /// <summary>
-        /// Likes
-        /// </summary>
-        UserLikes = 512,
-
-        /// <summary>
-        /// Location
-        /// </summary>
-        UserLocation = 1024,
-
-        /// <summary>
-        /// Photos
-        /// </summary>
-        UserPhotos = 2048,
-
-        /// <summary>
-        /// Posts
-        /// </summary>
-        UserPosts = 4096,
-
-        /// <summary>
-        /// Relationship details
-        /// </summary>
-        UserRelationshipDetails = 8192,
-
-        /// <summary>
-        /// Relationships
-        /// </summary>
-        UserRelationships = 16384,
-
-        /// <summary>
-        /// Religion and politics
-        /// </summary>
-        UserReligionPolitics = 32768,
-
-        /// <summary>
-        /// Status
-        /// </summary>
-        UserStatus = 65536,
-
-        /// <summary>
-        /// Tagged places
-        /// </summary>
-        UserTaggedPlaces = 131072,
-
-        /// <summary>
-        /// Videos
-        /// </summary>
-        UserVideos = 262144,
-
-        /// <summary>
-        /// Website
-        /// </summary>
-        UserWebsite = 524288,
-
-        /// <summary>
-        /// WorkHistory
-        /// </summary>
-        UserWorkHistory = 1048576
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPhoto.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPhoto.cs
deleted file mode 100644
index 0d1a0c9870d..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPhoto.cs
+++ /dev/null
@@ -1,55 +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 System.Collections.Generic;
-
-namespace Microsoft.Toolkit.Uwp.Services.Facebook
-{
-    /// <summary>
-    /// Strongly types Facebook Photo object. Partial for extending properties.
-    /// </summary>
-    public partial class FacebookPhoto
-    {
-        /// <summary>
-        /// Gets a string description of the strongly typed properties in this model.
-        /// </summary>
-        public static string Fields => "id, album, link, created_time, name, images, picture";
-
-        /// <summary>
-        /// Gets or sets id property.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets album property.
-        /// </summary>
-        public FacebookAlbum Album { get; set; }
-
-        /// <summary>
-        /// Gets or sets a link to the entity instance.
-        /// </summary>
-        public string Link { get; set; }
-
-        /// <summary>
-        /// Gets or sets time the entity instance was created.
-        /// </summary>
-        public DateTime Created_Time { get; set; }
-
-        /// <summary>
-        /// Gets or sets name property.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets images property.
-        /// </summary>
-        public List<FacebookPlatformImageSource> Images { get; set; }
-
-        /// <summary>
-        /// Gets or sets picture property.
-        /// </summary>
-        public string Picture { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPicture.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPicture.cs
deleted file mode 100644
index ccd38a0f874..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPicture.cs
+++ /dev/null
@@ -1,32 +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.Services.Facebook
-{
-    /// <summary>
-    /// Strongly typed object for presenting picture data returned from service provider.
-    /// </summary>
-    public class FacebookPicture
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the picture is a silhouette or not.
-        /// </summary>
-        public bool Is_Silhouette { get; set; }
-
-        /// <summary>
-        /// Gets or sets an url to the picture.
-        /// </summary>
-        public string Url { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ID of the picture.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the url of the page with the picture.
-        /// </summary>
-        public string Link { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPictureData.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPictureData.cs
deleted file mode 100644
index fb5398acfa1..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPictureData.cs
+++ /dev/null
@@ -1,17 +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.Services.Facebook
-{
-    /// <summary>
-    /// Strongly types Facebook Picture object. Partial for extending properties.
-    /// </summary>
-    public partial class FacebookPictureData
-    {
-        /// <summary>
-        /// Gets or sets data property.
-        /// </summary>
-        public FacebookPicture Data { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPlatformImageSource.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPlatformImageSource.cs
deleted file mode 100644
index 61e8077edec..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPlatformImageSource.cs
+++ /dev/null
@@ -1,32 +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.Services.Facebook
-{
-    /// <summary>
-    /// Strongly types Facebook PlatformImageSource object. Partial for extending properties.
-    /// </summary>
-    public partial class FacebookPlatformImageSource
-    {
-        /// <summary>
-        /// Gets a string description of the strongly typed properties in this model.
-        /// </summary>
-        public static string Fields => "height, source, width";
-
-        /// <summary>
-        /// Gets or sets height property.
-        /// </summary>
-        public string Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets source property.
-        /// </summary>
-        public string Source { get; set; }
-
-        /// <summary>
-        /// Gets or sets width property.
-        /// </summary>
-        public string Width { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPost.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPost.cs
deleted file mode 100644
index a452db85a94..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookPost.cs
+++ /dev/null
@@ -1,44 +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;
-
-namespace Microsoft.Toolkit.Uwp.Services.Facebook
-{
-    /// <summary>
-    /// Strongly typed object for presenting post data returned from service provider.
-    /// </summary>
-    public class FacebookPost
-    {
-        /// <summary>
-        /// Gets a string description of the strongly typed properties in this model.
-        /// </summary>
-        public static string Fields => "id, message, created_time, link, full_picture";
-
-        /// <summary>
-        /// Gets or sets id property.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets message or post text.
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets time the entity instance was created.
-        /// </summary>
-        public DateTime Created_Time { get; set; }
-
-        /// <summary>
-        /// Gets or sets a link to the entity instance.
-        /// </summary>
-        public string Link { get; set; }
-
-        /// <summary>
-        /// Gets or sets a link to the accompanying image.
-        /// </summary>
-        public string Full_Picture { get; set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
deleted file mode 100644
index a53679b9a4a..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookRequestSource.cs
+++ /dev/null
@@ -1,121 +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 System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Windows.Foundation.Collections;
-using winsdkfb;
-using winsdkfb.Graph;
-
-namespace Microsoft.Toolkit.Uwp.Services.Facebook
-{
-    /// <summary>
-    /// Type to handle paged requests to Facebook Graph.
-    /// </summary>
-    /// <typeparam name="T">Strong type to return.</typeparam>
-    public class FacebookRequestSource<T> : Collections.IIncrementalSource<T>
-    {
-        private bool _isFirstCall = true;
-
-        private FBPaginatedArray _paginatedArray;
-
-        private FacebookDataConfig _config;
-
-        private string _fields;
-
-        private PropertySet _propertySet;
-
-        private FBJsonClassFactory _factory;
-
-        private string _limit;
-
-        private int _maxPages;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FacebookRequestSource{T}"/> class.
-        /// </summary>
-        public FacebookRequestSource()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FacebookRequestSource{T}"/> class.
-        /// </summary>
-        /// <param name="config">Config containing query information.</param>
-        /// <param name="fields">Comma-separated list of properties expected in the JSON response.  Accompanying properties must be found on the strong-typed T.</param>
-        /// <param name="limit">A string representation of the number of records for page - i.e. pageSize.</param>
-        /// <param name="maxPages">Upper limit of pages to return.</param>
-        public FacebookRequestSource(FacebookDataConfig config, string fields, string limit, int maxPages)
-        {
-            _config = config;
-            _fields = fields;
-            _limit = limit;
-            _maxPages = maxPages;
-
-            _propertySet = new PropertySet { { "fields", _fields }, { "limit", _limit } };
-
-            _factory = new FBJsonClassFactory(s => JsonConvert.DeserializeObject(s, typeof(T)));
-
-            // FBPaginatedArray does not allow us to set page size per request so we must go with first supplied - see https://github.com/Microsoft/winsdkfb/issues/221
-            _paginatedArray = new FBPaginatedArray(_config.Query, _propertySet, _factory);
-        }
-
-        /// <summary>
-        /// Returns strong typed page of data.
-        /// </summary>
-        /// <param name="pageIndex">Page number.</param>
-        /// <param name="pageSize">Size of page.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>Strong typed page of data.</returns>
-        public async Task<IEnumerable<T>> GetPagedItemsAsync(int pageIndex, int pageSize, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (_isFirstCall)
-            {
-                var result = await _paginatedArray.FirstAsync();
-
-                return ProcessResult(result);
-            }
-            else
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return null;
-                }
-
-                if (_paginatedArray.HasNext && (pageIndex < _maxPages))
-                {
-                    var result = await _paginatedArray.NextAsync();
-                    return ProcessResult(result);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        private IEnumerable<T> ProcessResult(FBResult result)
-        {
-            List<T> items = new List<T>();
-
-            if (result.Succeeded)
-            {
-                IReadOnlyList<object> processedResults = (IReadOnlyList<object>)result.Object;
-
-                foreach (T processedResult in processedResults)
-                {
-                    items.Add(processedResult);
-                }
-
-                _isFirstCall = false;
-                return items;
-            }
-
-            throw new Exception(result.ErrorInfo?.Message);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
deleted file mode 100644
index fb3bedd36aa..00000000000
--- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs
+++ /dev/null
@@ -1,515 +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 System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.Foundation.Metadata;
-using Windows.Security.Authentication.Web;
-using Windows.Storage.Streams;
-using winsdkfb;
-using winsdkfb.Graph;
-
-namespace Microsoft.Toolkit.Uwp.Services.Facebook
-{
-    /// <summary>
-    /// Class for connecting to Facebook.
-    /// </summary>
-    [Obsolete("The underlying library, winsdkfb, which the FacebookService relies on is not currently maintained.")]
-    public class FacebookService
-    {
-        /// <summary>
-        /// Field for tracking initialization status.
-        /// </summary>
-        private bool isInitialized;
-
-        /// <summary>
-        /// List of permissions required by the app.
-        /// </summary>
-        private FBPermissions permissions;
-
-        /// <summary>
-        /// Gets a Windows Store ID associated with the current app
-        /// </summary>
-        public string WindowsStoreId => WebAuthenticationBroker.GetCurrentApplicationCallbackUri().ToString();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FacebookService"/> class.
-        /// </summary>
-        public FacebookService()
-        {
-        }
-
-        /// <summary>
-        /// Initialize underlying provider with relevant token information.
-        /// </summary>
-        /// <param name="oAuthTokens">Token instance.</param>
-        /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
-        /// <returns>Success or failure.</returns>
-        public bool Initialize(FacebookOAuthTokens oAuthTokens, FacebookPermissions requiredPermissions = FacebookPermissions.PublicProfile | FacebookPermissions.UserPosts)
-        {
-            if (oAuthTokens == null)
-            {
-                throw new ArgumentNullException(nameof(oAuthTokens));
-            }
-
-            return Initialize(oAuthTokens.AppId, requiredPermissions, oAuthTokens.WindowsStoreId);
-        }
-
-        /// <summary>
-        /// Initialize underlying provider with relevant token information.
-        /// </summary>
-        /// <param name="appId">Application ID (Provided by Facebook developer site)</param>
-        /// <param name="requiredPermissions">List of required required permissions. public_profile and user_posts permissions will be used by default.</param>
-        /// <param name="windowsStoreId">Windows Store SID</param>
-        /// <returns>Success or failure.</returns>
-        public bool Initialize(string appId, FacebookPermissions requiredPermissions = FacebookPermissions.PublicProfile | FacebookPermissions.UserPosts, string windowsStoreId = null)
-        {
-            if (string.IsNullOrEmpty(appId))
-            {
-                throw new ArgumentNullException(nameof(appId));
-            }
-
-            if (string.IsNullOrEmpty(windowsStoreId))
-            {
-                windowsStoreId = WindowsStoreId;
-            }
-
-            isInitialized = true;
-
-            Provider.FBAppId = appId;
-            Provider.WinAppId = windowsStoreId;
-
-            // Permissions
-            var permissionList = new List<string>();
-
-            foreach (FacebookPermissions value in Enum.GetValues(typeof(FacebookPermissions)))
-            {
-                if ((requiredPermissions & value) != 0)
-                {
-                    var name = value.ToString();
-                    var finalName = new StringBuilder();
-
-                    foreach (var c in name)
-                    {
-                        if (char.IsUpper(c))
-                        {
-                            if (finalName.Length > 0)
-                            {
-                                finalName.Append('_');
-                            }
-
-                            finalName.Append(char.ToLower(c));
-                        }
-                        else
-                        {
-                            finalName.Append(c);
-                        }
-                    }
-
-                    permissionList.Add(finalName.ToString());
-                }
-            }
-
-            permissions = new FBPermissions(permissionList);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Private singleton field.
-        /// </summary>
-        private static FacebookService instance;
-
-        /// <summary>
-        /// Gets public singleton property.
-        /// </summary>
-        public static FacebookService Instance => instance ?? (instance = new FacebookService());
-
-        /// <summary>
-        /// Gets a reference to an instance of the underlying data provider.
-        /// </summary>
-        public FBSession Provider
-        {
-            get
-            {
-                if (!isInitialized)
-                {
-                    throw new InvalidOperationException("Provider not initialized.");
-                }
-
-                return FBSession.ActiveSession;
-            }
-        }
-
-        /// <summary>
-        /// Gets the current logged user name.
-        /// </summary>
-        public string LoggedUser => !Provider.LoggedIn ? null : FBSession.ActiveSession.User.Name;
-
-        /// <summary>
-        /// Login with set of required requiredPermissions.
-        /// </summary>
-        /// <returns>Success or failure.</returns>
-        public async Task<bool> LoginAsync()
-        {
-            if (Provider != null)
-            {
-                var result = await Provider.LoginAsync(permissions, SessionLoginBehavior.WebView);
-
-                if (result.Succeeded)
-                {
-                    return true;
-                }
-
-                if (result.ErrorInfo != null)
-                {
-                    Debug.WriteLine(string.Format("Error logging in: {0}", result.ErrorInfo.Message));
-                }
-
-                return false;
-            }
-
-            Debug.WriteLine("Error logging in - no Active session found");
-            return false;
-        }
-
-        /// <summary>
-        /// Log out of the underlying service instance.
-        /// </summary>
-        /// <returns>Task to support await of async call.</returns>
-        public Task LogoutAsync()
-        {
-            return Provider.LogoutAsync().AsTask();
-        }
-
-        /// <summary>
-        /// Request list data from service provider based upon a given config / query.
-        /// </summary>
-        /// <param name="config">FacebookDataConfig instance.</param>
-        /// <param name="maxRecords">Upper limit of records to return.</param>
-        /// <returns>Strongly typed list of data returned from the service.</returns>
-        public Task<List<FacebookPost>> RequestAsync(FacebookDataConfig config, int maxRecords = 20)
-        {
-            return RequestAsync<FacebookPost>(config, maxRecords, FacebookPost.Fields);
-        }
-
-        /// <summary>
-        /// Request list data from service provider based upon a given config / query.
-        /// </summary>
-        /// <typeparam name="T">Strong type of model.</typeparam>
-        /// <param name="config">FacebookDataConfig instance.</param>
-        /// <param name="maxRecords">Upper limit of records to return.</param>
-        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
-        /// <returns>Strongly typed list of data returned from the service.</returns>
-        public async Task<List<T>> RequestAsync<T>(FacebookDataConfig config, int maxRecords = 20, string fields = "id,message,from,created_time,link,full_picture")
-        {
-            if (Provider.LoggedIn)
-            {
-                var requestSource = new FacebookRequestSource<T>(config, fields, maxRecords.ToString(), 1);
-
-                var list = await requestSource.GetPagedItemsAsync(0, maxRecords);
-
-                return new List<T>(list);
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await RequestAsync<T>(config, maxRecords, fields);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Request list data from service provider based upon a given config / query.
-        /// </summary>
-        /// <param name="config">FacebookDataConfig instance.</param>
-        /// <param name="pageSize">Upper limit of records to return.</param>
-        /// <param name="maxPages">Upper limit of pages to return.</param>
-        /// <returns>Strongly typed list of data returned from the service.</returns>
-        public Task<IncrementalLoadingCollection<FacebookRequestSource<FacebookPost>, FacebookPost>> RequestAsync(FacebookDataConfig config, int pageSize, int maxPages)
-        {
-            return RequestAsync<FacebookPost>(config, pageSize, maxPages, FacebookPost.Fields);
-        }
-
-        /// <summary>
-        /// Request generic list data from service provider based upon a given config / query.
-        /// </summary>
-        /// <typeparam name="T">Strong type of model.</typeparam>
-        /// <param name="config">FacebookDataConfig instance.</param>
-        /// <param name="pageSize">Upper limit of records to return.</param>
-        /// <param name="maxPages">Upper limit of pages to return.</param>
-        /// <param name="fields">A comma separated string of required fields, which will have strongly typed representation in the model passed in.</param>
-        /// <returns>Strongly typed list of data returned from the service.</returns>
-        public async Task<IncrementalLoadingCollection<FacebookRequestSource<T>, T>> RequestAsync<T>(FacebookDataConfig config, int pageSize, int maxPages, string fields = "id,message,from,created_time,link,full_picture")
-        {
-            if (Provider.LoggedIn)
-            {
-                var requestSource = new FacebookRequestSource<T>(config, fields, pageSize.ToString(), maxPages);
-
-                return new IncrementalLoadingCollection<FacebookRequestSource<T>, T>(requestSource);
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await RequestAsync<T>(config, pageSize, maxPages, fields);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the <see cref="FacebookPicture"/> object associated with the logged user
-        /// </summary>
-        /// <returns>A <see cref="FacebookPicture"/> object</returns>
-        public async Task<FacebookPicture> GetUserPictureInfoAsync()
-        {
-            if (Provider.LoggedIn)
-            {
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookDataHost<FacebookPicture>>);
-
-                PropertySet propertySet = new PropertySet { { "redirect", "0" } };
-                var singleValue = new FBSingleValue("/me/picture", propertySet, factory);
-
-                var result = await singleValue.GetAsync();
-
-                if (result.Succeeded)
-                {
-                    return ((FacebookDataHost<FacebookPicture>)result.Object).Data;
-                }
-
-                throw new Exception(result.ErrorInfo?.Message);
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await GetUserPictureInfoAsync();
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Retrieves list of user photo albums.
-        /// </summary>
-        /// <param name="maxRecords">Upper limit of records to return.</param>
-        /// <param name="fields">Custom list of Album fields to retrieve.</param>
-        /// <returns>List of User Photo Albums.</returns>
-        public async Task<List<FacebookAlbum>> GetUserAlbumsAsync(int maxRecords = 20, string fields = null)
-        {
-            fields = fields ?? FacebookAlbum.Fields;
-            var config = new FacebookDataConfig { Query = "/me/albums" };
-
-            return await RequestAsync<FacebookAlbum>(config, maxRecords, fields);
-        }
-
-        /// <summary>
-        /// Retrieves list of user photo albums.
-        /// </summary>
-        /// <param name="pageSize">Number of records to retrieve per page.</param>
-        /// <param name="maxPages">Upper limit of pages to return.</param>
-        /// <param name="fields">Custom list of Album fields to retrieve.</param>
-        /// <returns>List of User Photo Albums.</returns>
-        public async Task<IncrementalLoadingCollection<FacebookRequestSource<FacebookAlbum>, FacebookAlbum>> GetUserAlbumsAsync(int pageSize, int maxPages, string fields = null)
-        {
-            fields = fields ?? FacebookAlbum.Fields;
-            var config = new FacebookDataConfig { Query = "/me/albums" };
-
-            return await RequestAsync<FacebookAlbum>(config, pageSize, maxPages, fields);
-        }
-
-        /// <summary>
-        /// Retrieves list of user photos by album id.
-        /// </summary>
-        /// <param name="albumId">Albums Id for photos.</param>
-        /// <param name="maxRecords">Upper limit of records to return</param>
-        /// <param name="fields">Custom list of Photo fields to retrieve.</param>
-        /// <returns>List of User Photos.</returns>
-        public async Task<List<FacebookPhoto>> GetUserPhotosByAlbumIdAsync(string albumId, int maxRecords = 20, string fields = null)
-        {
-            fields = fields ?? FacebookPhoto.Fields;
-            var config = new FacebookDataConfig { Query = $"/{albumId}/photos" };
-
-            return await RequestAsync<FacebookPhoto>(config, maxRecords, fields);
-        }
-
-        /// <summary>
-        /// Retrieves list of user photos by album id.
-        /// </summary>
-        /// <param name="albumId">Albums Id for photos.</param>
-        /// <param name="pageSize">Number of records to retrieve per page.</param>
-        /// <param name="maxPages">Upper limit of pages to return.</param>
-        /// <param name="fields">Custom list of Photo fields to retrieve.</param>
-        /// <returns>List of User Photos.</returns>
-        public async Task<IncrementalLoadingCollection<FacebookRequestSource<FacebookPhoto>, FacebookPhoto>> GetUserPhotosByAlbumIdAsync(string albumId, int pageSize, int maxPages, string fields = null)
-        {
-            fields = fields ?? FacebookPhoto.Fields;
-            var config = new FacebookDataConfig { Query = $"/{albumId}/photos" };
-
-            return await RequestAsync<FacebookPhoto>(config, pageSize, maxPages, fields);
-        }
-
-        /// <summary>
-        /// Retrieves a photo by id.
-        /// </summary>
-        /// <param name="photoId">Photo Id for the photo.</param>
-        /// <returns>A single photo.</returns>
-        public async Task<FacebookPhoto> GetPhotoByPhotoIdAsync(string photoId)
-        {
-            if (Provider.LoggedIn)
-            {
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPhoto>);
-
-                PropertySet propertySet = new PropertySet { { "fields", "images" } };
-                var singleValue = new FBSingleValue($"/{photoId}", propertySet, factory);
-
-                var result = await singleValue.GetAsync();
-
-                if (result.Succeeded)
-                {
-                    return (FacebookPhoto)result.Object;
-                }
-
-                throw new Exception(result.ErrorInfo?.Message);
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await GetPhotoByPhotoIdAsync(photoId);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Enables direct posting data to the timeline.
-        /// </summary>
-        /// <param name="link">Link contained as part of the post. Cannot be null.</param>
-        /// <returns>Task to support await of async call.</returns>
-        [Deprecated("The underlying publish_action permission is no longer supported by Facebook. Please see https://developers.facebook.com/blog/post/2018/04/24/new-facebook-platform-product-changes-policy-updates/ for details.", DeprecationType.Deprecate, 4)]
-        public async Task<bool> PostToFeedAsync(string link)
-        {
-            if (Provider.LoggedIn)
-            {
-                var parameters = new PropertySet { { "link", link } };
-
-                string path = FBSession.ActiveSession.User.Id + "/feed";
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPost>);
-
-                var singleValue = new FBSingleValue(path, parameters, factory);
-                var result = await singleValue.PostAsync();
-                if (result.Succeeded)
-                {
-                    var postResponse = result.Object as FacebookPost;
-                    if (postResponse != null)
-                    {
-                        return true;
-                    }
-                }
-
-                Debug.WriteLine(string.Format("Could not post. {0}", result.ErrorInfo?.ErrorUserMessage));
-                return false;
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await PostToFeedAsync(link);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Enables posting data to the timeline using Facebook dialog.
-        /// </summary>
-        /// <param name="link">Link contained as part of the post. Cannot be null.</param>
-        /// <returns>Task to support await of async call.</returns>
-        public async Task<bool> PostToFeedWithDialogAsync(string link)
-        {
-            if (Provider.LoggedIn)
-            {
-                var parameters = new PropertySet { { "link", link } };
-
-                var result = await Provider.ShowFeedDialogAsync(parameters);
-
-                if (result.Succeeded)
-                {
-                    return true;
-                }
-
-                Debug.WriteLine(string.Format("Could not post. {0}", result.ErrorInfo?.ErrorUserMessage));
-                return false;
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await PostToFeedWithDialogAsync(link);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Enables posting a picture to the timeline
-        /// </summary>
-        /// <param name="title">Title of the post.</param>
-        /// <param name="pictureName">Picture name.</param>
-        /// <param name="pictureStream">Picture stream to upload.</param>
-        /// <returns>Return ID of the picture</returns>
-        [Deprecated("The underlying publish_action permission is no longer supported by Facebook. Please see https://developers.facebook.com/blog/post/2018/04/24/new-facebook-platform-product-changes-policy-updates/ for details.", DeprecationType.Deprecate, 4)]
-        public async Task<string> PostPictureToFeedAsync(string title, string pictureName, IRandomAccessStreamWithContentType pictureStream)
-        {
-            if (pictureStream == null)
-            {
-                return null;
-            }
-
-            if (Provider.LoggedIn)
-            {
-                var facebookPictureStream = new FBMediaStream(pictureName, pictureStream);
-                var parameters = new PropertySet
-                {
-                    { "source", facebookPictureStream },
-                    { "name", title }
-                };
-
-                string path = FBSession.ActiveSession.User.Id + "/photos";
-                var factory = new FBJsonClassFactory(JsonConvert.DeserializeObject<FacebookPicture>);
-
-                var singleValue = new FBSingleValue(path, parameters, factory);
-                var result = await singleValue.PostAsync();
-                if (result.Succeeded)
-                {
-                    var photoResponse = result.Object as FacebookPicture;
-                    if (photoResponse != null)
-                    {
-                        return photoResponse.Id;
-                    }
-                }
-
-                return null;
-            }
-
-            var isLoggedIn = await LoginAsync();
-            if (isLoggedIn)
-            {
-                return await PostPictureToFeedAsync(title, pictureName, pictureStream);
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e5f4ccbee..b9f6ee4728f 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F1AFFFA7-28FE-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B30036C4-D514-4E5B-A323-587A061772CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Services", "Microsoft.Toolkit.Uwp.Services\Microsoft.Toolkit.Uwp.Services.csproj", "{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj", "{DAEB9CEC-C817-33B2-74B2-BC379380DB72}"
@@ -90,7 +88,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Media", "Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnitTests.Shared", "UnitTests\UnitTests.Shared\UnitTests.Shared.shproj", "{4E9466D1-D5AA-46AC-801B-C8FDAB79F0D4}"
 EndProject
@@ -128,12 +126,11 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
-		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{efa96b3c-857e-4659-b942-6bef7719f4ca}*SharedItemsImports = 4
@@ -297,31 +294,6 @@ Global
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x64.Build.0 = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x86.ActiveCfg = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x86.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x64.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|ARM.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|x64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Native|x86.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM64.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x64.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x86.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x86.Build.0 = Release|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|ARM.ActiveCfg = Debug|Any CPU
diff --git a/readme.md b/readme.md
index 0db48418d7e..aef7bc42f2b 100644
--- a/readme.md
+++ b/readme.md
@@ -36,11 +36,10 @@ Once you do a search, you should see a list similar to the one below (versions m
 | Microsoft.Toolkit | .NET Standard NuGet package containing common code |
 | Microsoft.Toolkit.HighPerformance | .NET Standard and .NET Core NuGet package with performance oriented helpers, extensions, etc. |
 | Microsoft.Toolkit.Parsers | .NET Standard NuGet package containing cross-platform parsers, such as Markdown and RSS |
-| Microsoft.Toolkit.Services | .NET Standard NuGet package containing cross-platform services |
+| Microsoft.Toolkit.Services | .NET Standard NuGet package containing cross-platform services helpers, such as LinkedIn, Microsoft Graph, Twitter and more |
 | Microsoft.Toolkit.Uwp | Main NuGet package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. |
 | Microsoft.Toolkit.Uwp.Notifications | Notifications Package - Generate tile, toast, and badge notifications for Windows 10 via code.  Includes intellisense support to avoid having to use the XML syntax |
 | Microsoft.Toolkit.Uwp.Notifications.Javascript | Notification Packages for JavaScript |
-| Microsoft.Toolkit.Uwp.Services | Services Package - This NuGet package includes the service helpers for Facebook, LinkedIn, Microsoft Graph, Twitter and more |
 | Microsoft.Toolkit.Uwp.UI | UI Packages - XAML converters, Visual tree extensions, and other extensions and helpers for your XAML UI |
 | Microsoft.Toolkit.Uwp.UI.Animations | Animations and Composition behaviors such as Blur, Fade, Rotate, etc. |
 | Microsoft.Toolkit.Uwp.UI.Controls | XAML Controls such as RadialGauge, RangeSelector, etc. | 

From 3fc7dc7b4c18d7ee1ae7a740e00a004dc97492db Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 17 Aug 2020 11:55:34 -0700
Subject: [PATCH 389/595] Removed deprecated NotifyTaskCompletion and Singleton
 classes.

---
 .../Helpers/NotifyTaskCompletion.cs           | 141 ------------------
 Microsoft.Toolkit/Helpers/Singleton.cs        |  43 ------
 2 files changed, 184 deletions(-)
 delete mode 100644 Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
 delete mode 100644 Microsoft.Toolkit/Helpers/Singleton.cs

diff --git a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs b/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
deleted file mode 100644
index 0f9fb1f0610..00000000000
--- a/Microsoft.Toolkit/Helpers/NotifyTaskCompletion.cs
+++ /dev/null
@@ -1,141 +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 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 data binding scenarios. As discussed in MSDN Magazine: https://msdn.microsoft.com/magazine/dn605875.
-    /// </summary>
-    /// <typeparam name="TResult">Type of result returned by task.</typeparam>
-    [Obsolete("This helper will be removed in a future release, use the ObservableObject base class from Microsoft.Toolkit.Mvvm and the SetAndNotifyOnCompletion method")]
-    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 => Task.Status;
-
-        /// <summary>
-        /// Gets a value indicating whether the task is completed.
-        /// </summary>
-        public bool IsCompleted => Task.IsCompleted;
-
-        /// <summary>
-        /// Gets a value indicating whether the task is not completed.
-        /// </summary>
-        public bool IsNotCompleted => !Task.IsCompleted;
-
-        /// <summary>
-        /// Gets a value indicating whether the task was successfully completed.
-        /// </summary>
-        public bool IsSuccessfullyCompleted => Task.Status == TaskStatus.RanToCompletion;
-
-        /// <summary>
-        /// Gets a value indicating whether the task was cancelled.
-        /// </summary>
-        public bool IsCanceled => Task.IsCanceled;
-
-        /// <summary>
-        /// Gets a value indicating whether there was an error with the task.
-        /// </summary>
-        public bool IsFaulted => Task.IsFaulted;
-
-        /// <summary>
-        /// Gets the exception which occurred on the task (if one occurred).
-        /// </summary>
-        public AggregateException Exception => Task.Exception;
-
-        /// <summary>
-        /// Gets the inner exception of the task.
-        /// </summary>
-        public Exception InnerException => Exception?.InnerException;
-
-        /// <summary>
-        /// Gets the error message of the task.
-        /// </summary>
-        public string ErrorMessage => InnerException?.Message ?? Exception.Message;
-
-        /// <summary>
-        /// PropertyChanged event.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}
diff --git a/Microsoft.Toolkit/Helpers/Singleton.cs b/Microsoft.Toolkit/Helpers/Singleton.cs
deleted file mode 100644
index 63bd7044005..00000000000
--- a/Microsoft.Toolkit/Helpers/Singleton.cs
+++ /dev/null
@@ -1,43 +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 System.Collections.Concurrent;
-
-namespace Microsoft.Toolkit.Helpers
-{
-    /// <summary>
-    /// Obsolete see https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3134.
-    /// </summary>
-    /// <typeparam name="T">The type to be used for creating the Singleton instance.</typeparam>
-    /// <example>
-    /// Instead of this helper, migrate your code to this pattern instead:
-    /// <code>
-    /// // Setup Singleton
-    /// public class MyClass
-    /// {
-    ///     public static MyClass Instance { get; } = new MyClass();
-    /// }
-    /// </code>
-    /// </example>
-    [Obsolete("This helper will be removed in a future release, see example tag for code replacement. https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3134")]
-    public static class Singleton<T>
-        where T : new()
-    {
-        // Use ConcurrentDictionary for thread safety.
-        private static readonly ConcurrentDictionary<Type, T> _instances = new ConcurrentDictionary<Type, T>();
-
-        /// <summary>
-        /// Gets the instance of the Singleton class.
-        /// </summary>
-        public static T Instance
-        {
-            get
-            {
-                // Safely creates the first instance or retrieves the existing instance across threads.
-                return _instances.GetOrAdd(typeof(T), (t) => new T());
-            }
-        }
-    }
-}

From 02790ab33f862981bf641375d9924d64d4c78686 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 17 Aug 2020 23:33:55 +0200
Subject: [PATCH 390/595] Added IMessenger.Cleanup API (to help with
 extensibility)

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs |  8 ++++++++
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs  | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index a3838d2b117..e046d056c07 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -94,6 +94,14 @@ TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
+        /// <summary>
+        /// Performs a cleanup on the current messenger.
+        /// Invoking this method does not unregister any of the currently registered
+        /// recipient, and it can be used to perform cleanup operations such as
+        /// trimming the internal data structures of a messenger implementation.
+        /// </summary>
+        void Cleanup();
+
         /// <summary>
         /// Resets the <see cref="IMessenger"/> instance and unregisters all the existing recipients.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 8ead8d4b73b..f352fa364b2 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -480,6 +480,16 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             return message;
         }
 
+        /// <inheritdoc/>
+        void IMessenger.Cleanup()
+        {
+            // The current implementation doesn't require any kind of cleanup operation, as
+            // all the internal data structures are already kept in sync whenever a recipient
+            // is added or removed. This method is implemented through an explicit interface
+            // implementation so that developers using this type directly will not see it in
+            // the API surface (as it wouldn't be useful anyway, since it's a no-op here).
+        }
+
         /// <inheritdoc/>
         public void Reset()
         {

From 323cfd7b6364d74882fecb6ee25e2e988bde8dbe Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 17 Aug 2020 18:20:46 -0700
Subject: [PATCH 391/595] Created a new
 Microsoft.Toolkit.Uwp.UI.Controls.Markdown package, moving the
 MarkdownTextBlock from the Controls package and decoupling the TextToolbar
 from the MarkDownFormatter.

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   4 +
 .../Models/Sample.cs                          |  12 +
 .../EnumValuesExtensionPage.xaml.cs           |   4 +-
 .../InAppNotificationPage.xaml.cs             |   4 +-
 .../MarkdownParser/MarkdownParserPage.xaml    |   1 -
 .../TextToolbar/SampleFormatter.cs            |   7 +-
 .../SamplePages/TextToolbar/TextToolbar.bind  |  19 +-
 .../TextToolbar/TextToolbarCode.bind          |   3 +-
 .../TextToolbar/TextToolbarPage.xaml          |  23 +-
 .../TextToolbar/TextToolbarPage.xaml.cs       |  30 +--
 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj |   1 -
 .../TextToolbarMetadata.cs                    |   1 -
 .../Common/MetadataRegistrationBase.cs        | 252 ++++++++++++++++++
 .../Common/PlatformTypes.cs                   |  50 ++++
 .../Common/ToolboxCategoryPaths.cs            |  23 ++
 .../MarkdownTextBlockMetadata.cs              |   0
 .../MetadataRegistration.cs                   |  46 ++++
 ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 126 +++++++++
 .../Properties/AssemblyInfo.cs                |  35 +++
 .../Properties/Resources.Designer.cs          | 180 +++++++++++++
 .../Properties/Resources.resx                 | 159 +++++++++++
 .../Properties/Settings.Designer.cs           |  26 ++
 .../Properties/Settings.settings              |   7 +
 .../About.txt                                 |   0
 .../CodeBlockResolvingEventArgs.cs            |   0
 .../ImageResolvingEventArgs.cs                |   0
 .../MarkdownTextBlock/LinkClickedEventArgs.cs |   0
 .../MarkdownRenderedEventArgs.cs              |   0
 .../MarkdownTextBlock.Dimensions.cs           |   0
 .../MarkdownTextBlock.Events.cs               |   0
 .../MarkdownTextBlock.Methods.cs              |   0
 .../MarkdownTextBlock.Properties.cs           |   0
 .../MarkdownTextBlock/MarkdownTextBlock.cs    |   0
 .../MarkdownTextBlock/MarkdownTextBlock.xaml  |   0
 ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj |  49 ++++
 .../Render/ICodeBlockResolver.cs              |   0
 .../Render/IImageResolver.cs                  |   0
 .../Render/ILinkRegister.cs                   |   0
 .../Render/InlineRenderContext.cs             |   0
 .../Render/MarkdownRenderer.Blocks.cs         |   0
 .../Render/MarkdownRenderer.Dimensions.cs     |   0
 .../Render/MarkdownRenderer.Inlines.cs        |   0
 .../Render/MarkdownRenderer.Properties.cs     |   0
 .../Render/MarkdownRenderer.cs                |   0
 .../Render/MarkdownTable.cs                   |   0
 .../Render/RenderContext.cs                   |   0
 .../Render/RenderContextIncorrectException.cs |   0
 .../UIElementCollectionRenderContext.cs       |   0
 .../Formats/MarkDown/MarkDownButtonActions.cs |   0
 .../Formats/MarkDown/MarkDownFormatter.cs     |  24 +-
 .../Themes/Generic.xaml                       |   6 +
 .../VisualStudioToolsManifest.xml             |   7 +
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   6 +-
 .../TextToolbar/Formats/Format.cs             |  27 --
 .../TextToolbar/Formats/Formatter.cs          |  36 ++-
 .../Formats/RichText/RichTextFormatter.cs     |  12 +-
 .../TextToolbar/TextToolbar.Events.cs         |  24 +-
 .../TextToolbar/TextToolbar.Methods.cs        |  19 --
 .../TextToolbar/TextToolbar.Properties.cs     |  18 +-
 .../TextToolbar/TextToolbar.cs                |   7 +-
 ....cs => ToolbarFormatterActiveConverter.cs} |  20 +-
 .../Themes/Generic.xaml                       |   1 -
 .../VisualStudioToolsManifest.xml             |   1 -
 .../XamlIslandsTest_TextToolbar.cs            |   3 +-
 Windows Community Toolkit.sln                 |  74 ++++-
 65 files changed, 1157 insertions(+), 190 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design}/MarkdownTextBlockMetadata.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/About.txt (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/CodeBlockResolvingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/ImageResolvingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/LinkClickedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownRenderedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.Dimensions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.Methods.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/MarkdownTextBlock/MarkdownTextBlock.xaml (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/ICodeBlockResolver.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/IImageResolver.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/ILinkRegister.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/InlineRenderContext.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownRenderer.Blocks.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownRenderer.Dimensions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownRenderer.Inlines.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownRenderer.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownRenderer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/MarkdownTable.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/RenderContext.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/RenderContextIncorrectException.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/Render/UIElementCollectionRenderContext.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Markdown}/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs (96%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Themes/Generic.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
 rename Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/{ToolbarFormatActiveConverter.cs => ToolbarFormatterActiveConverter.cs} (60%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 6426c03d171..0a0eced3339 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1541,6 +1541,10 @@
       <Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj">
+      <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 9e21f19f9ba..e89c1a27cfe 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -727,6 +727,18 @@ private static Type LookForTypeByName(string typeName)
                 }
             }
 
+            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Markdown
+            var markdownTextBlockType = typeof(MarkdownTextBlock);
+            assembly = markdownTextBlockType.GetTypeInfo().Assembly;
+
+            foreach (var typeInfo in assembly.ExportedTypes)
+            {
+                if (typeInfo.Name == typeName)
+                {
+                    return typeInfo;
+                }
+            }
+
             return null;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
index c3313a47588..e85542823fc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml.cs
@@ -3,11 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.UI;
+using Microsoft.Toolkit.Uwp.SampleApp.Enums;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
-using Microsoft.Toolkit.Uwp.SampleApp.Enums;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
index b9e543948a7..49a219e3d5d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Windows.Input;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
index b495f34e9fc..657d20de2d7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
@@ -2,7 +2,6 @@
     x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MarkdownParserPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MarkdownParser"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/SampleFormatter.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/SampleFormatter.cs
index e6097a8e9e0..a98ff473a34 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/SampleFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/SampleFormatter.cs
@@ -11,9 +11,10 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples
 {
     public class SampleFormatter : Formatter
     {
-        public SampleFormatter(TextToolbar model)
-            : base(model)
+        public override void SetModel(TextToolbar model)
         {
+            base.SetModel(model);
+
             CommonButtons = new CommonButtons(model);
         }
 
@@ -31,6 +32,6 @@ public override ButtonMap DefaultButtons
             }
         }
 
-        private CommonButtons CommonButtons { get; }
+        private CommonButtons CommonButtons { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
index 2a47ec69320..5be1d7361ef 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
@@ -3,14 +3,17 @@
       xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+      xmlns:markDown="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown"
+      xmlns:richText="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText"
+      xmlns:textToolbarSamples="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
       mc:Ignorable="d">
 
   <Page.Resources>
-    <converters:ToolbarFormatActiveConverter x:Key="IsFormatMarkdown"
-                    Format="MarkDown" />
+    <converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
+                                                 FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
   </Page.Resources>
 
   <Grid x:Name="MainGrid"
@@ -22,9 +25,15 @@
     <controls:TextToolbar x:Name="Toolbar"
                           Editor="{Binding ElementName=EditZone}"
                           IsEnabled="@[IsEnabled:Bool:True]"
-                          Format="@[Format:Enum:Format.RichText]@"
                           UseURIChecker="@[UseURIChecker:Bool:True]"
-                          Background="#4C4F4F4F" />
+                          Background="#4C4F4F4F">
+      <controls:TextToolbar.Formatter>
+        <!-- Choose one -->
+        <richText:RichTextFormatter />
+        <!--<markDown:MarkDownFormatter />-->
+        <!--<textToolbarSamples:SampleFormatter />-->
+      </controls:TextToolbar.Formatter>
+    </controls:TextToolbar>
 
     <ScrollViewer Grid.Row="1">
       <Grid>
@@ -46,7 +55,7 @@
         <Grid x:Name="MD"
               Grid.Row="1"
               Margin="0, 16"
-              Visibility="{Binding Format, ElementName=Toolbar, Mode=OneWay, Converter={StaticResource IsFormatMarkdown}}">
+              Visibility="{Binding Formatter, ElementName=Toolbar, Mode=OneWay, Converter={StaticResource IsMarkdownFormatter}}">
           <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
index ca3ffadccf9..3b455448330 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
@@ -18,8 +18,7 @@ private void EditZone_TextChanged(object sender, Windows.UI.Xaml.RoutedEventArgs
 
 private void UseCustomFormatter()
 {
-    var formatter = new SampleFormatter(Toolbar);
-    Toolbar.Format = UI.Controls.TextToolbarFormats.Format.Custom;
+    var formatter = new SampleFormatter();
     Toolbar.Formatter = formatter;
 }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
index e832614adbe..8bf46959e0a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
@@ -3,17 +3,34 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+      xmlns:markDown="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown"
+      xmlns:richText="using:Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText"
+      xmlns:textToolbarSamples="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <Page.Resources>
-        <converters:ToolbarFormatActiveConverter x:Key="IsFormatMarkdown"
-                                                 Format="MarkDown" />
+        <converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
+                                                 FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
     </Page.Resources>
 
     <Grid>
-        <controls:TextToolbar />
+        <controls:TextToolbar>
+            <controls:TextToolbar.Formatter>
+                <richText:RichTextFormatter />
+            </controls:TextToolbar.Formatter>
+        </controls:TextToolbar>
+        <controls:TextToolbar>
+            <controls:TextToolbar.Formatter>
+                <markDown:MarkDownFormatter />
+            </controls:TextToolbar.Formatter>
+        </controls:TextToolbar>
+        <controls:TextToolbar>
+            <controls:TextToolbar.Formatter>
+                <textToolbarSamples:SampleFormatter />
+            </controls:TextToolbar.Formatter>
+        </controls:TextToolbar>
         <RichEditBox />
         <controls:MarkdownTextBlock />
     </Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
index 5ff226e6c7b..c2b25226d5f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -3,13 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.SampleApp.Models;
 using Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
-using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.System;
@@ -43,11 +39,6 @@ public void OnXamlRendered(FrameworkElement control)
                 _previewer = previewer;
                 _previewer.LinkClicked += Previewer_LinkClicked;
             }
-
-            if (ToolbarFormat != null && (Format)ToolbarFormat.Value == Format.Custom)
-            {
-                UseCustomFormatter();
-            }
         }
 
         private void Load()
@@ -99,13 +90,12 @@ private void ResetLayout()
 
         private void UseCustomFormatter()
         {
-            if (_toolbar == null || ToolbarFormat == null)
+            if (_toolbar == null)
             {
                 return;
             }
 
-            var formatter = new SampleFormatter(_toolbar);
-            ToolbarFormat.Value = Format.Custom;
+            var formatter = new SampleFormatter();
             _toolbar.Formatter = formatter;
         }
 
@@ -179,21 +169,5 @@ private void EditZone_TextChanged(object sender, RoutedEventArgs e)
         }
 
         private int DemoCounter { get; set; } = 0;
-
-        private ValueHolder ToolbarFormat
-        {
-            get
-            {
-                if (DataContext is Sample sample)
-                {
-                    if (sample.PropertyDescriptor.Expando is IDictionary<string, object> properties && properties.TryGetValue("Format", out var format))
-                    {
-                        return format as ValueHolder;
-                    }
-                }
-
-                return null;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
index b611399dd13..bd0548cfa0e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
@@ -98,7 +98,6 @@
     <Compile Include="InAppNotificationMetadata.cs" />
     <Compile Include="LayoutTransitionControlMetadata.cs" />
     <Compile Include="LoadingMetadata.cs" />
-    <Compile Include="MarkdownTextBlockMetadata.cs" />
     <Compile Include="MasterDetailsViewMetadata.cs" />
     <Compile Include="MenuItemMetadata.cs" />
     <Compile Include="MenuMetadata.cs" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs
index aebed58eba6..47b52f1dd14 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs
@@ -19,7 +19,6 @@ public TextToolbarMetadata()
 				b =>
 				{
                     b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TextToolbar.Format), new CategoryAttribute(Properties.Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(TextToolbar.Formatter), new CategoryAttribute(Properties.Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(TextToolbar.DefaultButtons), new CategoryAttribute(Properties.Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(TextToolbar.CustomButtons), new CategoryAttribute(Properties.Resources.CategoryCommon));
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
new file mode 100644
index 00000000000..dc6300e1a36
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
@@ -0,0 +1,252 @@
+// 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 Microsoft.Windows.Design.Metadata;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
+
+namespace Microsoft.Toolkit.Uwp.Design.Common
+{
+	public class MetadataRegistrationBase
+	{
+        private AttributeTable masterMetadataTable;
+
+        internal MetadataRegistrationBase() { }
+
+        /// <summary>
+		/// Build design time metadata attribute table.
+		/// </summary>
+		/// <returns>Custom attribute table.</returns>
+		protected virtual AttributeTable BuildAttributeTable()
+		{
+			AttributeTableBuilder builder = new AttributeTableBuilder();
+
+            AddDescriptions(builder);
+            AddAttributes(builder);
+            AddTables(builder, this);
+            masterMetadataTable = builder.CreateTable();
+			return masterMetadataTable;
+		}
+
+		/// <summary>
+		/// Find all AttributeTableBuilder subclasses in the assembly 
+		/// and add their attributes to the assembly attribute table.
+		/// </summary>
+		/// <param name="builder">The assembly attribute table builder.</param>
+		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
+		private void AddTables(AttributeTableBuilder builder, object parent)
+		{
+			Debug.Assert(builder != null, "AddTables is called with null parameter!");
+
+			Assembly asm = parent.GetType().Assembly;
+			foreach (Type t in asm.GetTypes())
+			{
+				if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
+				{
+					try
+					{
+                        AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t);
+                        builder.AddTable(atb.CreateTable());
+					}
+					catch (Exception)
+					{
+                        //error loading design assembly
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the case sensitive resource name of the embedded XML file.
+		/// </summary>
+		protected string XmlResourceName { get; set; }
+
+		/// <summary>
+		/// Gets or sets the FullName of the corresponding run time assembly.
+		/// </summary>
+		protected string AssemblyFullName { get; set; }
+
+		/// <summary>
+		/// Create description attribute from run time assembly xml file.
+		/// </summary>
+		/// <param name="builder">The assembly attribute table builder.</param>
+		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
+		private void AddDescriptions(AttributeTableBuilder builder)
+		{
+			Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
+
+			if (string.IsNullOrEmpty(XmlResourceName) ||
+				string.IsNullOrEmpty(AssemblyFullName))
+			{
+				return;
+			}
+			XDocument xdoc = null;
+			try
+			{
+				xdoc = XDocument.Load(new StreamReader(
+					Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)));
+			}
+			catch { return; }
+			if (xdoc == null)
+			{
+				return;
+			}
+
+			foreach (XElement member in xdoc.Descendants("member"))
+			{
+				try
+				{
+					string name = (string)member.Attribute("name");
+					if (name == null) 
+						continue;
+					bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
+					if (isType ||
+						name.StartsWith("P:", StringComparison.OrdinalIgnoreCase))
+					{
+						int lastDot = name.Length;
+						string typeName;
+						if (isType)
+						{
+							typeName = name.Substring(2); // skip leading "T:"
+						}
+						else
+						{
+							lastDot = name.LastIndexOf('.');
+							typeName = name.Substring(2, lastDot - 2);
+						}
+						typeName += AssemblyFullName;
+						
+						Type t = Type.GetType(typeName);
+						if (t != null && t.IsPublic && t.IsClass &&
+                            t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType))
+						{
+							string desc = ParseDescription(member);
+                            if (desc == null)
+                                continue;
+
+							desc = desc.Trim();
+							desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
+							if (isType)
+							{
+								bool isBrowsable = true;
+								try
+								{
+									isBrowsable = IsBrowsable(t);
+								}
+								catch { isBrowsable = false; }
+								if (isBrowsable)
+									builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc)));
+								else //Hide from intellisense
+								{
+									builder.AddCallback(t, b => b.AddCustomAttributes(
+										new BrowsableAttribute(false),
+										new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false),
+										new ToolboxItemAttribute(false)));
+								}
+							}
+							else
+							{
+								string propName = name.Substring(lastDot + 1);
+								PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+								if (pi != null)
+								{
+									bool isBrowsable = true;
+									try
+									{
+										isBrowsable = IsBrowsable(pi);
+									}
+									catch { isBrowsable = false; }
+									if(isBrowsable)
+										builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
+									else //Hide from intellisense
+										builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
+								}
+							}
+						}
+					}
+				}
+				catch (Exception)
+				{
+				}
+			}
+		}
+		private static bool IsBrowsable(Type t)
+		{
+			var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
+			foreach (var attr in attrs)
+			{
+                return Types.PlatformTypes.IsBrowsable(attr);
+			}
+			return true;
+		}
+
+		private static bool IsBrowsable(System.Reflection.PropertyInfo pi)
+		{
+            var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
+			foreach (var attr in attrs)
+			{
+                return Types.PlatformTypes.IsBrowsable(attr);
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Create description string from xml doc summary tag.
+		/// </summary>
+		/// <param name="member">A single node of the xml doc.</param>
+		/// <returns>Description string.</returns>
+		private static string ParseDescription(XElement member)
+		{
+			string desc = null;
+			XElement memberDesc = member.Descendants("summary").FirstOrDefault();
+
+			if (memberDesc != null)
+			{
+				IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
+
+				if (nodes != null)
+				{
+					foreach (XNode node in nodes)
+					{
+						if (node.NodeType == System.Xml.XmlNodeType.Text)
+						{
+							desc += node.ToString();
+						}
+						else
+						{
+							string s = node.ToString();
+							int i = s.LastIndexOf('.');
+							int j = s.LastIndexOf('"');
+
+							if ((i != -1 || j != -1) && j - i - 1 > 0)
+							{
+								try
+								{
+									desc += s.Substring(i + 1, j - i - 1);
+								}
+								catch { }
+							}
+						}
+					}
+				}
+			}
+			return desc;
+		}
+
+		/// <summary>
+		/// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
+		/// </summary>
+		/// <param name="builder">The assembly attribute table builder.</param>
+		protected virtual void AddAttributes(AttributeTableBuilder builder)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
new file mode 100644
index 00000000000..b8ce3304a08
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
@@ -0,0 +1,50 @@
+// 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.Windows.Design.Metadata;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.Design.Types
+{
+	internal class PlatformTypes
+	{
+		public static readonly Type DependencyObjectType = typeof(DependencyObject);
+		public static readonly Type UIElementType = typeof(UIElement);
+		public static readonly Type FrameworkElementType = typeof(FrameworkElement);
+		public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute);
+
+		/// <summary>
+		/// Used by MetadataRegistrationBase to get the browsable state
+		/// </summary>
+		/// <param name="editorBrowsableAttribute">This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute'</param>
+		/// <returns></returns>
+		public static bool IsBrowsable(object editorBrowsableAttribute)
+		{
+			if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute)
+				return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State !=
+					 System.ComponentModel.EditorBrowsableState.Never;
+			return true;
+		}
+
+		public static class Control
+		{
+			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
+			public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
+			public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
+			public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
+		}
+
+		public static class FrameworkElement
+		{
+			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
+			public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
+			public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
+			public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
+			public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
+			public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
+		}
+
+	}
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs
new file mode 100644
index 00000000000..acdacdd4c55
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs
@@ -0,0 +1,23 @@
+// 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.Diagnostics.CodeAnalysis;
+using System.Linq.Expressions;
+
+[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")]
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common
+{
+    /// <summary>
+    /// Names for ToolboxCategoryAttribute.
+    /// </summary>
+    internal static class ToolboxCategoryPaths
+    {
+        /// <summary>
+        /// Basic Controls category.
+        /// </summary>
+        public const string Toolkit = "Windows Community Toolkit";
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MarkdownTextBlockMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MarkdownTextBlockMetadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MarkdownTextBlockMetadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MarkdownTextBlockMetadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs
new file mode 100644
index 00000000000..5c0b0b2df70
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs
@@ -0,0 +1,46 @@
+// 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.Reflection;
+using Microsoft.Windows.Design.Metadata;
+using Microsoft.Toolkit.Uwp.Design.Common;
+
+[assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))]
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+	public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable
+	{
+		public MetadataRegistration() : base()
+		{
+			// Note:
+			// The default constructor sets value of AssemblyFullName and 
+			// XmlResourceName used by MetadataRegistrationBase.AddDescriptions().
+			// The convention here is that the <RootNamespace> in .design.csproj
+			// (or Default namespace in Project -> Properties -> Application tab)
+			// must be the same as runtime assembly's main namespace (t.Namespace)
+			// plus .Design.
+            Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock);
+			AssemblyName an = t.Assembly.GetName();
+			AssemblyFullName = ", " + an.FullName;
+			XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml";
+		}
+
+		#region IProvideAttributeTable Members
+
+		/// <summary>
+		/// Gets the AttributeTable for design time metadata.
+		/// </summary>
+		public AttributeTable AttributeTable
+		{
+			get
+			{
+				return BuildAttributeTable();
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
new file mode 100644
index 00000000000..a0fee831253
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{67FE47A0-CA93-4680-B770-A0A48C1DBC40}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design</RootNamespace>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.16299</AssetTargetFallback>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.16299\Design\</OutputPath>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.16299\Design\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.ObjectModel" />
+    <Reference Include="System.Runtime.WindowsRuntime" />
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
+    <Reference Include="Microsoft.Windows.Design.Extensibility">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Windows.Design.Interaction">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" Condition="'$(ExcludeRestorePackageImports)' != 'true'">
+      <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
+      <Private>False</Private>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Label="WinRT References">
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MarkdownTextBlockMetadata.cs" />
+    <Compile Include="MetadataRegistration.cs" />
+    <Compile Include="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="Common\PlatformTypes.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Common\ToolboxCategoryPaths.cs" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\$(Configuration)\uap10.0.16299\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml</Link>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="Pack">
+    <!-- No-op to avoid build error when packing solution from commandline -->
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..06b96fdf78d
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+// 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.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Windows Community Toolkit")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..e160035a377
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs
@@ -0,0 +1,180 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Appearance.
+        /// </summary>
+        internal static string CategoryAppearance {
+            get {
+                return ResourceManager.GetString("CategoryAppearance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Brush.
+        /// </summary>
+        internal static string CategoryBrush {
+            get {
+                return ResourceManager.GetString("CategoryBrush", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Common.
+        /// </summary>
+        internal static string CategoryCommon {
+            get {
+                return ResourceManager.GetString("CategoryCommon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Drop Shadow.
+        /// </summary>
+        internal static string CategoryDropShadow {
+            get {
+                return ResourceManager.GetString("CategoryDropShadow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Interactions.
+        /// </summary>
+        internal static string CategoryInteractions {
+            get {
+                return ResourceManager.GetString("CategoryInteractions", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Layout.
+        /// </summary>
+        internal static string CategoryLayout {
+            get {
+                return ResourceManager.GetString("CategoryLayout", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style - Code.
+        /// </summary>
+        internal static string CategoryMarkdownCodeStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownCodeStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style - Header {0}.
+        /// </summary>
+        internal static string CategoryMarkdownHeaderStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownHeaderStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style - List.
+        /// </summary>
+        internal static string CategoryMarkdownListStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownListStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style - Quote.
+        /// </summary>
+        internal static string CategoryMarkdownQuoteStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownQuoteStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style.
+        /// </summary>
+        internal static string CategoryMarkdownStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Markdown Style - Table.
+        /// </summary>
+        internal static string CategoryMarkdownTableStyle {
+            get {
+                return ResourceManager.GetString("CategoryMarkdownTableStyle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Text.
+        /// </summary>
+        internal static string CategoryText {
+            get {
+                return ResourceManager.GetString("CategoryText", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
new file mode 100644
index 00000000000..e8903ef43b7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CategoryAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="CategoryBrush" xml:space="preserve">
+    <value>Brush</value>
+  </data>
+  <data name="CategoryCommon" xml:space="preserve">
+    <value>Common</value>
+  </data>
+  <data name="CategoryDropShadow" xml:space="preserve">
+    <value>Drop Shadow</value>
+  </data>
+  <data name="CategoryInteractions" xml:space="preserve">
+    <value>Interactions</value>
+  </data>
+  <data name="CategoryLayout" xml:space="preserve">
+    <value>Layout</value>
+  </data>
+  <data name="CategoryMarkdownCodeStyle" xml:space="preserve">
+    <value>Markdown Style - Code</value>
+  </data>
+  <data name="CategoryMarkdownHeaderStyle" xml:space="preserve">
+    <value>Markdown Style - Header {0}</value>
+  </data>
+  <data name="CategoryMarkdownListStyle" xml:space="preserve">
+    <value>Markdown Style - List</value>
+  </data>
+  <data name="CategoryMarkdownQuoteStyle" xml:space="preserve">
+    <value>Markdown Style - Quote</value>
+  </data>
+  <data name="CategoryMarkdownStyle" xml:space="preserve">
+    <value>Markdown Style</value>
+  </data>
+  <data name="CategoryMarkdownTableStyle" xml:space="preserve">
+    <value>Markdown Style - Table</value>
+  </data>
+  <data name="CategoryText" xml:space="preserve">
+    <value>Text</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs
new file mode 100644
index 00000000000..662fe0ad430
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings
new file mode 100644
index 00000000000..033d7a5e9e2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/About.txt b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/About.txt
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/CodeBlockResolvingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/CodeBlockResolvingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/CodeBlockResolvingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/CodeBlockResolvingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/ImageResolvingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/ImageResolvingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/ImageResolvingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/ImageResolvingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/LinkClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/LinkClickedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/LinkClickedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/LinkClickedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownRenderedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownRenderedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownRenderedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownRenderedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Dimensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Dimensions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Dimensions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Dimensions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
new file mode 100644
index 00000000000..9fe9742d1a9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFramework>uap10.0.16299</TargetFramework>
+    <Title>Windows Community Toolkit Controls Markdown</Title>
+    <Description>
+      This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is part of the Windows Community Toolkit.
+    </Description>
+    <PackageTags>UWP Toolkit Windows Controls XAML Markdown MarkdownTextBlock</PackageTags>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="VisualStudioToolsManifest.xml" />
+    <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
+  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
+    <ItemGroup>
+      <GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
+    </ItemGroup>
+    <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
+    <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
+  </Target>
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/ICodeBlockResolver.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/ICodeBlockResolver.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/ICodeBlockResolver.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/ICodeBlockResolver.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/IImageResolver.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/IImageResolver.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/IImageResolver.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/IImageResolver.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/ILinkRegister.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/ILinkRegister.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/ILinkRegister.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/ILinkRegister.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/InlineRenderContext.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/InlineRenderContext.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/InlineRenderContext.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/InlineRenderContext.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Blocks.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Blocks.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Dimensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Dimensions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Dimensions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Dimensions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Inlines.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownRenderer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownTable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/MarkdownTable.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/RenderContext.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/RenderContext.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/RenderContext.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/RenderContext.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/RenderContextIncorrectException.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/RenderContextIncorrectException.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/RenderContextIncorrectException.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/RenderContextIncorrectException.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/UIElementCollectionRenderContext.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/Render/UIElementCollectionRenderContext.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
index a68de9da77a..75a714e1424 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
@@ -20,13 +20,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown
     /// </summary>
     public class MarkDownFormatter : Formatter
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MarkDownFormatter"/> class.
-        /// </summary>
-        /// <param name="model"><see cref="TextToolbar"/> where formatter will be used</param>
-        public MarkDownFormatter(TextToolbar model)
-            : base(model)
+        internal const string QuoteElement = "Quote";
+        internal const string HeadersElement = "Headers";
+        internal const string CodeElement = "Code";
+
+        /// <inheritdoc/>
+        public override void SetModel(TextToolbar model)
         {
+            base.SetModel(model);
+
             CommonButtons = new CommonButtons(model);
             ButtonActions = new MarkDownButtonActions(this);
         }
@@ -40,7 +42,7 @@ public void StyleHeader(ToolbarButton button)
             var list = new ListBox { Margin = new Thickness(0), Padding = new Thickness(0) };
             headerFlyout = new Flyout { Content = list };
 
-            if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
+            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && button.XamlRoot != null)
             {
                 headerFlyout.XamlRoot = button.XamlRoot;
             }
@@ -438,7 +440,7 @@ internal string OrderedListIterate()
             return ListLineIterator + ". ";
         }
 
-        private CommonButtons CommonButtons { get; }
+        private CommonButtons CommonButtons { get; set; }
 
         /// <inheritdoc/>
         public override string Text
@@ -459,7 +461,7 @@ public override ButtonMap DefaultButtons
                 OrderedListButton = OrderedListButton ?? CommonButtons.OrderedList;
                 QuoteButton = new ToolbarButton
                 {
-                    Name = TextToolbar.QuoteElement,
+                    Name = QuoteElement,
                     ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_QuoteLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Message },
                     Activation = FormatQuote
@@ -475,14 +477,14 @@ public override ButtonMap DefaultButtons
 
                     new ToolbarButton
                     {
-                        Name = TextToolbar.HeadersElement,
+                        Name = HeadersElement,
                         Icon = new SymbolIcon { Symbol = Symbol.FontSize },
                         ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_HeaderLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Activation = StyleHeader
                     },
                     new ToolbarButton
                     {
-                        Name = TextToolbar.CodeElement,
+                        Name = CodeElement,
                         ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_CodeLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Icon = new FontIcon { Glyph = "{}", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                         Activation = FormatCode
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Themes/Generic.xaml
new file mode 100644
index 00000000000..4ab8a3f39be
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Themes/Generic.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
new file mode 100644
index 00000000000..ce34feb76a6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
@@ -0,0 +1,7 @@
+<FileList>
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock.dll">
+    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
+    </ToolboxItems>
+  </File>
+</FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 6174415e0f3..c0d674762f4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -24,7 +24,6 @@
         - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export &amp; Import.
         - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
-        - MarkdownTextBlock: An efficient and extensible control that can parse and render markdown.
         - MasterDetailsView: Implements the Master/Details design pattern.
         - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
         - RadialGauge: Displays a value within a range, using a needle on a circular face.
@@ -46,11 +45,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+  
+  <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
deleted file mode 100644
index 76fa0c020e7..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Format.cs
+++ /dev/null
@@ -1,27 +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.TextToolbarFormats
-{
-    /// <summary>
-    /// Identifies the Format to be used by <see cref="TextToolbar"/>
-    /// </summary>
-    public enum Format
-    {
-        /// <summary>
-        /// Utilises the Built-In RichText Formatter
-        /// </summary>
-        RichText,
-
-        /// <summary>
-        /// Utilises the Built-In Markdown Formatter
-        /// </summary>
-        MarkDown,
-
-        /// <summary>
-        /// Utilises the provided Custom Formatter using the Formatter Property
-        /// </summary>
-        Custom
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
index 25669a72fe1..0a96ee41542 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
@@ -13,16 +13,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats
     /// </summary>
     public abstract class Formatter
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Formatter"/> class.
-        /// </summary>
-        /// <param name="model">The <see cref="TextToolbar"/>where Formatter is used</param>
-        public Formatter(TextToolbar model)
-        {
-            Model = model;
-            Model.EditorChanged += Model_EditorChanged;
-        }
-
         /// <summary>
         /// Called when text editor has changed
         /// </summary>
@@ -155,7 +145,31 @@ public virtual void OnSelectionChanged()
         /// <summary>
         /// Gets the source Toolbar
         /// </summary>
-        public TextToolbar Model { get; }
+        public TextToolbar Model { get; private set; }
+
+        /// <summary>
+        /// This method is called to unset event handlers that might have been registers by <see cref="SetModel(TextToolbar)"/>
+        /// </summary>
+        /// <param name="model">The old <see cref="TextToolbar"/> the Formatter was associated with</param>
+        public virtual void UnsetModel(TextToolbar model)
+        {
+            model.EditorChanged -= Model_EditorChanged;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TextToolbar"/> where the Formatter is used
+        /// </summary>
+        /// <param name="model">The <see cref="TextToolbar"/> where Formatter is used</param>
+        public virtual void SetModel(TextToolbar model)
+        {
+            if (Model != null)
+            {
+                Model.EditorChanged -= Model_EditorChanged;
+            }
+
+            Model = model;
+            Model.EditorChanged += Model_EditorChanged;
+        }
 
         /// <summary>
         /// Gets or sets a map of the Actions taken when a button is pressed. Required for Common Button actions (Unless you override both Activation and ShiftActivation)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
index 3523ef61193..6e792a24fd4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
@@ -16,13 +16,11 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText
     /// </summary>
     public class RichTextFormatter : Formatter
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RichTextFormatter"/> class.
-        /// </summary>
-        /// <param name="model">The <see cref="TextToolbar"/></param>
-        public RichTextFormatter(TextToolbar model)
-            : base(model)
+        /// <inheritdoc/>
+        public override void SetModel(TextToolbar model)
         {
+            base.SetModel(model);
+
             CommonButtons = new CommonButtons(model);
             ButtonActions = new RichTextButtonActions(this);
         }
@@ -88,7 +86,7 @@ public override void OnSelectionChanged()
             base.OnSelectionChanged();
         }
 
-        private CommonButtons CommonButtons { get; }
+        private CommonButtons CommonButtons { get; set; }
 
         /// <inheritdoc/>
         public override string Text
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
index 986346539ec..e74e5345cfb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
@@ -6,6 +6,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -45,7 +46,8 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
                 if (newEditor != null)
                 {
                     newEditor.AddHandler(KeyDownEvent, bar.KeyEventHandler, handledEventsToo: true);
-                    bar.CreateFormatter();
+                    bar.Formatter.SetModel(bar);
+                    bar.DefaultButtons = bar.Formatter.DefaultButtons;
                 }
 
                 var editorArgs = new EditorChangedArgs
@@ -58,20 +60,6 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
             }
         }
 
-        /// <summary>
-        /// Creates a new formatter, if it is a built-in formatter.
-        /// </summary>
-        /// <param name="obj">TextToolbar</param>
-        /// <param name="args">Property Changed Args</param>
-        private static void OnFormatTypeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
-            var bar = obj as TextToolbar;
-            if (bar != null)
-            {
-                bar.CreateFormatter();
-            }
-        }
-
         /// <summary>
         /// Rebuilds the Toolbar if the formatter changes during operation
         /// </summary>
@@ -82,6 +70,12 @@ private static void OnFormatterChanged(DependencyObject obj, DependencyPropertyC
             var bar = obj as TextToolbar;
             if (bar != null && bar.Formatter != null)
             {
+                if (args.OldValue is Formatter formatter)
+                {
+                    formatter.UnsetModel(bar);
+                }
+
+                bar.Formatter.SetModel(bar);
                 bar.DefaultButtons = bar.Formatter.DefaultButtons;
                 bar.BuildBar();
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
index 6c716756467..7d30afc9e3f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
@@ -4,8 +4,6 @@
 
 using System.Linq;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
-using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown;
-using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -35,23 +33,6 @@ public ToolbarButton GetDefaultButton(ButtonType button)
             return null;
         }
 
-        /// <summary>
-        /// Creates one of the Default formatters.
-        /// </summary>
-        private void CreateFormatter()
-        {
-            switch (Format)
-            {
-                case TextToolbarFormats.Format.MarkDown:
-                    Formatter = new MarkDownFormatter(this);
-                    break;
-
-                case TextToolbarFormats.Format.RichText:
-                    Formatter = new RichTextFormatter(this);
-                    break;
-            }
-        }
-
         /// <summary>
         /// Attaches all of the Default Buttons, Removing any that are to be removed, and inserting Custom buttons.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs
index c7f7148d0c1..a13b026de84 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs
@@ -4,6 +4,7 @@
 
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -21,17 +22,11 @@ public partial class TextToolbar
         public static readonly DependencyProperty EditorProperty =
             DependencyProperty.Register(nameof(Editor), typeof(RichEditBox), typeof(TextToolbar), new PropertyMetadata(null, OnEditorChanged));
 
-        /// <summary>
-        /// Identifies the <see cref="Format"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty FormatProperty =
-            DependencyProperty.Register(nameof(Format), typeof(Format), typeof(TextToolbar), new PropertyMetadata(Format.RichText, OnFormatTypeChanged));
-
         /// <summary>
         /// Identifies the <see cref="Formatter"/> dependency property.
         /// </summary>
         public static readonly DependencyProperty FormatterProperty =
-            DependencyProperty.Register(nameof(Formatter), typeof(Formatter), typeof(TextToolbar), new PropertyMetadata(null, OnFormatterChanged));
+            DependencyProperty.Register(nameof(Formatter), typeof(Formatter), typeof(TextToolbar), new PropertyMetadata(new RichTextFormatter(), OnFormatterChanged));
 
         /// <summary>
         /// Identifies the <see cref="DefaultButton"/> dependency property.
@@ -66,15 +61,6 @@ public RichEditBox Editor
             set { SetValue(EditorProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets which formatter to use, and which buttons to provide.
-        /// </summary>
-        public Format Format
-        {
-            get { return (Format)GetValue(FormatProperty); }
-            set { SetValue(FormatProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets the formatter instance which is used to format the text, using the buttons and shortcuts.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
index 55a850484b9..2cb3e50f530 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
-using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -20,12 +20,9 @@ public partial class TextToolbar : Control
         internal const string BoldElement = "Bold";
         internal const string ItalicsElement = "Italics";
         internal const string StrikethoughElement = "Strikethrough";
-        internal const string CodeElement = "Code";
-        internal const string QuoteElement = "Quote";
         internal const string LinkElement = "Link";
         internal const string ListElement = "List";
         internal const string OrderedElement = "OrderedList";
-        internal const string HeadersElement = "Headers";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TextToolbar"/> class.
@@ -48,7 +45,7 @@ protected override void OnApplyTemplate()
         {
             if (Formatter == null)
             {
-                CreateFormatter();
+                throw new InvalidOperationException("No formatter specificed.");
             }
             else
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatActiveConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
similarity index 60%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatActiveConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
index 672c8a8c1f4..0729753334b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatActiveConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
 
@@ -11,15 +11,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Converters
     /// <summary>
     /// Compares if Formats are equal and returns bool
     /// </summary>
-    public class ToolbarFormatActiveConverter : IValueConverter
+    public class ToolbarFormatterActiveConverter : IValueConverter
     {
         /// <inheritdoc/>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            if (value is Format)
+            if (value is Formatter formatter)
             {
-                CurrentFormat = (Format)value;
-                return CurrentFormat == Format;
+                CurrentFormatter = formatter.GetType();
+                return CurrentFormatter.ToString() == FormatterType;
             }
             else
             {
@@ -30,19 +30,19 @@ public object Convert(object value, Type targetType, object parameter, string la
         /// <inheritdoc/>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
-            if (CurrentFormat != null)
+            if (CurrentFormatter != null)
             {
-                return CurrentFormat;
+                return CurrentFormatter;
             }
 
             return value;
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="Format"/> to compare
+        /// Gets or sets the <see cref="Formatter"/>'s <see cref="Type"/> to compare
         /// </summary>
-        public Format Format { get; set; }
+        public string FormatterType { get; set; }
 
-        private Format? CurrentFormat { get; set; }
+        private Type CurrentFormatter { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 592fbb45626..e7a558a3fa3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -17,7 +17,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index e2bc71350ef..639e6c47c05 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -20,7 +20,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs
index 3d0a1a09bb8..e46d2546942 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs
@@ -34,8 +34,7 @@ await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
                 _textToolbar = new TextToolbar
                 {
                     Editor = richEditBox,
-                    IsEnabled = true,
-                    Format = Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.Format.RichText
+                    IsEnabled = true
                 };
 
                 var grid = new Grid
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e5f4ccbee..9b5efc43b8b 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -90,7 +90,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Media", "Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnitTests.Shared", "UnitTests\UnitTests.Shared\UnitTests.Shared.shproj", "{4E9466D1-D5AA-46AC-801B-C8FDAB79F0D4}"
 EndProject
@@ -125,15 +125,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
 		ThirdPartyNotices.txt = ThirdPartyNotices.txt
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj", "{6FEDF199-B052-49DD-8F3E-2A9224998E0F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
-		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{efa96b3c-857e-4659-b942-6bef7719f4ca}*SharedItemsImports = 4
@@ -656,6 +659,7 @@ Global
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.Build.0 = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.ActiveCfg = Release|x86
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.Build.0 = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.ActiveCfg = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|x86
@@ -679,6 +683,7 @@ Global
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.ActiveCfg = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.Build.0 = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.ActiveCfg = Release|x86
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.Build.0 = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.ActiveCfg = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.Build.0 = Release|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.ActiveCfg = Release|x86
@@ -853,15 +858,10 @@ Global
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Debug|x86.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -908,15 +908,10 @@ Global
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -1085,6 +1080,55 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Native|ARM.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Native|ARM64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Native|x64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Native|x86.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Native|Any CPU.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Native|ARM.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Native|ARM64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Native|x64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Native|x86.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1120,6 +1164,8 @@ Global
 		{C79029AF-2E9B-4466-BAC4-1A41B281EAE6} = {B30036C4-D514-4E5B-A323-587A061772CE}
 		{804D0681-52F6-4E61-864A-699F0AB44B20} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{88C6FFBE-322D-4CEA-842B-B2CB281D357D} = {CFA75BE0-5A44-45DE-8114-426A605B062B}
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From f429a78ad89f078e9d5dfc4b1dab90209312853f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 18 Aug 2020 13:19:12 +0200
Subject: [PATCH 392/595] Removed unnecessary using directive

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index e7da951eb73..5bf505fc6dc 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel

From be11d53bb25d4951a71568e92edfff26bd4f298c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 18 Aug 2020 13:24:09 +0200
Subject: [PATCH 393/595] Removed incorrect MethodImpl.NoInlining attribute

Quick-fix PR to remove an unnecessary `[MethodImpl(MethodImplOptions.NoInlining)]` attribute from a throw helper method.
That attribute caused the JIT not to see the throw in the body, resulting in the caller branch assuming the forward path being taken (the faulty one).
This produced worse codegen, as the non-faulting path was always forced to have an extra jump ahead.
---
 .../Collections/ObservableGroupedCollectionExtensions.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs b/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs
index 69e17bbc085..b52d778f560 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs
@@ -444,7 +444,6 @@ private static void RemoveItemAtWithLinq<TKey, TValue>(
         /// <summary>
         /// Throws a new <see cref="InvalidOperationException"/> when a key is not found.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForKeyNotFound()
         {
             throw new InvalidOperationException("The requested key was not present in the collection");

From f71cd1ae2aa1c34872057e6a35b7257eecc6ff08 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 18 Aug 2020 13:40:15 +0200
Subject: [PATCH 394/595] Improved codegen, moved throw code to external method

Also added a more detailed exception message for users
---
 .../ReadOnlyObservableGroupedCollection.cs           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
index 9ff14698586..661edda8ca2 100644
--- a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
+++ b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
@@ -52,8 +52,16 @@ private void OnSourceCollectionChanged(object sender, NotifyCollectionChangedEve
             // reporting the changes one by one. We consider only this case for now.
             if (e.OldItems?.Count > 1 || e.NewItems?.Count > 1)
             {
-                Debug.Fail("OldItems and NewItems should contain at most 1 item");
-                throw new NotSupportedException();
+                static void ThrowNotSupportedException()
+                {
+                    throw new NotSupportedException(
+                        "ReadOnlyObservableGroupedCollection<TKey, TValue> doesn't support operations on multiple items at once.\n" +
+                        "If this exception was thrown, it likely means support for batched item updates has been added to the " +
+                        "underlying ObservableCollection<T> type, and this implementation doesn't support that feature yet.\n" +
+                        "Please consider opening an issue in https://github.com/windows-toolkit/WindowsCommunityToolkit to report this.");
+                }
+
+                ThrowNotSupportedException();
             }
 
             var newItem = e.NewItems?.Cast<ObservableGroup<TKey, TValue>>()?.FirstOrDefault();

From bac2461199d171c581f56220edf24b69a19a32a8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 18 Aug 2020 10:38:32 -0700
Subject: [PATCH 395/595] Fixed indentation o design projects.

---
 .../Common/MetadataRegistrationBase.cs        |   6 +-
 .../Common/MetadataRegistrationBase.cs        | 408 +++++++++---------
 .../Common/PlatformTypes.cs                   |  71 ++-
 .../Common/MetadataRegistrationBase.cs        | 408 +++++++++---------
 .../Common/PlatformTypes.cs                   |  71 ++-
 5 files changed, 481 insertions(+), 483 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs
index 3572c5209a7..733b19ca7ce 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs
@@ -105,7 +105,7 @@ private void AddDescriptions(AttributeTableBuilder builder)
                 try
                 {
                     string name = (string)member.Attribute("name");
-                    if (name == null) 
+                    if (name == null)
                         continue;
                     bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
                     if (isType ||
@@ -123,7 +123,7 @@ private void AddDescriptions(AttributeTableBuilder builder)
                             typeName = name.Substring(2, lastDot - 2);
                         }
                         typeName += AssemblyFullName;
-                        
+
                         Type t = Type.GetType(typeName);
                         if (t != null && t.IsPublic && t.IsClass &&
                             t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType))
@@ -164,7 +164,7 @@ private void AddDescriptions(AttributeTableBuilder builder)
                                         isBrowsable = IsBrowsable(pi);
                                     }
                                     catch { isBrowsable = false; }
-                                    if(isBrowsable)
+                                    if (isBrowsable)
                                         builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
                                     else //Hide from intellisense
                                         builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs
index dc6300e1a36..ffcec2e7184 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs
@@ -15,8 +15,8 @@
 
 namespace Microsoft.Toolkit.Uwp.Design.Common
 {
-	public class MetadataRegistrationBase
-	{
+    public class MetadataRegistrationBase
+    {
         private AttributeTable masterMetadataTable;
 
         internal MetadataRegistrationBase() { }
@@ -26,227 +26,227 @@ internal MetadataRegistrationBase() { }
 		/// </summary>
 		/// <returns>Custom attribute table.</returns>
 		protected virtual AttributeTable BuildAttributeTable()
-		{
-			AttributeTableBuilder builder = new AttributeTableBuilder();
+        {
+            AttributeTableBuilder builder = new AttributeTableBuilder();
 
             AddDescriptions(builder);
             AddAttributes(builder);
             AddTables(builder, this);
             masterMetadataTable = builder.CreateTable();
-			return masterMetadataTable;
-		}
+            return masterMetadataTable;
+        }
 
-		/// <summary>
-		/// Find all AttributeTableBuilder subclasses in the assembly 
-		/// and add their attributes to the assembly attribute table.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
-		private void AddTables(AttributeTableBuilder builder, object parent)
-		{
-			Debug.Assert(builder != null, "AddTables is called with null parameter!");
-
-			Assembly asm = parent.GetType().Assembly;
-			foreach (Type t in asm.GetTypes())
-			{
-				if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
-				{
-					try
-					{
+        /// <summary>
+        /// Find all AttributeTableBuilder subclasses in the assembly 
+        /// and add their attributes to the assembly attribute table.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
+        private void AddTables(AttributeTableBuilder builder, object parent)
+        {
+            Debug.Assert(builder != null, "AddTables is called with null parameter!");
+
+            Assembly asm = parent.GetType().Assembly;
+            foreach (Type t in asm.GetTypes())
+            {
+                if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
+                {
+                    try
+                    {
                         AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t);
                         builder.AddTable(atb.CreateTable());
-					}
-					catch (Exception)
-					{
+                    }
+                    catch (Exception)
+                    {
                         //error loading design assembly
-					}
-				}
-			}
-		}
+                    }
+                }
+            }
+        }
 
-		/// <summary>
-		/// Gets or sets the case sensitive resource name of the embedded XML file.
-		/// </summary>
-		protected string XmlResourceName { get; set; }
+        /// <summary>
+        /// Gets or sets the case sensitive resource name of the embedded XML file.
+        /// </summary>
+        protected string XmlResourceName { get; set; }
 
-		/// <summary>
-		/// Gets or sets the FullName of the corresponding run time assembly.
-		/// </summary>
-		protected string AssemblyFullName { get; set; }
+        /// <summary>
+        /// Gets or sets the FullName of the corresponding run time assembly.
+        /// </summary>
+        protected string AssemblyFullName { get; set; }
 
-		/// <summary>
-		/// Create description attribute from run time assembly xml file.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
-		private void AddDescriptions(AttributeTableBuilder builder)
-		{
-			Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
-
-			if (string.IsNullOrEmpty(XmlResourceName) ||
-				string.IsNullOrEmpty(AssemblyFullName))
-			{
-				return;
-			}
-			XDocument xdoc = null;
-			try
-			{
-				xdoc = XDocument.Load(new StreamReader(
-					Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)));
-			}
-			catch { return; }
-			if (xdoc == null)
-			{
-				return;
-			}
-
-			foreach (XElement member in xdoc.Descendants("member"))
-			{
-				try
-				{
-					string name = (string)member.Attribute("name");
-					if (name == null) 
-						continue;
-					bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
-					if (isType ||
-						name.StartsWith("P:", StringComparison.OrdinalIgnoreCase))
-					{
-						int lastDot = name.Length;
-						string typeName;
-						if (isType)
-						{
-							typeName = name.Substring(2); // skip leading "T:"
-						}
-						else
-						{
-							lastDot = name.LastIndexOf('.');
-							typeName = name.Substring(2, lastDot - 2);
-						}
-						typeName += AssemblyFullName;
-						
-						Type t = Type.GetType(typeName);
-						if (t != null && t.IsPublic && t.IsClass &&
+        /// <summary>
+        /// Create description attribute from run time assembly xml file.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
+        private void AddDescriptions(AttributeTableBuilder builder)
+        {
+            Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
+
+            if (string.IsNullOrEmpty(XmlResourceName) ||
+                string.IsNullOrEmpty(AssemblyFullName))
+            {
+                return;
+            }
+            XDocument xdoc = null;
+            try
+            {
+                xdoc = XDocument.Load(new StreamReader(
+                    Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)));
+            }
+            catch { return; }
+            if (xdoc == null)
+            {
+                return;
+            }
+
+            foreach (XElement member in xdoc.Descendants("member"))
+            {
+                try
+                {
+                    string name = (string)member.Attribute("name");
+                    if (name == null)
+                        continue;
+                    bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
+                    if (isType ||
+                        name.StartsWith("P:", StringComparison.OrdinalIgnoreCase))
+                    {
+                        int lastDot = name.Length;
+                        string typeName;
+                        if (isType)
+                        {
+                            typeName = name.Substring(2); // skip leading "T:"
+                        }
+                        else
+                        {
+                            lastDot = name.LastIndexOf('.');
+                            typeName = name.Substring(2, lastDot - 2);
+                        }
+                        typeName += AssemblyFullName;
+
+                        Type t = Type.GetType(typeName);
+                        if (t != null && t.IsPublic && t.IsClass &&
                             t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType))
-						{
-							string desc = ParseDescription(member);
+                        {
+                            string desc = ParseDescription(member);
                             if (desc == null)
                                 continue;
 
-							desc = desc.Trim();
-							desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
-							if (isType)
-							{
-								bool isBrowsable = true;
-								try
-								{
-									isBrowsable = IsBrowsable(t);
-								}
-								catch { isBrowsable = false; }
-								if (isBrowsable)
-									builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc)));
-								else //Hide from intellisense
-								{
-									builder.AddCallback(t, b => b.AddCustomAttributes(
-										new BrowsableAttribute(false),
-										new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false),
-										new ToolboxItemAttribute(false)));
-								}
-							}
-							else
-							{
-								string propName = name.Substring(lastDot + 1);
-								PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-								if (pi != null)
-								{
-									bool isBrowsable = true;
-									try
-									{
-										isBrowsable = IsBrowsable(pi);
-									}
-									catch { isBrowsable = false; }
-									if(isBrowsable)
-										builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
-									else //Hide from intellisense
-										builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
-								}
-							}
-						}
-					}
-				}
-				catch (Exception)
-				{
-				}
-			}
-		}
-		private static bool IsBrowsable(Type t)
-		{
-			var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
-			foreach (var attr in attrs)
-			{
+                            desc = desc.Trim();
+                            desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
+                            if (isType)
+                            {
+                                bool isBrowsable = true;
+                                try
+                                {
+                                    isBrowsable = IsBrowsable(t);
+                                }
+                                catch { isBrowsable = false; }
+                                if (isBrowsable)
+                                    builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc)));
+                                else //Hide from intellisense
+                                {
+                                    builder.AddCallback(t, b => b.AddCustomAttributes(
+                                        new BrowsableAttribute(false),
+                                        new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false),
+                                        new ToolboxItemAttribute(false)));
+                                }
+                            }
+                            else
+                            {
+                                string propName = name.Substring(lastDot + 1);
+                                PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+                                if (pi != null)
+                                {
+                                    bool isBrowsable = true;
+                                    try
+                                    {
+                                        isBrowsable = IsBrowsable(pi);
+                                    }
+                                    catch { isBrowsable = false; }
+                                    if (isBrowsable)
+                                        builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
+                                    else //Hide from intellisense
+                                        builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+        private static bool IsBrowsable(Type t)
+        {
+            var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
+            foreach (var attr in attrs)
+            {
                 return Types.PlatformTypes.IsBrowsable(attr);
-			}
-			return true;
-		}
+            }
+            return true;
+        }
 
-		private static bool IsBrowsable(System.Reflection.PropertyInfo pi)
-		{
+        private static bool IsBrowsable(System.Reflection.PropertyInfo pi)
+        {
             var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
-			foreach (var attr in attrs)
-			{
+            foreach (var attr in attrs)
+            {
                 return Types.PlatformTypes.IsBrowsable(attr);
-			}
-			return true;
-		}
+            }
+            return true;
+        }
 
-		/// <summary>
-		/// Create description string from xml doc summary tag.
-		/// </summary>
-		/// <param name="member">A single node of the xml doc.</param>
-		/// <returns>Description string.</returns>
-		private static string ParseDescription(XElement member)
-		{
-			string desc = null;
-			XElement memberDesc = member.Descendants("summary").FirstOrDefault();
-
-			if (memberDesc != null)
-			{
-				IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
-
-				if (nodes != null)
-				{
-					foreach (XNode node in nodes)
-					{
-						if (node.NodeType == System.Xml.XmlNodeType.Text)
-						{
-							desc += node.ToString();
-						}
-						else
-						{
-							string s = node.ToString();
-							int i = s.LastIndexOf('.');
-							int j = s.LastIndexOf('"');
-
-							if ((i != -1 || j != -1) && j - i - 1 > 0)
-							{
-								try
-								{
-									desc += s.Substring(i + 1, j - i - 1);
-								}
-								catch { }
-							}
-						}
-					}
-				}
-			}
-			return desc;
-		}
-
-		/// <summary>
-		/// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		protected virtual void AddAttributes(AttributeTableBuilder builder)
-		{
-		}
-	}
+        /// <summary>
+        /// Create description string from xml doc summary tag.
+        /// </summary>
+        /// <param name="member">A single node of the xml doc.</param>
+        /// <returns>Description string.</returns>
+        private static string ParseDescription(XElement member)
+        {
+            string desc = null;
+            XElement memberDesc = member.Descendants("summary").FirstOrDefault();
+
+            if (memberDesc != null)
+            {
+                IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
+
+                if (nodes != null)
+                {
+                    foreach (XNode node in nodes)
+                    {
+                        if (node.NodeType == System.Xml.XmlNodeType.Text)
+                        {
+                            desc += node.ToString();
+                        }
+                        else
+                        {
+                            string s = node.ToString();
+                            int i = s.LastIndexOf('.');
+                            int j = s.LastIndexOf('"');
+
+                            if ((i != -1 || j != -1) && j - i - 1 > 0)
+                            {
+                                try
+                                {
+                                    desc += s.Substring(i + 1, j - i - 1);
+                                }
+                                catch { }
+                            }
+                        }
+                    }
+                }
+            }
+            return desc;
+        }
+
+        /// <summary>
+        /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        protected virtual void AddAttributes(AttributeTableBuilder builder)
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs
index b8ce3304a08..30196482c4c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs
@@ -8,43 +8,42 @@
 
 namespace Microsoft.Toolkit.Uwp.Design.Types
 {
-	internal class PlatformTypes
-	{
-		public static readonly Type DependencyObjectType = typeof(DependencyObject);
-		public static readonly Type UIElementType = typeof(UIElement);
-		public static readonly Type FrameworkElementType = typeof(FrameworkElement);
-		public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute);
+    internal class PlatformTypes
+    {
+        public static readonly Type DependencyObjectType = typeof(DependencyObject);
+        public static readonly Type UIElementType = typeof(UIElement);
+        public static readonly Type FrameworkElementType = typeof(FrameworkElement);
+        public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute);
 
-		/// <summary>
-		/// Used by MetadataRegistrationBase to get the browsable state
-		/// </summary>
-		/// <param name="editorBrowsableAttribute">This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute'</param>
-		/// <returns></returns>
-		public static bool IsBrowsable(object editorBrowsableAttribute)
-		{
-			if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute)
-				return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State !=
-					 System.ComponentModel.EditorBrowsableState.Never;
-			return true;
-		}
+        /// <summary>
+        /// Used by MetadataRegistrationBase to get the browsable state
+        /// </summary>
+        /// <param name="editorBrowsableAttribute">This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute'</param>
+        /// <returns></returns>
+        public static bool IsBrowsable(object editorBrowsableAttribute)
+        {
+            if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute)
+                return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State !=
+                     System.ComponentModel.EditorBrowsableState.Never;
+            return true;
+        }
 
-		public static class Control
-		{
-			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
-			public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
-			public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
-			public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
-		}
+        public static class Control
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
+            public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
+            public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
+            public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
+        }
 
-		public static class FrameworkElement
-		{
-			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
-			public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
-			public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
-			public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
-			public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
-			public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
-		}
-
-	}
+        public static class FrameworkElement
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
+            public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
+            public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
+            public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
+            public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
+            public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
+        }
+    }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
index dc6300e1a36..ffcec2e7184 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs
@@ -15,8 +15,8 @@
 
 namespace Microsoft.Toolkit.Uwp.Design.Common
 {
-	public class MetadataRegistrationBase
-	{
+    public class MetadataRegistrationBase
+    {
         private AttributeTable masterMetadataTable;
 
         internal MetadataRegistrationBase() { }
@@ -26,227 +26,227 @@ internal MetadataRegistrationBase() { }
 		/// </summary>
 		/// <returns>Custom attribute table.</returns>
 		protected virtual AttributeTable BuildAttributeTable()
-		{
-			AttributeTableBuilder builder = new AttributeTableBuilder();
+        {
+            AttributeTableBuilder builder = new AttributeTableBuilder();
 
             AddDescriptions(builder);
             AddAttributes(builder);
             AddTables(builder, this);
             masterMetadataTable = builder.CreateTable();
-			return masterMetadataTable;
-		}
+            return masterMetadataTable;
+        }
 
-		/// <summary>
-		/// Find all AttributeTableBuilder subclasses in the assembly 
-		/// and add their attributes to the assembly attribute table.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
-		private void AddTables(AttributeTableBuilder builder, object parent)
-		{
-			Debug.Assert(builder != null, "AddTables is called with null parameter!");
-
-			Assembly asm = parent.GetType().Assembly;
-			foreach (Type t in asm.GetTypes())
-			{
-				if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
-				{
-					try
-					{
+        /// <summary>
+        /// Find all AttributeTableBuilder subclasses in the assembly 
+        /// and add their attributes to the assembly attribute table.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
+        private void AddTables(AttributeTableBuilder builder, object parent)
+        {
+            Debug.Assert(builder != null, "AddTables is called with null parameter!");
+
+            Assembly asm = parent.GetType().Assembly;
+            foreach (Type t in asm.GetTypes())
+            {
+                if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
+                {
+                    try
+                    {
                         AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t);
                         builder.AddTable(atb.CreateTable());
-					}
-					catch (Exception)
-					{
+                    }
+                    catch (Exception)
+                    {
                         //error loading design assembly
-					}
-				}
-			}
-		}
+                    }
+                }
+            }
+        }
 
-		/// <summary>
-		/// Gets or sets the case sensitive resource name of the embedded XML file.
-		/// </summary>
-		protected string XmlResourceName { get; set; }
+        /// <summary>
+        /// Gets or sets the case sensitive resource name of the embedded XML file.
+        /// </summary>
+        protected string XmlResourceName { get; set; }
 
-		/// <summary>
-		/// Gets or sets the FullName of the corresponding run time assembly.
-		/// </summary>
-		protected string AssemblyFullName { get; set; }
+        /// <summary>
+        /// Gets or sets the FullName of the corresponding run time assembly.
+        /// </summary>
+        protected string AssemblyFullName { get; set; }
 
-		/// <summary>
-		/// Create description attribute from run time assembly xml file.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
-		private void AddDescriptions(AttributeTableBuilder builder)
-		{
-			Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
-
-			if (string.IsNullOrEmpty(XmlResourceName) ||
-				string.IsNullOrEmpty(AssemblyFullName))
-			{
-				return;
-			}
-			XDocument xdoc = null;
-			try
-			{
-				xdoc = XDocument.Load(new StreamReader(
-					Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)));
-			}
-			catch { return; }
-			if (xdoc == null)
-			{
-				return;
-			}
-
-			foreach (XElement member in xdoc.Descendants("member"))
-			{
-				try
-				{
-					string name = (string)member.Attribute("name");
-					if (name == null) 
-						continue;
-					bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
-					if (isType ||
-						name.StartsWith("P:", StringComparison.OrdinalIgnoreCase))
-					{
-						int lastDot = name.Length;
-						string typeName;
-						if (isType)
-						{
-							typeName = name.Substring(2); // skip leading "T:"
-						}
-						else
-						{
-							lastDot = name.LastIndexOf('.');
-							typeName = name.Substring(2, lastDot - 2);
-						}
-						typeName += AssemblyFullName;
-						
-						Type t = Type.GetType(typeName);
-						if (t != null && t.IsPublic && t.IsClass &&
+        /// <summary>
+        /// Create description attribute from run time assembly xml file.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
+        private void AddDescriptions(AttributeTableBuilder builder)
+        {
+            Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
+
+            if (string.IsNullOrEmpty(XmlResourceName) ||
+                string.IsNullOrEmpty(AssemblyFullName))
+            {
+                return;
+            }
+            XDocument xdoc = null;
+            try
+            {
+                xdoc = XDocument.Load(new StreamReader(
+                    Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)));
+            }
+            catch { return; }
+            if (xdoc == null)
+            {
+                return;
+            }
+
+            foreach (XElement member in xdoc.Descendants("member"))
+            {
+                try
+                {
+                    string name = (string)member.Attribute("name");
+                    if (name == null)
+                        continue;
+                    bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
+                    if (isType ||
+                        name.StartsWith("P:", StringComparison.OrdinalIgnoreCase))
+                    {
+                        int lastDot = name.Length;
+                        string typeName;
+                        if (isType)
+                        {
+                            typeName = name.Substring(2); // skip leading "T:"
+                        }
+                        else
+                        {
+                            lastDot = name.LastIndexOf('.');
+                            typeName = name.Substring(2, lastDot - 2);
+                        }
+                        typeName += AssemblyFullName;
+
+                        Type t = Type.GetType(typeName);
+                        if (t != null && t.IsPublic && t.IsClass &&
                             t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType))
-						{
-							string desc = ParseDescription(member);
+                        {
+                            string desc = ParseDescription(member);
                             if (desc == null)
                                 continue;
 
-							desc = desc.Trim();
-							desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
-							if (isType)
-							{
-								bool isBrowsable = true;
-								try
-								{
-									isBrowsable = IsBrowsable(t);
-								}
-								catch { isBrowsable = false; }
-								if (isBrowsable)
-									builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc)));
-								else //Hide from intellisense
-								{
-									builder.AddCallback(t, b => b.AddCustomAttributes(
-										new BrowsableAttribute(false),
-										new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false),
-										new ToolboxItemAttribute(false)));
-								}
-							}
-							else
-							{
-								string propName = name.Substring(lastDot + 1);
-								PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-								if (pi != null)
-								{
-									bool isBrowsable = true;
-									try
-									{
-										isBrowsable = IsBrowsable(pi);
-									}
-									catch { isBrowsable = false; }
-									if(isBrowsable)
-										builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
-									else //Hide from intellisense
-										builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
-								}
-							}
-						}
-					}
-				}
-				catch (Exception)
-				{
-				}
-			}
-		}
-		private static bool IsBrowsable(Type t)
-		{
-			var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
-			foreach (var attr in attrs)
-			{
+                            desc = desc.Trim();
+                            desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
+                            if (isType)
+                            {
+                                bool isBrowsable = true;
+                                try
+                                {
+                                    isBrowsable = IsBrowsable(t);
+                                }
+                                catch { isBrowsable = false; }
+                                if (isBrowsable)
+                                    builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc)));
+                                else //Hide from intellisense
+                                {
+                                    builder.AddCallback(t, b => b.AddCustomAttributes(
+                                        new BrowsableAttribute(false),
+                                        new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false),
+                                        new ToolboxItemAttribute(false)));
+                                }
+                            }
+                            else
+                            {
+                                string propName = name.Substring(lastDot + 1);
+                                PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+                                if (pi != null)
+                                {
+                                    bool isBrowsable = true;
+                                    try
+                                    {
+                                        isBrowsable = IsBrowsable(pi);
+                                    }
+                                    catch { isBrowsable = false; }
+                                    if (isBrowsable)
+                                        builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc)));
+                                    else //Hide from intellisense
+                                        builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false)));
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+        private static bool IsBrowsable(Type t)
+        {
+            var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
+            foreach (var attr in attrs)
+            {
                 return Types.PlatformTypes.IsBrowsable(attr);
-			}
-			return true;
-		}
+            }
+            return true;
+        }
 
-		private static bool IsBrowsable(System.Reflection.PropertyInfo pi)
-		{
+        private static bool IsBrowsable(System.Reflection.PropertyInfo pi)
+        {
             var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false);
-			foreach (var attr in attrs)
-			{
+            foreach (var attr in attrs)
+            {
                 return Types.PlatformTypes.IsBrowsable(attr);
-			}
-			return true;
-		}
+            }
+            return true;
+        }
 
-		/// <summary>
-		/// Create description string from xml doc summary tag.
-		/// </summary>
-		/// <param name="member">A single node of the xml doc.</param>
-		/// <returns>Description string.</returns>
-		private static string ParseDescription(XElement member)
-		{
-			string desc = null;
-			XElement memberDesc = member.Descendants("summary").FirstOrDefault();
-
-			if (memberDesc != null)
-			{
-				IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
-
-				if (nodes != null)
-				{
-					foreach (XNode node in nodes)
-					{
-						if (node.NodeType == System.Xml.XmlNodeType.Text)
-						{
-							desc += node.ToString();
-						}
-						else
-						{
-							string s = node.ToString();
-							int i = s.LastIndexOf('.');
-							int j = s.LastIndexOf('"');
-
-							if ((i != -1 || j != -1) && j - i - 1 > 0)
-							{
-								try
-								{
-									desc += s.Substring(i + 1, j - i - 1);
-								}
-								catch { }
-							}
-						}
-					}
-				}
-			}
-			return desc;
-		}
-
-		/// <summary>
-		/// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
-		/// </summary>
-		/// <param name="builder">The assembly attribute table builder.</param>
-		protected virtual void AddAttributes(AttributeTableBuilder builder)
-		{
-		}
-	}
+        /// <summary>
+        /// Create description string from xml doc summary tag.
+        /// </summary>
+        /// <param name="member">A single node of the xml doc.</param>
+        /// <returns>Description string.</returns>
+        private static string ParseDescription(XElement member)
+        {
+            string desc = null;
+            XElement memberDesc = member.Descendants("summary").FirstOrDefault();
+
+            if (memberDesc != null)
+            {
+                IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
+
+                if (nodes != null)
+                {
+                    foreach (XNode node in nodes)
+                    {
+                        if (node.NodeType == System.Xml.XmlNodeType.Text)
+                        {
+                            desc += node.ToString();
+                        }
+                        else
+                        {
+                            string s = node.ToString();
+                            int i = s.LastIndexOf('.');
+                            int j = s.LastIndexOf('"');
+
+                            if ((i != -1 || j != -1) && j - i - 1 > 0)
+                            {
+                                try
+                                {
+                                    desc += s.Substring(i + 1, j - i - 1);
+                                }
+                                catch { }
+                            }
+                        }
+                    }
+                }
+            }
+            return desc;
+        }
+
+        /// <summary>
+        /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        protected virtual void AddAttributes(AttributeTableBuilder builder)
+        {
+        }
+    }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
index b8ce3304a08..30196482c4c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs
@@ -8,43 +8,42 @@
 
 namespace Microsoft.Toolkit.Uwp.Design.Types
 {
-	internal class PlatformTypes
-	{
-		public static readonly Type DependencyObjectType = typeof(DependencyObject);
-		public static readonly Type UIElementType = typeof(UIElement);
-		public static readonly Type FrameworkElementType = typeof(FrameworkElement);
-		public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute);
+    internal class PlatformTypes
+    {
+        public static readonly Type DependencyObjectType = typeof(DependencyObject);
+        public static readonly Type UIElementType = typeof(UIElement);
+        public static readonly Type FrameworkElementType = typeof(FrameworkElement);
+        public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute);
 
-		/// <summary>
-		/// Used by MetadataRegistrationBase to get the browsable state
-		/// </summary>
-		/// <param name="editorBrowsableAttribute">This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute'</param>
-		/// <returns></returns>
-		public static bool IsBrowsable(object editorBrowsableAttribute)
-		{
-			if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute)
-				return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State !=
-					 System.ComponentModel.EditorBrowsableState.Never;
-			return true;
-		}
+        /// <summary>
+        /// Used by MetadataRegistrationBase to get the browsable state
+        /// </summary>
+        /// <param name="editorBrowsableAttribute">This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute'</param>
+        /// <returns></returns>
+        public static bool IsBrowsable(object editorBrowsableAttribute)
+        {
+            if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute)
+                return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State !=
+                     System.ComponentModel.EditorBrowsableState.Never;
+            return true;
+        }
 
-		public static class Control
-		{
-			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
-			public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
-			public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
-			public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
-		}
+        public static class Control
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
+            public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
+            public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
+            public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
+        }
 
-		public static class FrameworkElement
-		{
-			public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
-			public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
-			public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
-			public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
-			public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
-			public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
-		}
-
-	}
+        public static class FrameworkElement
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
+            public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
+            public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
+            public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
+            public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
+            public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
+        }
+    }
 }

From e8981027facbbdf4540f1925b599e2243cdc5454 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 18 Aug 2020 11:15:28 -0700
Subject: [PATCH 396/595] Remove extra blank line

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index eda0b41f4ee..cbc40a855c6 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -10,7 +10,6 @@
       - Facebook: Album, DataConfig, DataHost, OAuthTokens, Permissions, Photo, Picture, PictureData, PlatformImageSource, Post, RequestSource, Service.
     </Description>
     <PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
-
     <LangVersion>8.0</LangVersion>
     <NoWarn>CS8002;CS0618</NoWarn>
     <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
@@ -54,4 +53,4 @@
   <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
     <Compile Remove="PlatformSpecific\Uwp\**\*" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From e0f1cb3092a7e28bc8d69c6d8bb516ab3aefa41a Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 18 Aug 2020 15:22:16 -0700
Subject: [PATCH 397/595] Update
 Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs

---
 .../Collections/ReadOnlyObservableGroupedCollection.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
index 661edda8ca2..42d012356f7 100644
--- a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
+++ b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
@@ -58,7 +58,7 @@ static void ThrowNotSupportedException()
                         "ReadOnlyObservableGroupedCollection<TKey, TValue> doesn't support operations on multiple items at once.\n" +
                         "If this exception was thrown, it likely means support for batched item updates has been added to the " +
                         "underlying ObservableCollection<T> type, and this implementation doesn't support that feature yet.\n" +
-                        "Please consider opening an issue in https://github.com/windows-toolkit/WindowsCommunityToolkit to report this.");
+                        "Please consider opening an issue in https://aka.ms/windowstoolkit to report this.");
                 }
 
                 ThrowNotSupportedException();

From 834531c3821143ffce78e9f286989f3d66fdf0c8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 18 Aug 2020 16:27:29 -0700
Subject: [PATCH 398/595] Added 2 extra commands for each Formatter of
 TextToolbar.

---
 .../TextToolbar/TextToolbarPage.xaml.cs       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
index c2b25226d5f..8e26d0fd635 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -7,6 +7,7 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.System;
 using Windows.UI.Xaml;
@@ -57,6 +58,16 @@ private void Load()
                 AddCustomButton();
             });
 
+            SampleController.Current.RegisterNewCommand("Use RichText Formatter", (sender, args) =>
+            {
+                UseRichTextFormatter();
+            });
+
+            SampleController.Current.RegisterNewCommand("Use MarkDown Formatter", (sender, args) =>
+            {
+                UseMarkDownFormatter();
+            });
+
             SampleController.Current.RegisterNewCommand("Use Custom Formatter", (sender, args) =>
             {
                 UseCustomFormatter();
@@ -88,6 +99,28 @@ private void ResetLayout()
             }
         }
 
+        private void UseRichTextFormatter()
+        {
+            if (_toolbar == null)
+            {
+                return;
+            }
+
+            var formatter = new RichTextFormatter();
+            _toolbar.Formatter = formatter;
+        }
+
+        private void UseMarkDownFormatter()
+        {
+            if (_toolbar == null)
+            {
+                return;
+            }
+
+            var formatter = new MarkDownFormatter();
+            _toolbar.Formatter = formatter;
+        }
+
         private void UseCustomFormatter()
         {
             if (_toolbar == null)

From 5b7d04b70d7c15bd4f8b4b05365a674aaef58f10 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 18 Aug 2020 16:33:24 -0700
Subject: [PATCH 399/595] Remove Toolkit Platform Analyzers (fixes #3396).

---
 .../App.config                                |   6 -
 .../DifferencesGen.csproj                     |  65 ----
 .../Program.cs                                | 256 -------------
 .../Analyzer.cs                               | 357 ------------------
 .../Differences-6.0.0.0.gz                    | Bin 7609 -> 0 bytes
 .../Differences-7.0.0.0.gz                    | Bin 7949 -> 0 bytes
 .../HowToGuard.cs                             |  32 --
 ...oolkit.Uwp.PlatformSpecificAnalyzer.csproj |  36 --
 .../NewMember.cs                              |  46 ---
 .../Platform.cs                               |  69 ----
 .../PlatformKind.cs                           |  27 --
 .../PlatformSpecificAnalyzerCS.cs             | 230 -----------
 .../PlatformSpecificAnalyzerVB.cs             | 254 -------------
 .../PlatformSpecificFixerCS.cs                | 168 ---------
 .../PlatformSpecificFixerVB.cs                | 168 ---------
 .../tools/install.ps1                         |  58 ---
 .../tools/uninstall.ps1                       |  65 ----
 .../SamplePages/samples.json                  |   8 -
 Windows Community Toolkit.sln                 |  57 ---
 19 files changed, 1902 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformDifferencesGen/App.config
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformDifferencesGen/Program.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Analyzer.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-6.0.0.0.gz
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-7.0.0.0.gz
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/HowToGuard.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/NewMember.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Platform.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformKind.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/install.ps1
 delete mode 100644 Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/uninstall.ps1

diff --git a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/App.config b/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/App.config
deleted file mode 100644
index 731f6de6c29..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj b/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
deleted file mode 100644
index e2726cf8cc5..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{292D34E8-0F01-4FA8-951D-8232F75A88D5}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DifferencesGen</RootNamespace>
-    <AssemblyName>DifferencesGen</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\DifferencesGen.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="Pack">
-    <!-- No-op to avoid build error when packing solution from commandline -->
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/Program.cs b/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/Program.cs
deleted file mode 100644
index 1cfaef00249..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformDifferencesGen/Program.cs
+++ /dev/null
@@ -1,256 +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 System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
-
-namespace DifferencesGen
-{
-    public class Program
-    {
-        private static HashSet<string> enumTypes = new HashSet<string>();
-        private static HashSet<string> typeEvents = new HashSet<string>();
-
-        public static void Main(string[] args)
-        {
-            string min = null;
-            string max = null;
-
-            foreach (var arg in args)
-            {
-                if (arg.StartsWith("/min:"))
-                {
-                    min = arg.Replace("/min:", string.Empty);
-                }
-                else if (arg.StartsWith("/max:"))
-                {
-                    max = arg.Replace("/max:", string.Empty);
-                }
-            }
-
-            Version.TryParse(min, out Version minVersion);
-            Version.TryParse(max, out Version maxVersion);
-
-            if (minVersion == null || maxVersion == null)
-            {
-                Console.WriteLine("The differences generator needs to be run as follows:");
-                Console.WriteLine("DifferencesGen /min:4.0.0.0 /max:5.0.0.0");
-
-                return;
-            }
-
-            string folderPath = @"C:\Program Files (x86)\Windows Kits\10\References";
-
-            string universalApiFile = "Windows.Foundation.UniversalApiContract.winmd";
-
-            string universalApiDifferencesCompressedFile = "Differences-{0}.gz";
-
-            AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += (sender, eventArgs) => Assembly.ReflectionOnlyLoad(eventArgs.Name);
-            WindowsRuntimeMetadata.ReflectionOnlyNamespaceResolve += (sender, eventArgs) =>
-            {
-                string path =
-                    WindowsRuntimeMetadata.ResolveNamespace(eventArgs.NamespaceName, Enumerable.Empty<string>())
-                        .FirstOrDefault();
-                if (path == null)
-                {
-                    return;
-                }
-
-                eventArgs.ResolvedAssemblies.Add(Assembly.ReflectionOnlyLoadFrom(path));
-            };
-
-            DirectoryInfo directoryInfo = new DirectoryInfo(folderPath);
-
-            FileInfo[] files = directoryInfo.GetFiles(universalApiFile, SearchOption.AllDirectories);
-
-            List<Tuple<Version, Assembly>> assemblyList = new List<Tuple<Version, Assembly>>();
-
-            if (files.Length > 0)
-            {
-                foreach (var file in files)
-                {
-                    var assembly = Assembly.ReflectionOnlyLoadFrom(file.FullName);
-
-                    var nameParts = assembly.FullName.Split(new string[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
-
-                    var versionParts = nameParts[1].Split(new char[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
-
-                    var version = Version.Parse(versionParts[1]);
-
-                    if (version >= minVersion && version <= maxVersion)
-                    {
-                        assemblyList.Add(new Tuple<Version, Assembly>(version, assembly));
-                    }
-                }
-            }
-
-            if (assemblyList.Count >= 2)
-            {
-                var orderedList = assemblyList.OrderBy(t => t.Item1).ToList();
-
-                for (int i = 1; i < orderedList.Count; i++)
-                {
-                    var previousVersionAssembly = orderedList[i - 1].Item2;
-                    var newerVersionAssembly = orderedList[i].Item2;
-
-                    var version = orderedList[i].Item1;
-
-                    var previousVersionTypes = ProcessAssembly(previousVersionAssembly);
-                    var newerVersionTypes = ProcessAssembly(newerVersionAssembly);
-
-                    var addedTypes = new Dictionary<string, List<string>>();
-
-                    foreach (var type in newerVersionTypes)
-                    {
-                        if (!previousVersionTypes.ContainsKey(type.Key))
-                        {
-                            addedTypes.Add(type.Key, null);
-
-                            if (enumTypes.Contains(type.Key))
-                            {
-                                System.Diagnostics.Debug.WriteLine($"New enum {type.Key}");
-                            }
-
-                            continue;
-                        }
-
-                        HashSet<string> previousVersionTypeMembers = new HashSet<string>(previousVersionTypes[type.Key]);
-                        HashSet<string> newerVersionTypeMembers = new HashSet<string>(type.Value);
-
-                        newerVersionTypeMembers.ExceptWith(previousVersionTypeMembers);
-
-                        if (newerVersionTypeMembers.Count == 0)
-                        {
-                            continue;
-                        }
-
-                        if (enumTypes.Contains(type.Key))
-                        {
-                            System.Diagnostics.Debug.WriteLine($"Enum {type.Key} has new members: {string.Join(",", newerVersionTypeMembers)}");
-                        }
-
-                        foreach (var member in newerVersionTypeMembers)
-                        {
-                            if (typeEvents.Contains($"{type.Key}-{member}"))
-                            {
-                                System.Diagnostics.Debug.WriteLine($"Type {type.Key} has new event: {member}");
-                            }
-                        }
-
-                        addedTypes.Add(type.Key, newerVersionTypeMembers.ToList());
-                    }
-
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    using (var compressedFS = File.Create(Path.Combine(AssemblyDirectory, string.Format(universalApiDifferencesCompressedFile, version.ToString()))))
-                    {
-                        using (var compressionFS = new GZipStream(compressedFS, CompressionMode.Compress))
-                        {
-                            using (var writer = new StreamWriter(compressionFS))
-                            {
-                                foreach (var addedType in addedTypes)
-                                {
-                                    stringBuilder.Clear();
-
-                                    stringBuilder.Append(addedType.Key);
-
-                                    if (addedType.Value != null && addedType.Value.Count > 0)
-                                    {
-                                        stringBuilder.Append(':');
-                                        stringBuilder.Append(string.Join(",", addedType.Value));
-                                    }
-
-                                    writer.WriteLine(stringBuilder.ToString());
-                                }
-                            }
-                        }
-                    }
-
-                    stringBuilder.Length = 0;
-                }
-            }
-        }
-
-        public static string AssemblyDirectory
-        {
-            get
-            {
-                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-                UriBuilder uri = new UriBuilder(codeBase);
-                string path = Uri.UnescapeDataString(uri.Path);
-                return Path.GetDirectoryName(path);
-            }
-        }
-
-        private static Dictionary<string, List<string>> ProcessAssembly(Assembly assembly)
-        {
-            var types = new Dictionary<string, List<string>>();
-
-            foreach (var exportedType in assembly.ExportedTypes)
-            {
-                var members = new List<string>();
-
-                if (exportedType.IsEnum)
-                {
-                    if (!enumTypes.Contains(exportedType.FullName))
-                    {
-                        enumTypes.Add(exportedType.FullName);
-                    }
-
-                    foreach (var member in exportedType.GetFields())
-                    {
-                        if (member.Name.Equals("value__"))
-                        {
-                            continue;
-                        }
-
-                        members.Add(member.Name);
-                    }
-                }
-                else
-                {
-                    foreach (var methodInfo in exportedType.GetMethods())
-                    {
-                        if (!methodInfo.IsPublic)
-                        {
-                            continue;
-                        }
-
-                        if (methodInfo.Name.StartsWith("get_") ||
-                            methodInfo.Name.StartsWith("set_") ||
-                            methodInfo.Name.StartsWith("put_") ||
-                            methodInfo.Name.StartsWith("add_") ||
-                            methodInfo.Name.StartsWith("remove_"))
-                        {
-                            continue;
-                        }
-
-                        members.Add($"{methodInfo.Name}#{methodInfo.GetParameters().Length}");
-                    }
-
-                    foreach (var propertyInfo in exportedType.GetProperties())
-                    {
-                        members.Add(propertyInfo.Name);
-                    }
-
-                    foreach (var eventInfo in exportedType.GetEvents())
-                    {
-                        typeEvents.Add($"{exportedType.FullName}-{eventInfo.Name}");
-                        members.Add(eventInfo.Name);
-                    }
-                }
-
-                types.Add(exportedType.FullName, members);
-            }
-
-            return types;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Analyzer.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Analyzer.cs
deleted file mode 100644
index ebc19cd548b..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Analyzer.cs
+++ /dev/null
@@ -1,357 +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 System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class offers loads platform differences for use by Code Analyzer and Code Fixer.
-    /// </summary>
-    public static class Analyzer
-    {
-        internal enum TypePresenceIndicator
-        {
-            New,
-            Changes,
-            NotFound,
-        }
-
-        private static Dictionary<string, Dictionary<string, List<NewMember>>> _differencesDictionary = null;
-
-        /// <summary>
-        /// Embedded differences between API contract version 4 and 5.
-        /// </summary>
-        public const string N1DifferencesRes = "Differences-5.0.0.0.gz";
-
-        /// <summary>
-        /// Embedded differences between API contract version 5 and 6.
-        /// </summary>
-        public const string N0DifferencesRes = "Differences-6.0.0.0.gz";
-
-        /// <summary>
-        /// Earliest supported SDK version.
-        /// </summary>
-        public const string N2SDKVersion = "15063";
-
-        /// <summary>
-        /// Intermediate SDK version.
-        /// </summary>
-        public const string N1SDKVersion = "16299";
-
-        /// <summary>
-        /// Latest SDK version.
-        /// </summary>
-        public const string N0SDKVersion = "17134";
-
-        /// <summary>
-        /// Platform related diagnostic descriptor
-        /// </summary>
-        public static readonly DiagnosticDescriptor PlatformRule = new DiagnosticDescriptor("UWP001", "Platform-specific", "Platform-specific code detected. Consider using ApiInformation.IsTypePresent to guard against failure", "Safety", DiagnosticSeverity.Warning, true);
-
-        /// <summary>
-        /// Version related diagnostic descriptor
-        /// </summary>
-        public static readonly DiagnosticDescriptor VersionRule = new DiagnosticDescriptor("UWP002", "Version-specific", "Version-specific code detected. Consider using ApiInformation.IsTypePresent / ApiInformation.IsMethodPresent / ApiInformation.IsPropertyPresent to guard against failure", "Safety", DiagnosticSeverity.Warning, true);
-
-        private static char[] typeMemberSeparator = { ':' };
-        private static char[] memberSeparator = { ',' };
-
-        static Analyzer()
-        {
-            _differencesDictionary = new Dictionary<string, Dictionary<string, List<NewMember>>>();
-            _differencesDictionary.Add(N0DifferencesRes, GetApiAdditions(N0DifferencesRes));
-            _differencesDictionary.Add(N1DifferencesRes, GetApiAdditions(N1DifferencesRes));
-        }
-
-        /// <summary>
-        /// Gets the API differences from specified resource.
-        /// </summary>
-        /// <param name="resourceName">name of embedded resource</param>
-        /// <returns>Dictionary with Fully qualified name of type as key and list of new members as value</returns>
-        public static Dictionary<string, List<NewMember>> GetUniversalApiAdditions(string resourceName)
-        {
-            return _differencesDictionary[resourceName];
-        }
-
-        private static Dictionary<string, List<NewMember>> GetApiAdditions(string resourceName)
-        {
-            Dictionary<string, List<NewMember>> apiAdditionsDictionary = new Dictionary<string, List<NewMember>>();
-
-            Assembly assembly = typeof(Analyzer).GetTypeInfo().Assembly;
-
-            var resource = assembly.GetManifestResourceStream("Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer." + resourceName);
-
-            if (resource == null)
-            {
-                System.Diagnostics.Debug.WriteLine($"Resource {resourceName} not found.");
-                return new Dictionary<string, List<NewMember>>();
-            }
-
-            System.Diagnostics.Debug.WriteLine($"Resource {resourceName} found.");
-            Dictionary<string, List<string>> differencesDictionary = new Dictionary<string, List<string>>();
-
-            using (GZipStream decompressionStream = new GZipStream(resource, CompressionMode.Decompress))
-            {
-                using (StreamReader reader = new StreamReader(decompressionStream))
-                {
-                    while (!reader.EndOfStream)
-                    {
-                        var typeDetails = reader.ReadLine();
-
-                        var typeMemberParts = typeDetails.Split(typeMemberSeparator, StringSplitOptions.RemoveEmptyEntries);
-
-                        if (typeMemberParts.Length == 1)
-                        {
-                            differencesDictionary.Add(typeMemberParts[0], null);
-
-                            continue;
-                        }
-
-                        var membersAddedToType = typeMemberParts[1].Split(memberSeparator, StringSplitOptions.RemoveEmptyEntries);
-
-                        differencesDictionary.Add(typeMemberParts[0], new List<string>(membersAddedToType));
-                    }
-                }
-            }
-
-            if (differencesDictionary == null)
-            {
-                return apiAdditionsDictionary;
-            }
-
-            foreach (var kvp in differencesDictionary)
-            {
-                var list = new List<NewMember>();
-                if (kvp.Value != null)
-                {
-                    list.AddRange(kvp.Value.Select(v => new NewMember(v)));
-                }
-
-                apiAdditionsDictionary.Add(kvp.Key, list);
-            }
-
-            return apiAdditionsDictionary;
-        }
-
-        /// <summary>
-        /// This function tells which version/platform the symbol is from.
-        /// </summary>
-        /// <param name="symbol">represents a compiler <see cref="ISymbol"/></param>
-        /// <returns>instance of <see cref="Platform"/></returns>
-        public static Platform GetPlatformForSymbol(ISymbol symbol)
-        {
-            if (symbol == null)
-            {
-                return new Platform(PlatformKind.Unchecked);
-            }
-
-            if (symbol.ContainingNamespace != null && symbol.ContainingNamespace.ToDisplayString().StartsWith("Windows."))
-            {
-                var assembly = symbol.ContainingAssembly.Name;
-                var version = symbol.ContainingAssembly.Identity.Version.Major;
-
-                // Any call to ApiInformation.* is allowed without warning
-                if (symbol.ContainingType?.Name == "ApiInformation")
-                {
-                    return new Platform(PlatformKind.Uwp, Analyzer.N2SDKVersion);
-                }
-
-                // Don't want to give warning when analyzing code in an PCL project.
-                // In those two targets, every Windows type is found in Windows.winmd, so that's how we'll suppress it:
-                if (assembly == "Windows")
-                {
-                    return new Platform(PlatformKind.Unchecked);
-                }
-
-                // Some WinRT types like Windows.UI.Color get projected to come from .NET assemblies, always present:
-                if (assembly.StartsWith("System.Runtime."))
-                {
-                    return new Platform(PlatformKind.Uwp, Analyzer.N2SDKVersion);
-                }
-
-                // Some things are emphatically part of UWP.10240
-                if (assembly == "Windows.Foundation.FoundationContract" || (assembly == "Windows.Foundation.UniversalApiContract" && version == 1))
-                {
-                    return new Platform(PlatformKind.Uwp, Analyzer.N2SDKVersion);
-                }
-
-                if (assembly == "Windows.Foundation.UniversalApiContract")
-                {
-                    var isType = symbol.Kind == SymbolKind.NamedType;
-
-                    var typeName = isType ? symbol.ToDisplayString() : symbol.ContainingType.ToDisplayString();
-
-                    TypePresenceIndicator presentInN0ApiDiff = CheckCollectionForType(Analyzer.GetUniversalApiAdditions(Analyzer.N0DifferencesRes), typeName, symbol);
-
-                    if (presentInN0ApiDiff == TypePresenceIndicator.New)
-                    {
-                        // the entire type was found in Target Version
-                        return new Platform(PlatformKind.Uwp, Analyzer.N0SDKVersion);
-                    }
-                    else if (presentInN0ApiDiff == TypePresenceIndicator.Changes)
-                    {
-                        // the entire type was found in Target Version with matching parameter lengths
-                        return new Platform(PlatformKind.Uwp, Analyzer.N0SDKVersion, true);
-                    }
-                    else
-                    {
-                        TypePresenceIndicator presentInN1ApiDiff = CheckCollectionForType(Analyzer.GetUniversalApiAdditions(Analyzer.N1DifferencesRes), typeName, symbol);
-
-                        if (presentInN1ApiDiff == TypePresenceIndicator.New)
-                        {
-                            // the entire type was found in Target Version
-                            return new Platform(PlatformKind.Uwp, Analyzer.N1SDKVersion);
-                        }
-                        else if (presentInN1ApiDiff == TypePresenceIndicator.Changes)
-                        {
-                            // the entire type was found in Target Version with matching parameter lengths
-                            return new Platform(PlatformKind.Uwp, Analyzer.N1SDKVersion, true);
-                        }
-                        else
-                        {
-                            // the type was in Min version
-                            return new Platform(PlatformKind.Uwp, Analyzer.N2SDKVersion);
-                        }
-                    }
-                }
-
-                // All other Windows.* types come from platform-specific extensions
-                return new Platform(PlatformKind.ExtensionSDK);
-            }
-            else
-            {
-                return new Platform(PlatformKind.Unchecked);
-            }
-        }
-
-        /// <summary>
-        /// returns instance of <see cref="HowToGuard"/> for <see cref="ISymbol"/>
-        /// </summary>
-        /// <param name="target">instance of <see cref="ISymbol"/></param>
-        /// <returns>instance of <see cref="HowToGuard"/></returns>
-        public static HowToGuard GetGuardForSymbol(ISymbol target)
-        {
-            var plat = Analyzer.GetPlatformForSymbol(target);
-
-            switch (plat.Kind)
-            {
-                case PlatformKind.ExtensionSDK:
-                    return new HowToGuard()
-                    {
-                        TypeToCheck = target.Kind == SymbolKind.NamedType ? target.ToDisplayString() : target.ContainingType.ToDisplayString(),
-                        KindOfCheck = "IsTypePresent"
-                    };
-                case PlatformKind.Uwp:
-                    if (target.Kind == SymbolKind.NamedType)
-                    {
-                        return new HowToGuard()
-                        {
-                            TypeToCheck = target.ToDisplayString(),
-                            KindOfCheck = "IsTypePresent"
-                        };
-                    }
-                    else
-                    {
-                        var g = new HowToGuard
-                        {
-                            TypeToCheck = target.ContainingType.ToDisplayString()
-                        };
-
-                        var d0 = Analyzer.GetUniversalApiAdditions(Analyzer.N0DifferencesRes);
-                        var d1 = Analyzer.GetUniversalApiAdditions(Analyzer.N1DifferencesRes);
-
-                        if (!d0.TryGetValue(g.TypeToCheck, out List<NewMember> newMembers))
-                        {
-                            d1.TryGetValue(g.TypeToCheck, out newMembers);
-                        }
-
-                        if (newMembers == null)
-                        {
-                            throw new InvalidOperationException("oops! expected this UWP version API to be in the dictionary of new things");
-                        }
-
-                        g.MemberToCheck = target.Name;
-
-                        if (target.Kind == SymbolKind.Field)
-                        {
-                            // the only fields in WinRT are enum fields
-                            g.KindOfCheck = "IsEnumNamedValuePresent";
-                        }
-                        else if (target.Kind == SymbolKind.Event)
-                        {
-                            g.KindOfCheck = "IsEventPresent";
-                        }
-                        else if (target.Kind == SymbolKind.Property)
-                        {
-                            // TODO: if SDK starts introducing additional accessors on properties, we'll have to change this
-                            g.KindOfCheck = "IsPropertyPresent";
-                        }
-                        else if (target.Kind == SymbolKind.Method)
-                        {
-                            g.KindOfCheck = "IsMethodPresent";
-
-                            if (target.Kind == SymbolKind.Method && plat.ByParameterCount)
-                            {
-                                g.ParameterCountToCheck = (target as IMethodSymbol).Parameters.Length;
-                            }
-                        }
-
-                        return g;
-                    }
-
-                default:
-                    throw new InvalidOperationException("oops! don't know why I was asked to check something that's fine");
-            }
-        }
-
-        private static TypePresenceIndicator CheckCollectionForType(Dictionary<string, List<NewMember>> collection, string typeName, ISymbol symbol)
-        {
-            if (!collection.TryGetValue(typeName, out var newMembers))
-            {
-                return TypePresenceIndicator.NotFound;
-            }
-
-            if (newMembers == null || newMembers.Count == 0)
-            {
-                return TypePresenceIndicator.New;
-            }
-
-            if (symbol.Kind == SymbolKind.NamedType)
-            {
-                return TypePresenceIndicator.NotFound;
-            }
-
-            var memberName = symbol.Name;
-
-            foreach (var newMember in newMembers)
-            {
-                if (memberName == newMember.Name && !newMember.ParameterCount.HasValue)
-                {
-                    return TypePresenceIndicator.New;
-                }
-
-                // this member was new in collection
-                if (symbol.Kind != SymbolKind.Method)
-                {
-                    // TODO: Continue For... Warning!!! not translated
-                }
-
-                if (memberName == newMember.Name && ((IMethodSymbol)symbol).Parameters.Length == newMember.ParameterCount)
-                {
-                    return TypePresenceIndicator.Changes;
-                }
-            }
-
-            // this member existed in a different collection
-            return TypePresenceIndicator.NotFound;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-6.0.0.0.gz b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-6.0.0.0.gz
deleted file mode 100644
index 90a9ae8fef7274eb886055cefa294a378db06ee0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7609
zcmV;q9Y*3GiwFP!000040Nq_#bK^LYexHc>74@oc)Y03!p*LBw%bNC~k?gA3eS=6?
z!kQwuAnCID*KZ~c61*f*g4>9BsImwmKP0Y1W+DOpWO2xUr5BSViC91~#^XC4(&%E!
z1;x}`mS$IRCidf7lE=aJnv18Dib=YUgHK=n{<ohR;Eu#(Lw7XJE@m`|_+I{8kl+Q9
z)k`s6(*Mh8noYt`zfds$*$VTNge0RE3qfBQ{dJkMC`?xwB=yd%i!Jl7Xpjq*?Jp*I
zwgoC(<BNHS50JhP{FQ}NU``%~MC_|MuSt+`QBAv}X$r-Rr#y~nfGJo_CTKW%WIKAx
zb}YMk3n&dCWlG|JMl`(KV=IoP07JzMiNnzyf2H_i8gYDM9<Paj!o+A1kw7L)*6?Pu
z1pYQLQ#>&M9L=EO0ey<eD?F2RWHnQxb1$LwH-hJJcrne>jPF+aG^4w#S77H+unjcY
z5}Qg;;PyP61Jrs9%;Pj8Q3OrD5zv&!38n<{^UWBB(UPV-7Xhsdr*F_YJ7}cZ%d|0O
zj}*|30?&Dr9RO*v^^oA({xxeN)C;|**)J|$SiHF~!|oNwZ#f2`IiF!%T(bxU*m#kP
z1cuf3oP|9=XcXlU5tAf_^o+h`V~uuCcGhrsnio>y2hKTQ^)k;g9{*q|TeAqT#xs`U
zSPUyvnA@7V5(NL7$4Q>y%YXg%H4pOiQII%&reX$@NmgnY%J@<24TM4D3&D0Ut?~V*
zucKN)FlQ?{8t<X4t_9y&S%$G>18HnISteqWR*<X_vZ7fA*<sWK0Zg?lH3<t6(<$HW
zKq#bIveK}C8>4_Z33I&Ka$ODcx+?WYm;nZ<e%rMqC}D7+$IithCea>*W;&0b`S?4{
z)O&cHP?51d^Ai%JwCF9B%Ade12p8Q<e*o!FfU7r<h%!%YF_XZEsQCYS0C)!T+YEsV
zSj%vQ2{93xa7QxLXA?aS|B>=|A_Up@1;hs}FLa~sp<Crlkn=dsR#K+a3po$JFE$Lo
ze~}$37NAY=2*eM0WgA&mi}Z+SZ%R20V9|u(+dh|$72BLU2gsN78CIz+FqxBx{Yk}x
zU_eD0;^_!kO_S*&n4^9`lvaUdOt&Q74C3^Z+DYby7q!Tvs9jc9vp)(-vGG@+2?b`b
z^~gU5aWRiy`Aa{p4B6FN0yC}W@GwME9z`TcTTA*bNU{Y%b^)tf5|O?6i-Ha3G1Lg<
z+a!ENNfiPV7x?be=TRd~xAFn-3Q1LRHS*qs;*Mq{EJR9QTx6vs?|er#s2^OiY)6s>
zd!v!U9WOqA`P`~X=${WD9|-8mX*~g@$P+5e_dH|ITG~{rbqbnRH)l|L7Nz~L9x1BU
zI51HAkL02~-O}LY6tFuEDi6IBoP=u_ZaAcOsDZ#hSOi?H4WCDISpBYcRBS-A-cLd8
z#eD6ljgc{+bSUw3uIDL_YVvGY(by@9`>uvOwB#P?;eH^;y0#xmkE%7)9kd!UsvgqH
z6PR!r3WxzDKS>rqJ+6e{LrNN-Uex$1&Ue`I&>o;%CJ}|DV<Z`P2&73E4ghTfYZ0h}
z+QG2Vf^$bhMnDS>DZdtAtAK8j>>s%?3#Wp@x;9DG8ue}V<;yA;&tO+$m(#FEj^A{S
zpDf$1_;dD)2&!ZwXvO8L2Dz=(!jc2)tH@RXEH&}PBaE;+5UgPG5j2_PAe1VUY_?0f
z1%-u+Vf5oe04tbPFrUodYaWHr?@Cmev5nOgpFXz`Q6hq^dAwz70ftb8>XbQu9IjIT
zN3code@o2x6thALy=C!BGwYHC+pCae1xYiDMPFSD8*E!DE*LHL<6fzES4!NZ<4KkY
zww6YNUUadj)1b$X9QA2fLZG7-M5GiAQJM6mktEFqOy}0qY2{*H#4w;>Y%FO2)vD$-
z79pB*U<Lu=4NIXj_o%BCW~0W^2GU471txjMHIbY;%v2A+fbu6@YXkFC-kThqhND&J
zvxr;e)d@HapJvlYE~dWq6BVrSB}`q&vI?+Eh4FRvgPPZgrJq%2=vO%l?R+ql7=^p{
zLi-T47GL-Yq6jUSJRQ%`b6ioTP6fnKq+Q{YXRyt5@)^L&bA8-L*poqLK*rCZBtA^Y
zNfaqwQ?sD9ys9{Zek*fSDF368ULpH^Bo{aspkW?lnw^5O`Km??;$xl~=d$+f1B3h*
zdiN@5-+JY(R;hQx$|t41T!VDW1szYI&MX7f03Ie{_qzqA-1q6lWt7v5^K4uGnuH`l
zC+<YhX+%Jz1#%yQmd@UEl_v=osHs7wTmI_`X4Pijovl~7>ecusN$Wt+93iyIf-qFE
zdx70voeozsv+p=8_*|6qRqOFE)ndDc1|*TDu3OZHiDxto1WN`|N$X_@K{KCpAQvO+
zJNc8UH&Babw#k)-Exk56Pag=GqTF@^sMH&+ke^C72}2s{w=L4XCyLsjIUh&Kpp$U!
zPG#T<9eXE|zOfUzRc{7#+Jdt<>&!3TK0L3ez~^%Fw7R-$1-|C+9ENcfqr#{k8tT~j
zSO;3MAE;Jo-Ei0nb~cMEnn?`{)}-B<M|{I*dM2X>AkSx4+PK=rE;gmlW49a90lPeL
z&21Or8O-W_+8fi9rZQB5wyZh*xRm>N4bU^Ieh}2fL~zgYLC~{VzJWC9*3z>0OlCXa
z&Sujjm#W#hNL|jP4m8k@*^Y))EV-X;SJyb>>&+nj^L7Ff#t*StG0MWP(PyO$*?aVF
z;!cU&or{TO2x_M$nhs_Q{CmXLxcx^|ga&=4GQ!4KKPS<SmA3@5+J2Hs_KRB*Z*p|7
zkv-3|mOZ-m?BkyKElbFdO1_GRHU`Ze(-f>5Fb9eR{akg|G;)_NR-GapzJm!CoJak6
z(hjBm1Pg{P%mbTn_pI)a?AlzE+jI}F7(0R^o5n=2wk^9F*(FS%Z59LL187@_bbQDG
zqAG*O^XtD?@fNos(PL_eq49`}9|CpaY=G`<>;Zr+L<_K0v5FVU;i4s!N>)ja`-F}k
z`DPOhrJwQyIIp|_yII7L9X-e+V~4hn#Y4z)hh)Y6r0)ifwSEt9E6(CQ;QyJ+-IMo#
zmJ<U#MDGDU%ae${y%XEfyEQkc;=uQNAm8waF3>&u9^jWu29mrBG#8=Vv3?Km1;&t~
z9IU(>Iv`|-FLLrO!%d+}ad|$Ms6AlldX>{j7~+dhzm44R{7BN5Y6)r&*sg^g5ZDB*
z_D=tt4KIHOLCIk{t`m<`Qx(Yv(M+^r1GNXp{5$14nu)z~Hh!ITuff{aJ-2+NYEyrb
zhm5QLr6;N3Ds5zw(7Hp^vL{QI@1&>e9z?R)zwDLm>#@>|)-%2%Zwsi+nglPagwjx*
z8)zr*EYxg@sy(cM#O>LSRI?stu1Jk;`$r7ckT#E`O)|a#HBqY3VExe156~*nP+Dv`
zZtQ|d30l<XCKMPF@iW*+QtMgf8_85i{I9NJ<&%D}OPA@^+#Q#Z#G_Td&Oi?t3OSaQ
zQ7wZ}0O_d2?81^HI<ZD>!sh4U=n&(5xGY9iX~rlMxQkf-4OJYBj^8UANN@N3AW=TJ
zYH}}G4xACj2X?a1L9UCAa7PP4ik%Fd+8a(sB1({}7z}=BpcDFQX-sK_RK7TZa3uGP
z5j@k9@qkD20mCO4*b`tZqiy^YGngT&@_4R7J0<EcMvSP(LZ~Q1RE{cWxik|@pFARI
zb3ipQOxqt4r3XvK8a(6~$c-7@2%@|p3m&mxFEKxT9vO-yuSZAsz(0gt2SN!OY*+g@
z+tQS!wPy^`HVYuAg;}m-D$GNaPS6=N4r!>L`$3;X)GWMCr`n+yz!x0@TL!f?2TGk<
zJ{xK+57S!MZabwMRVSB=XWl{+gnWEj*2$$rIj_>)Van}9D0&E!J3}to+N>oYvMX&N
z<JnRbE7kU*QHnZTrKTyY+q-i2xq~f9AbW2JL4}t(VMD5EzpE_ek?s;MNHn7{XL$bN
zu0`=UOrgd8L8AHsF&+eU_52JArYT>ZWr3lwN-#V)kRtkj>(0$XgerALpP4#+Iqrd^
z8Wpu@sougOQ2ek|u^DJr5hr2GQ7&^DPzNcZi)CceW_tJkyh5ANxqm^S>g4KQQX(Up
zn5P*FCgynTdBw_^V-=w73=F_DwNnA?Oa^E+(z@}qi=ku><VXu-31G$Mml3t)p{+V8
z*d{M@D$n+2^VsD34phmf_7fc~s87k6n2l2eS1Y!wo~thRIQk=K*(<}O`coD4s9Rb+
ziz|g^MLX$9J&<Z(b{*n!V$C|wW*?=O>e}G)PUy1(N26N_&4j4+-B6eTqZ(tKTDBhs
z4z2+sL~Vvv!`OR{ll}yaK;)kF89Fj_kk<(fsKdGrQ?7XMLbKEy0My~`R?JeztTA-@
z_J^Nztx`Z-$KgGO<;5hDhGB7N8eUx2Qx9TeM^aHQ;RKR~YSf$3I?~vKS}n$Ih+8Rs
zBr*QOfL)qh=Aet=!4+6;FsxNyR&a>WoMyno>v&*0<pD!~t%3OTRmB&hhYAv(pIM-8
zQ26xaGw1{fUczyZ5bxzsu@CXaeu)t+5tq6JSSEFr(E+JePp$lQ*Qs!r-e9PSda!>_
z2_Co_Pf2X{F7Y%gLiNX3B}4}5G7K!ZhvK!LgoI#2j9SyN!EWG(Y=pv}s<zl+<uE&U
z+SLFVRA>Xf0V~{o=spm8h+7+>KWP_#Lz{cSQ#!WWyD%4^>rHxTACzyujOxAAx?Rwh
zeHfvYj_$he1}2%(I6)qTlPD^W+N5=n*B8Rj*Voab^jLP~6{ecA2Q_dbN?Vh^%48Ke
zqu-b)BAf0&hNB4I`qit5X@Z9$kcq$0SkLaUJc()r&A@ajLKgOhS?j$%pl}U_PP9j7
zVdbUZcmqZCZkB>Qn27RN1Bud$vYQQ8creD?!cjX6q_qgVWGRvVEqR{NnP9KQ9%VY7
z(FEpuE+{$?x@hIqMbaN$8c864QK7UXMVV&J038PfwJj|;iKI{9)P1I9eq+E%BSey@
z=+8Vw-<^p7(=t2F3;(N1dZYquN_iBtvxM?EQ)A2*d5TLztQ!?Na+eh}(QONu%Ot8i
zRPUIAp`@M4mJtmr%?u4EK_VH?RxGGb2|81$CL9&%#z|e?A#*No@^Y6}bpi&uF2$S~
zJd*2MuUx;ExoTQOdx71Vemh)uYY^f!6k@#0W6QT7YmY-23V>PCbt4WCLvL}hH;1oi
zIHT!H#uFGaWo~)D(k|htbTpaUgj9k&{?gbmsZrRhTj?{p&NsO3go6CiP7mDENlyZT
zRX@XNeiCsrOsqz1-G73fI6Pi!B`M#_l7=Qg5gm|Y852sy&n>0VLmcf#Qnp6)k>|lS
zA*lJ;Svt#}#B8TmB-7N!5N<t{UG1#mH;e@sD!@bk%(pD2{{R;IP&}+rtI)@{TUf3g
zJ@0H>>je;p@&{2HgigU5-G^~TT5g<Oj`g6AkG}`zJVw7ifx*U}+4~gnL!M3h`WKX>
zi@3)ViX^(@@6{2y99aEu#yc8U2l~cMJvv0r`**pE{$Qx~$(Fu)ON2gYf8K1XNQsCG
zFi}E`%f!Pf=K@}$3#w%!;!N1pmL!&t=|gfwa6{=DcWfOr)TPMN?YSUo-^mG-F)Q_f
z+;h-yXHn|!mta){R1e_-3lz}i>u=51#SX0Ot0MU-idd3T6FpX><MP-@T##&gIPr^>
z_y^r9H(Y}k(5N#|)1zhyOWXp%dsezKNbZ%yDAN)!!)Uc$cA8;IUPi~?KB1dQs-k$a
zBg>3cVmIR|Ab2~c#ko3-Q3PCIFcy--1RC9ux0bheEN-R_QH1)8Gi>Kx`K-$X&mG#j
zOZux?Gm>s=w=8y(%s^q5(G>DhpL3c0!N7DTky}tHl^seP6}h-STL=fx$Dx$)XG7^5
znOxNIk%-NSqfT3F=C8`7@cQ)=PH!g-QV>dC$N8&p@Djp|bke?eBz<uLbdMrmu+YuO
zuC6P6NbDu2uk0I=zp<$FBI;O>`UxMo-gIZp*DScCe}dKFKpUFx&|S%FDpzVKETfR)
zv?&b3{0wp&6U0U9EHRo89Y#tc)B8+kYQU?ECT{iEDa@J^Es>OFCsQkh>dXP7K%QcG
z$VT3I>S*{CgeL)&cG-D2s(L5ZMeE*YU?_$541ik<Nj`^xQuFR7%{SYFtNv)7szcvl
zC){MWX7a+o^Py%8?=*J;B^{f`fk6MCWEqWBJn}Tp`13QG3eCjhMXnP57nfMIWu^bY
ziC&-tx>HCwF#G9)wh7z|y0juYvp3A#6YGOFPdkD7Cv-IxG5mCcr)*(2SlWBx66~8x
zu;1K(wYon#b65P3F8azPV1i1Mb6DHU(hhrU2sy8#d)$h{?xb3Nd#75u#I5)pd(~3V
zi#h(UcL=RJ^1e26;(xNZSOz{9S@E+si3+IvXHN5$Z|114!h}>FB<fGAZfKJTOIW2y
zRJOv&X!BS`$iW{SN`zq{_@;8X;6cKH*|o>3ye4TZ@6V*7OgTv3C-(|!4eew8TH7tw
zK@v5jE(z!$Vy}Xy>{t%~`$^a4e;sntxTJQBH*gop)u`Jl!r)tP8(*iu4}krGWgm|j
zk(fp@v<CgWlZb6%{4s!7erfEaVjp0j^`o?|)mG6j)q5}-`JtWECp*l?c5p*~g;7TG
zZc7>Ibew#F;XBf-l6SDEo6<+~-HwWsz0$^an<U7L2f4hr+h+Rs=SEt|%8RgCx1El(
zQLmQORjswnEpNTX%TUWNPANM{p5k57S6VZfWIi>AKucJ2BILJ|A{AL(47m1Bw&0cC
zN~~TiC^WW}fYG5aer}<}mI8}vneVUMx8gUl;dKsp5-h@Pm9}7#<9&22J4lUzRI-sy
zD5>rK`f9cD!($B3Heuj-oL@(HJy*XrXv3H!3CJY%*`;$3)O{CyaV~MK2Z7A715G61
z58U+zmFwa8Ii=aiJQi|I-mf;g;e!2%ePZ&J3DulOO6~Jeq|P}|mkHyRJWaT#x&AHy
zOu7vi{1{UTf(Zl!hR=b8d}y|*eT9Qr<cDM+!y`+2<W^bC&f8I7J7ZBmk*I^ztBpE3
z(BK{KTI3ZPDHy|V+Rk|+_2r}-{2*?lh`h<~s(HXpITsf^$rB$~LKVRSKGcm$9x$RW
zj__v;>&2$j_dlK`dG6l_KJdFGJ~a$}y9TeRx{P@6f>FEA5%)pxRQU3MAD?)^d~5#Z
z0Vh)uzmirB<u7IgH}5@QV@dH&!&mCd8npuR;>8zc%mrR}KWO+<ki?Tt(}7a#Pvd{^
zfG11udSt;17(sq9H6?=QDUCdAFLjeE4SnoZn<pRUX6YdK9_^E@50ZQyU<8#fs_Z;|
z@n(%v*FbsGG}dizJ}I=?ap|6u7FXyAMx(qb5y!X(O?3@FJYhxJMLtNxDn}k^DY&oh
zNoOg)qK8(#`b3H^t@Mi|(=B0fdBK%0W4mC@7lwSAXSR|XQM{GfmsYY^!^ScjR6fl>
zi$%O2-6Iy&MR+O}`ryWlxiPPPio=k0ZRLDdJ5q8Fv=UoA#m{|2>f6IBn%&c1G7m7J
zbh%o9i3JHdhBL&9cNTtlFj!>ZpZbQ42iz>ENO=tG$Zx5BJU_V6SX?{m13&Z`X7N^S
z@8iA4J@(Ig%2^x-tAqxb$afypbVYXruiW_`&V67<D_Z`HgnRPJHZtl$T3Wa~KC&#L
zqj`$Dj*hR^Pios9Mh#mRIVx$zK5vD(NG;HN?Ixer0C+;x)LRy)VwZ}a&_43F3QQ_~
zV)Cies0heDsHU-m`qS-ZLBAv^#c&%c<k!kSo-s?5tY{>oF+JhTiflU~4yC#2PhYEV
zZQ0iZV)A&NqFzJ-`Q<YCEi*IKtLgPgf8eb({adl$aoP_z!PE2?7vZHBdvE5lpe4|G
zz>eG?g@&1@wLx#jNG*BPm9gmX+G~#nf(l3j@r=i-Kb{@DozfrCp{~U9L;jj5K^4j9
z0Yi_RM?mfYCm?Ls944$MJ#`(i#CQulU<Y*_e;UV9aO79ePy_RVEqz^`7rWD|i1`tZ
zSGR1Hhr>tq9=G{!?H5Z*H}qtHD`q@k<Yo`5PsHLEZ#c4TF1a1#hY)Bn1wG)(wwyg+
z$1MFGuws^d4_MJlz6YGx%RNmf$$Xsk_MsdPIFomt`_X-Pbe8+mFnSZylUZi7Gb4LX
z6zrRPz0w!<d^|IEm7{l_tQqPgo{oX?Vo^0CX@)UbzHB0T#SDyU54f=61h2daUc}=i
zS0R%Ne%&$Ia<n$J6R)|TDxOE0clN6?)JMJQ>kPG=;76RIZOpa3tTEY^rN-?0`B$wn
z^$B!4NuPH;#kogBu=QijUnLRCJXvD#V=3OqAhmAzz(}6)RleC!U$lI@q7~*kw2nD;
z=RuTIJ?H?xEY5w{UQ!B?Pc0-5k9)vJRb6aj2)E|UhrmYl3l!Sevk5%fb}MV@(>N%(
z@<}_kxXRa_SXm1{&R{ElCFb^G{FLi}2h5nbVz1(R>|kdP*fHK*uiD6tw)TLXYKWjm
zevBq#UNYs=Qqts3jeHMSv+wCT8n5#XiqeM|Q{ArRe-}lsdF|J~b8XG?=D~b2tB41z
zRHY6w<^fYi-XJ^8Y}WOJ<xlPNoXgMT;#c<4v3*ye8HYX5baqDNmso8e`3d-H%Gc50
zlIqtg;&Y><&pjaOSF1UItQ-?@fLA&2;{b1IAJ}n#SBAp4XuQfLVNQCZj30C{Uaa^(
z2XI9Yssk)}cbEelE2hu^T6=`Pi)m3txw}BKqSRf?G5cCD*LcPc>j1YJc<cbsWu<kf
zz6&G_AasCJZksw0B^4K;6KPU9ARNHm<SyE*{Wz9GU`KFG^U;;`bGMi^_oyAo7QM&p
zM55^3P8ZX**dcT{Io@RqIt8`81y#7-+L(*kUybE;G0?0aK?iWvozfbh+O5Zr!k#qE
zY!8eJRxO8!3r){Dgy}@8H1?~Um>K#6h(qlR8qtM_GJ)VOu;g(GS5~8a1jEe&uEPbL
zwVK+Fa<WdSuy=>@5{2<#d1(wfcZQQ=oyp<S=a4feBcQy#!o?`C4!b&ob0)G)+_w|K
zTEuNTtLHndc&;0<5lTCFx;v_#eSd>vClyqVICfMyg0vh%ju35w)ghCPAx-Z%n-;@?
zw6&){<2A`a0<?d6$Yhk)_(?-?e4I$#;wA6qy5p}BU`f+FYS}xmvyzx>)aS$G^CaEJ
z!Kbfy*%zW%X<u5>zBaMtM?6#Y=i@d}G#C2o=pW7pevS3RnZQduKb{F5?KdBJ^2OpK
z@}XCXFW!5w<2a9B@Xm;}7tvuQGYc9|?GG~gbNxuk<KbA34`T~eLT^q7mTavu8V4-$
zkTcItn%azUAKPo1r=SLT+iHeAFWc@)kdz*Xu=+@W>mgUmJo2)&E=d$6_=#mdn@vpt
zKY6=hn{5RDGA}!J;l(1=^nMf!y4W@#$;o>V<@pbi$p6fd+j&~v)mS@I+5_d1MUiaB
z5~qLJ-)4iT<n{eS2#ozQlt$VbLx_x$i(gpf@kssgD3G*t-}!e+3f)J(@>Xt#`^THV
ze7$lXB61}kp4fQy#}7D9fZC%wsO&HKVw-vRQHxrmdEcuZHlgfVuMVcQGxxzw*WBG`
z4n0Sk9G#1@qdl2-!>+c7dqhWDeD78NVqtNK<!DTGDlD#e?T_=5t`TdFrSrsmeNWH+
zVryziNy_7%RQdyZQ<9K1i&(Z_WiW?&5?gWtB*PLKhsjTEZu$b~(tG9}-Vj<QwS0hR
zK)tZT)8QbxZVw6eYzxtmx>aAB5ceb5X7rf~0oEoJJC>$Uux^7RbY<8u^q#<yx@%jd
zG<OSeIb!=#%^vP7!b5G_#V3BgAfgBRw$_4yU`ck*GxogiOLNQP%`%Vi+arp61|<dq
z3Vn)S;Q>uvUEShjT5pI(R}LvX%@aJZLc=G)R>2k)^5G2J(_iZS;PT;VNmHJSfDWcD
ztKBY;x^h46lm3|-ljFM}$(9A6NH75%{V(%ZpN0cfs3O$mXkvjJkQiIIrC}b?@R5@=
bv)_%c-V&zv?r=5v```W_7Y^~4tN8!`->;iN

diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-7.0.0.0.gz b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Differences-7.0.0.0.gz
deleted file mode 100644
index 53e84c4e98e074cd625c0c3f4642a9f46d518259..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7949
zcmV+oAM)TIiwFP!000040PS5}bK@$~zTc|-6?5xKoik^zeCOEtaBV)kmM8Ppxx*5%
z*~mf*QWBqE|8@iVvSeEln#^v7i<wxcyMc!mbVCE*SrqU$c`=FOkohEGJi6xr4KZOJ
z$%KR<74zts|NU>@kC9HdBvJoONlex(WC^44o<w9r#rTFovcIK4`Q=3JBmc|Sk$PDq
zUkko_pvfB-FNWe=u1i19XeCG_V=j_ACKGrWZD??UeMS<ZSe~i4n1(D~b0PvP?k(_h
zv7aY&XA1h;Xc|%?%nNv&(U2w-DX_>{`tKvJ!ab2w9wjtN;LTi`7grHkhco~obGhVX
z$D&P<1pJ2OJ4?2YF&0+>PKMXiYE%`KrB<c&MZn~5^6t!DE$P)Oh?<B^Z#f8~4X<2M
znTE*#BD{noY3q96!-DuPpqUH7V=9t8wCxk4Z{xXAbJJLPhHV8O(Xg|nyJI_+&|u>G
zRLW}#)PgSQe^M%wvk*1$_R8=Sy+I2<z{9QwzrQW@U%tfwN$BL2uuyjyd-Hjo7h7lT
z!*doX4;qGEEChXpmcD>qg1u6)$8TxJ{!(-^{uYIt1V}%aAdjcQw-X0?m4H5;YN4tS
z(?Y0!f|rL2)XVXLMJv7{@?}lL<T=51R4+&B1t^b5>d7-IUlJZyUSvWe_>4B7L2|{3
zOdfc`o=b%rP5CayE;%stja2q^%f^~1iA>5h7n3mjCaD+zI@9Tn0iO-MOp_UhDpVl)
zKuGHq99_LbUlZU^zKaRlMDw5>@S}pk9wfyvbo=UWJ;Q&JCVU6nJ`nA*4{Z`<b=1W3
z=WCuu?JK07Aj@aANrj?<p`hGIUK*qMVr+wQb2q$E?OjeUO9FeN{0L2m?RV0eLV}5(
zuvcY>l^^$GZK$ACQ3$|6>0(9S6ZId|F<?GQyP*+<+Hqs}MFB&sj2-n4H25BX{yPUl
z<KX32(6~5FJRgS3^ZC^5lNq24L(RpE$v7nYiz#An9wq^a;R9$#e902IpaLzJh=%QW
z^t&#!x!JpK$8}Akwi%dCsuS^Xd#wdCJSmg2AGfhr`!RP?1H-c*$yQ#&s7`}N=oDW`
zsMN4$2@Y+7)+}h@qZQS*RpB$O`eEm&|CO3CzBNFIOnXWXx<@b>IxrmAj3?<~V1njQ
zJ=C%_NDIMsM8GE|eZf@C+wm>A&Z!+WR6OEo%Qio>%}&y`R|iFky?D14R&3X4r20^3
zzQ1U9_Q#m&@vDpKS2??Af|rVC(iXuL5gXdFNSYS9dI=6y`|cIT<o1*c&RdQlNbP}*
zM8bcvvRQG82OY|Gl;4@4U<ZIz)0KY8LoU3ybrTevS3G&{%5xitdzujFkV#k81$(FA
zRpj%au~)i^(w$L1lZM?XGC~SMKGvxV(m3p&WM2>_Ak*<mfRDIAbrRZco=0mm63u(#
za7*m^!T3(7`V8;rD-FxWSyPsaD8_$}>wg2&Y9G_nrM+XDZ2}UWpMhLn%<sSep9n$r
zI^`@wP7l`5j>P@AOm$C=tVbol(DKqXTcxT?c<RiUO0f95a_I!)0YM{O(k*#qyutE1
zEnxv_9D>qx<x@UD)$uvUxTG-@weB#T<MTKeNnP>Leo_Z5$T`nbH20Aus%BfMM6gIj
z%q49o&4RNid3^S$z~_rgB7B@=@zEg=<@svxjGkCPxpDDwckHalX-L?P235)9X$a-%
z$*g%#K-?^3O5}DX$Xn;!3&x%~-?50AF1%ybCC;9C-;+%QpMmcsU?qZrlAv?_n?&?1
z&4Np?Tcf0N84AX(Im6)d3W_TZblW&`=E;1xW9TzLtF^<VUG?8b^|XfZt6iqr|NGcH
zuLaqeMjJqc`U$-fdmW$+ZfN4|cWW5QHv35e+O<v-DnAI9TSzPSXdjeqmOSO~q->(`
zR8aI(3Xt=axaJqXAA8ZeP##Ux3>eLtgMC;tct2AI^voiEPTq*1E5SCK5Bn@VoCW<U
zIV+`Cx>J|n(MWP3FK)qtr;}(CD*bBoG3ul`r9Gt)eSSVJ6W}p4KOY6lW=r%7oPO1$
z9u47};sU-MTzH&k@YO|rXV*;qx7aHCYJ7WD5UI&-?Tg%`EV!j%T<$z?LcYfN1Whqb
zg#eFwKM$Z(?3sa&J@&lC$Xh*(p02#n{qkFhRgiege0c$;6|NG3XD6V<f6RXW-K407
zK~FmG7ARe91%Bnhmw%j)lqHyFwKSE9;JYU#QxcYu$OTk9&D&tdOai#4dctHp<KY_o
zZ;1{Zf4d_%gRt))3GHvN9~;Fq7?QcXTkI9|L;3fVpsNT1Z;1%-`!Nf{g_~*SSw|;G
zdgS}BlmvHVPlY!27X+Is!S<f`|4E@CFH>*}#ER?prRavN6h-#fyOYT9HIp<HY`!BK
z_+l=!&pD&`Rg3X0WzXjKJQ#ha>o|WpD?`m87#ZewnM=>&?w}g*<-{T1AN<T#k*>M$
z%_1^t+a%gQ;apR>63wE_`g69}2yd{{l4_noy(z89)jsBCkxRPcuOwe!RFAZA?ed-m
zj9g68fbk3csi@!Clt-K<4*-as`Wt5pf>%P6JGqlG9@E4|$Tjr#cEvymmW5D?)0I=D
z=;>gU+@luv?41TMMBuuS7eil5LR}?20R~QbxeqFHdN>?B6AWaj@g2_Nw&gpV#jWs_
zsLhI3dFk^!Q#Se7gUL(R$-caZsL8YCUOhM^9+mh>9Up0{TzY`>_7cVr^(K!uGZfMY
zv=&fXzw0XpUz+G6M(rzx(^PBdfU@Ml1XibNEQK{IWoL0KaIixb(ewBnz}!}!%9U@+
zW6IV#k9sA}bApwkJE{aat(`~Ex-8jDg>7cmWxjkJ)zS{7&Uc9L#bV17u74Xl04K7c
zJI1LG9D=EwM1eBJRg9drX_h<;&kNL1N0s$UO?uEgYN)5#DnXHMs)$2=Ii9RphI-Cq
znBGPzbK#J)uv}DwqjkS8exa^{`2oYRq)BG%%$E1rf;t#P4XNM2qz<uZn_f;5d~;X~
z-I!?Ms89%SYV#kZQ3;Bn{;K5#olZAsKFncQdM{*}5M5<3fd+2`x(0cKVm)ag7#A2w
z0v2wgl+5qPXp@U#5&*z^hOrt~Rdm2@J_kS|ozO#?W<2aAO6=yRUaLe8>k3?~gO$ti
z6p+`UE+P7#;9HE;P-WJGrZB4CGx%7e&B#O;+>^xL!ZTQ-5Bw@*8wSl~$^^sKYRjY^
zCr5c+leIF&M_0hj<PHUl495dcOkkqoexPrcP!r6qAXq|8iKM~hKC4S18mP8xjRBgM
zd&4meiIgRFvjPvLg-!u}$6RG#9P$FX1qGFfwTkCIQ3+)NoyS=BwNMs<+NRfBt15b0
zfOa&;*dH7dRW^T1!i-^11YqfBWxLIB)|AKQ)k*fuzKHxS7gz7t*_fq+u52E-Ld<7X
zN3k7i*&H~|amRH?*Lbp)JWLauSV%)6FbFryl<J*HHQz8gAbO%9_c5k6BPen-lP3~~
zhXkyX?C(T}5v<W7muh9D4^J%uLASFC%M<LDL;;ljmX~#|i9#>D9$Jd$C~L-+VYnkH
zzz>S2e_Zo0(2+yg<WqC{*IK#>zH9aRk6JM@-Br^>2jL+HB&#>B7K0UOU{;3#wG{p5
z12yl=TAT6eE8(~Sl1o$_ka+|@?eY1Nzr$BRaf-`73PPC+oR;)p0q}s%Bx5(Q!J+BU
zbu#4WC&OT&9%SWd3>sB0{Be39??!!6osV-C<6UF@+c0KRuEyx&0!pK1Tl?1LJ6%H$
z1QtP}ZM_;RegRp_OkmX9MA^oHdRY3m`GtPPbok_j=L<?BJ>?H7rxv%5YuQP5(`Qwv
zae3cJE&tYm7~=(xq3=xcO&)5y!q<_G#*Ub_25>5Co<C{MFMk{m-GIpyH&T9WQy#Uj
zeWW-?`6s(IP8;{*%}QyU4d_>Ui^%A8%Tyy1&hb>${5U{4;}~=bx)Y&&sU-yi75kNZ
z<`SB(V?F*!_j(EN$7ONJIT&+MEvKUl54homg!lXh*BygEiTJ48E};|g>Br{zq*hP9
zery##I8&Y7A3vjxAC{>K4*P&lwW-fhoqN~rvGn^=q;hM+4?cMST=sIn2hF$q<io42
z#Fd&q0VWo)q-dMbBn<Nh*+v>}r?e=HQW0B>ln`(-1E%(6a=QZUb}UgCSxE7=B&JrS
zh!VnZecn<K28^j0Gc`+SA?S+W)Jhh|ZX-y=EZR1?mU2z7KigZ#xuG079V-!6A$$Uo
z4j{>hU_O3Str(2XpF(qVPvRJw?xc-Zm8n)}wMS`D8w?s802CBM#E+<HXL9*stF{k_
ziC}@P9Gu4(0Nc_=c?&5^_!0?DUky;ACC*~wg6nW1)%M0<fF2zvY=?v?dTq8ns22+u
zvu#HP4_wF>IwNwcqPuM*>A}TTr}gZzg#g@|bIISWB#0y>;V^?H7iK=E(yiz5l-1NM
zm~u%2wX|mfrG9Hp&Zv+1sO9yvL%%~w=w2sdkMv|u*UZ19e=#cT><F{HI{T}s`YFzg
zN$6tw&BV-rtY3#vI6gnnA3B`RI!?I5J?Shd%`ElppXT64FcLnIFr`IpY~)Fr^l>iK
zIulWO$^(-+P(Mr|hmu=L*K4{qbuMMmAh$6vr<07VA7O{Pky=Vw!QU5k@{`$WluiGF
zlGf5L_eWKCG?()Tm-dMYklg`|>|L5^NOow*J;uF|F;Yx<02UQJJ5<{pN*_`$s<JDy
zIzJ|hC6%}~VE_Fb%|Wd-UEy0AsCkYd6~#>P{n(bSW-?r(=#jVfMIZBpR1iKD-?x;8
zy5~5WjS432H?V8x%x+9aU*-cQ2^Ao{M*DxIKr15n`2oeOT6!nQz)ivp&e~01(l`WD
zwg3E}p5Xt0`YE@ipR#!|@7I9nFo8M$p=%gA&ktTyC};X%v;5i}?b)OWjqQ35gYXAv
zu7UN#a{9+d<fK}yzs0KgzeQXGIAV7bq@wZRe-#6WfkJPfNbnm6m0OA*`f>6FjnwI2
zFOA^}homT+1`*(Pg3QF#EJ(Op(tqn}%xFmVfAXjv&jak`!_Xx3pj#TGAq{E=rFmP9
z(+SO?5mg~2UNB6~imXWTwloYc%=u;6PL{d!s1KeG5&IPj>4HU3c{iU5JAuRsQT7@Q
z`Y3LGS<PAPUsO>Y<=^?yeR}dh9?L{;jX9f(I+9F9OXGj|1cnPwlPq{fKjA`WAhlkq
z<4I&)$ddWnD{uz!VaELw18&FayxDI+2qQ4h&z-F>;{;P_vrp+nH+-WB&4lt8zY?(1
z9$%>d6&l@>cRcv9yw9sHFt40aOm%cAz=Li5<+oAxOF@RahEEr+E~|Qe18{t&Yxuti
z9#(sAj~vT&mfQsTHE=utH24F{pr@@)W}yBrK|5~9anvC5n5d`2&-VYwF1*Oj8^rjQ
z{O47uuq$t&oXZ&_A<x3r_bnxrqTFw2k_pkr73WXr1$U6XpirQ49#nnbM%ZsHc-3fv
zk=CZ7HnO0FE{U*_aG53vu0~60FU7tljdE~2Be8@}Z3N>kXt+8JGLvo6GNOYp$)owL
z_+}H*p~^j&G)VB$%?5hXOa5*nX-Yzh9r+ALe}*oxoiw$NcmR!62O3+}ZHYmSwkqp|
zxE<cADj4vfu^mX57lXkg(w&VUb#%9hO|-(tY@fHQ)Najf71_v8$9`MlG6WvBa?16=
zLtbrU4fAmqQm#WZ-pmFVJE7Mhi*e8&LWV8mWjVHx4+s(7*PvEQEqgKyWw3?1T$WoE
z6K)H7R;pp84JpS~6;yDeZGmpnwI#c!on$L1doX<Q;6Zx}Mr|{-5)i$tI1kr$W-aQo
z<-lV^*fwxUjIF|<sKGnx?8_fQ#xUP{CT&PL*3ff~i<?6jMF*m+Ygrd(TiJUO4`4v*
z&EobRgWiN5;_}!~(rSkv*h!4iniJlhuipMGd37IPt3HLKL3)!1^2#>(WSni`7DUQ7
zE&|J*9FMvNKIWqjYb9vt&Ue9Hxs^IA0oE{QLTo#Zg}GS8a!x7}vxI)lZk`}u+}@;F
z5?tFDphv_*h)FU)fy~Ug?KBFA!O8c_kozx#3BtMd=a5_36P}M7D=oE13&C#4?i=+e
z5&qT^Yme?olraBK&Mjvl^g^5NgKQ)X((+1(9WtwJy0dbD@FWcTNsvOyfZe;E79MV}
z*7CeJmiSvMIfBw5#^+29TG}1ts2Fu+gQ@lFI)R>9B_Sw#emIY8BGcB}g+4Ll)Pd_6
z%eT3)A=~X>$F(B7My&L#%55&=%BxUL)xYtIgnN<*_CCUp7h0lK&!g<>mC}nW2~Q%)
zA4ZQc!Q)9vbW^36DwGP31iGZUtJ5gdQ;x4|9WF)n24ybqI37y+-;a*ovc_JO-YOU1
z@V?NRc9|c&!I^S_Cwzl3lFCuBj_R?$@Z6&E+e~teDu40mfd-jB7Vl4upk9r1$aO~!
zZ_r}MQeF~wKz0XGqvw$8`|&#b?C>+DOukp{EQ3d5qHpeWnA>!l<ro+TWncAmDB7V|
z4u5g@_0Yn!9D&vw!O~5n<=?p<^9v(<Sld&|?C0UI&NXkuQr%mDFgbi0@ljhsdSi2N
zq_r+&?Q8u-Co5_Jwyv}MaVV>87;ZSX!f!_Q`nCWEV`n!9&v+iT8~xOHfsj{nZ2PkV
ztO>C41`B7*G-717j<^o2&(cc1SH;0+HO-X;S~?i}XrbQw(tq(?$D4S`9%_aUXKm-X
z#7HTk@0`&|Wg(TsPiJsrrMz?vs;jQk8AR`$32CSM4nI5mDmr~4(x=S0BT?Yi#cfAE
z9mA&9#qkV;NrKS94?JmMG!gVMrqMLyvN$S5=6CPn@dxI19DygMNR&&&-ZYK`5Rv_~
zn4(iZC$7}}qqzJrD{j&4t5YkFM@Thjk%plaX%-8c2NOCC>>U-P!wDULy#cgWLN^_J
z9Aw-&v7);eam`(X8=4r8UY+yf@BNVG38#hG&ME6M&;UhM9zLCsTdtgGC(D7Z90&eG
zhr3oPpv&>!PzE=Q*>w;G%uHd`0j?)+Y&(zuV9)qlq=Q3R6Q0{#n6qWaB)Hb?-n!)@
zCLDf!@cUVvoa@@`8xMZC7>uLn;3k`~*%(b%954O)^2f0w*;`;$?6C%7|0Vwxj=cDE
z249ahz++zqaC^>qIKSSyW%=A7*LC(&OlNc1>t1p4j6<@&7CID%K+)mX7e8~Jngg#p
zc%_ru-FVUy!gTFm>jj&4^11<s-YN8|M=v@Edu;hSIPBsT&tg8at43ejWY%I%(c*EI
zZeF7in&`zc%=fdyW6m*k-*k8MN=LUj_-vF9|2Q1&aa_>I!DtWTB?-eA1v@+k!E>6*
zgzp@f1ND{e?1drK(&0HYo^C830?jKyBy|TZ4S-~Etf|A%2FF{r*@k%6rc=uy;8aKJ
zI~<2_di1U3sZhDQbCrex)n{%T9{|Z^8oK^+2q3-0>7*T$c<P*e4C&{`NChUk(^PsO
z_g#>9pfJW?1vhi`n(NSdL+3oZ{_y?m-CIX*3v><IKi1S?*B?6<T{;Ac4!?f*-IKU{
zv!#QuKZGk57DE;Qme7_=`ncZuJxyb^M`|7g^u47d9lteRkW|tyzm4#EQ22vw1%H&Z
znVGZFPg7{4WQ1E`k#tlo{lR0tohKvD6ADq)q%5x%=ZKUm@lCMaSd=bTb?)X-geup@
zx=-E;MK`^19x0VU`C?(GbA6Ch7bBmiKvU=pRmuJO7_X~Tw6h0ARWF8gTPXXhi(7{t
z20=GRFbIt9N~vLBOxNy{?gwIV6ol2R6^xr{7*J7&%Z5sQh!G@QLph-c*W3q?ab-tO
z^QfOQCS$N2)yRv_I*iSnM>on&N4z6z8Y-H(M5-qy8RRiCbV!CiTXDLYz5=^SojYVT
zsrj2)2`X<&Wv!&^>J%qPHr2a)zGO3ArE`X>wJ4p=QLe2!wBt~RoryFgl9uNR%ExFP
zz4Dj5BPbG_<~HH2dl9F*LttqXt(Y-03HUC*_7jiW1gDKgfJ-5wC@3P|DOYFH4c3Ub
zl;KdcMX_e+wB|f8cUtr1w$I_AmE#s4TYgS!<umP`ciHZ0&wb1;Yc1i>ZacyFO;X`j
znJn(wve<F|OXDU;7?O7@hwqakB;^|yfr<$uGNIQ3e8G^#YfeOf%ZOG+F?LRB-lB3T
z4U}BvmFJVWzsFwW26WSPHU~L5V;fsF*}Bt5kD^0`1pQ$?UN7gm)gA!;<S;%L!Z%n$
zzH;Yw^aajM#9QB=G$r~jUbp?B8-!0xBq<5?QOgdy{^|!cmo#(`_J(kYv~CfiAC6wg
z+!VO=M_k<F>+l>3PcH@uB6aqSEtb_Q5{qYB{tlC`wfia;A@NoCFS={v6_2li4V{E+
z6Vc#~J}0AU(h^VM7+vxt;k!f1TB;_-ccny-cbKFZM~eJ_@-WSiV(597T4w%eSDr^T
zz0?xW@&V@`b(`R?^6`|n_c&|^#+LIK>g#T9{}E`qiGiUJbq-o@B<o=td0*O2z@uPD
z9k@A%LE1x29lCwL!=veR(hfz3Uw`}nwAd}So|`J9F(rvRQELDwwWv#Xk%A?Tt8Kb-
zHyl}F$ov-@P5k6I@eP>U(tWB{@GYUH4!=Hk#^B_zi@fa*Abke?+vdU94#VCUJ~64L
z4;+a7K*XZI(xJRGcW-wMVdihI0%mnQ=BcP>kj0+?;$k!RXhq+X8TV6Mi))N+uJimd
zVb9f_HCT4LHm%9ax9XhX$40sgx&Jbr@_3(%S@9ncCV#9||99H0XDj6>XM4DuKhYR5
zr1<k~5w?q>&?``Bq^)=sQxGhOFxxTAyCv>p6OU;kSwJtbKar>37TwgT98Qlm|HGYE
z@0LY+XwN0xFbVRtIFKK(0APa_`xc3#?`~*vvQbojbB5$=@2+f`3T#t@z!R`C09ikx
zAHqjV8l-*>$u$(73##@5sLh+cAEpvy$<Zwr>@PIAE9|G$v5_ZNu(ny}3=QQkhS*k`
z|5*lNgFtpFV=vvNMEF~G?s&hBf$m5Iy7(vOZndx%emX+V>{oIKc1JJ{nOV1KM}?t!
z8n^{L8D>!80c+ZSX=9Ts9(V9~&!!ymvJp3jP=oi4#6ZQOqUt{k>|YL3hom)<ET(QT
zpg(^5-I|APWBoCF+)UYrAPjEQH+T<Nf>(=w8V~L`(F9XGj<xws2%Z`WN6EKLCS2@)
z!XY4-JO0IzG|ihIYx@(^<xR8eCWrDf=3IV0eH_VW=?e#$Yd5;tYn~l>5BEBqB4<0Q
zcl=qd)X)G$RUSTR<Lb(pR_xWhIp#m_;E%&HxWhke#*!S&OhcYXm}V-{>Z|3OO-S8g
z^VTh)aBMfrQlo7>*HYu0%juRv`v;wy92|+n-@2ym)6_g%vHr2*`PSVf<XnCFbOTo(
zcm-9|;|Cazltr8cZYi}hzwreUpg)F}lANML0>r(qzo%~aRX1~~-^I3Vy|Jy5II5fj
zTHqwBFT7+QRs~dFX*-q+v%^TO)XoIi)E}yrZ^2PGQ#IiyUgewh8c9mksSsq9Z%k|y
zY4H4X`kprn7({VMajh*+Qi|5sFgG8?6tW_*tQ-@4`nsTuvtF`RW5pqNR*5dmSMM>d
zaF>|c7TU@hDSx-OMB=Kuid}@Ul7)ewQFH1qp{Euq=#IJWdEOTh4816frU~4&=RM9#
zqi<`A@PkhdPO-6j(DlJzMZ3P!^)GV5G}LrSr5e`y1O%xIAuldPDvvpj$9U9Lxt;h9
zTgQ&Osp4(S7}r;~)r}cRNM`nrZ)jp}s09eXx!wCA%@Z1U={ntHaX#Z~!oq7JlgH>v
z2re3$CyTk47dPQP-uAze^fNZZG0GF_Zkpzrps%)v#%n`nnzfm9UZrgyz}e&rsOQx?
z_0y!)SE+eAGpKtt?ny*8RG?;}mg&3QZg`@9+;N#F!tdnBRUCDBnS@S-$a6T$RW5De
zK!G7Gs8-8)g92#QQk6P#;?Hk$Gpm1$2tF-5_&4ZI_)peEd{4wn8ed$eVTjN7G$8@>
zDDXkQ;+c?>1U|ZT+H@_u;hf{cCA{-|=mTbqY$AY}`3=~XIad3a9v!vtC%VjBf1+v#
zI&oI&F)<Tg>_g`F88`FJ3Wuaf&GP3-kn+qn=AQQR0-)f`x0X^DFzzT}#smnkF361_
zuh4;7%TZ^JHr?=}`%w!4*s^0S#dP0Un;#PjbqesXraqc7-$B>Xhw+X@ln9%wm-LmA
z(1J6!kt}4W+0Q=w9)|{0ho*MpE}Hz}T992y1&*FTi8cZ$&7?L^Y)OpggWw-$)zpEx
z3PToK99I2_p~3Ii;Zny1FVk_jG~mL+{l<kt9)l)ypHm|?xKs@kp#!H3&XZc^{NvQn
zUL#SSMTFBB1@U*fMuxeWwlecjU+V-|Y#v`!>Bf^Fm`5O7t!jBHU=sJ0mfYM!*Vf3Z
z%6Xt~`hDHWMhAL^(O-guUw#|qlxHL^sMs-yTQt$(8qaq-Dx?AS?|=J$;Bl4Kx@Z9a
D)>T_G

diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/HowToGuard.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/HowToGuard.cs
deleted file mode 100644
index 6827975ab9e..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/HowToGuard.cs
+++ /dev/null
@@ -1,32 +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.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// The struct provides guard related info.
-    /// </summary>
-    public struct HowToGuard
-    {
-        /// <summary>
-        /// Type being checked
-        /// </summary>
-        public string TypeToCheck;
-
-        /// <summary>
-        /// Member being checked
-        /// </summary>
-        public string MemberToCheck;
-
-        /// <summary>
-        /// Whether parameter count will be used for the check
-        /// </summary>
-        public int? ParameterCountToCheck;
-
-        /// <summary>
-        /// Type of check
-        /// </summary>
-        public string KindOfCheck;
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj
deleted file mode 100644
index f0661505dd3..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Title>Windows Community Toolkit UWP Platform Specific Analyzer</Title>
-    <Description>This standard library provides code analysis and code fixers (on CS and VB) to ensure that version / platform specific code is well guarded.</Description>
-    <PackageTags>UWP Toolkit Windows Platform Specific Analyzer</PackageTags>
-    
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Differences-6.0.0.0.gz" />
-    <None Remove="Differences-7.0.0.0.gz" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Differences-6.0.0.0.gz" />
-    <EmbeddedResource Include="Differences-7.0.0.0.gz" />
-  </ItemGroup>
-   
-  <ItemGroup>
-    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="tools\*.ps1" CopyToOutputDirectory="Always" Pack="true" PackagePath="" />
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/vb" Visible="false" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/NewMember.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/NewMember.cs
deleted file mode 100644
index 9596e4109be..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/NewMember.cs
+++ /dev/null
@@ -1,46 +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;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class wraps a new data members
-    /// </summary>
-    public struct NewMember
-    {
-        private static char[] methodCountSeparator = { '#' };
-
-        /// <summary>
-        /// Member name
-        /// </summary>
-        public string Name;
-
-        /// <summary>
-        /// Parameter count (if its a method)
-        /// </summary>
-        public int? ParameterCount;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NewMember"/> struct.
-        /// </summary>
-        /// <param name="s">data containing name and optionally parameter count</param>
-        public NewMember(string s)
-        {
-            string[] parts = s.Split(methodCountSeparator, StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Length == 2)
-            {
-                Name = parts[0];
-                ParameterCount = int.Parse(parts[1]);
-            }
-            else
-            {
-                Name = s;
-                ParameterCount = null;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Platform.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Platform.cs
deleted file mode 100644
index d6a3f876d2d..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Platform.cs
+++ /dev/null
@@ -1,69 +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;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// Simple struct to hold platform / version / param count info for given symbol
-    /// </summary>
-    public struct Platform
-    {
-        /// <summary>
-        /// Platform Kind
-        /// </summary>
-        public PlatformKind Kind;
-
-        /// <summary>
-        /// For UWP, this is version 15063 or 16299etc. For User, the fully qualified name of the attribute in use
-        /// </summary>
-        public string Version;
-
-        /// <summary>
-        /// For UWP only
-        /// </summary>
-        public bool ByParameterCount;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Platform"/> struct.
-        /// </summary>
-        /// <param name="kind"><see cref="PlatformKind"/></param>
-        /// <param name="version">version</param>
-        /// <param name="byParameterCount">boolean</param>
-        public Platform(PlatformKind kind, string version = null, bool byParameterCount = false)
-        {
-            Kind = kind;
-            Version = version;
-            ByParameterCount = byParameterCount;
-
-            switch (kind)
-            {
-                case PlatformKind.Unchecked:
-                    if (version != null)
-                    {
-                        throw new ArgumentException("No version expected");
-                    }
-
-                    break;
-
-                case PlatformKind.Uwp:
-                    break;
-
-                case PlatformKind.ExtensionSDK:
-                    if (version != null)
-                    {
-                        throw new ArgumentException("Don't specify versions for extension SDKs");
-                    }
-
-                    break;
-            }
-
-            if (byParameterCount && kind != PlatformKind.Uwp)
-            {
-                throw new ArgumentException("Only UWP can be distinguished by parameter count");
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformKind.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformKind.cs
deleted file mode 100644
index c38de8ed495..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformKind.cs
+++ /dev/null
@@ -1,27 +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.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// Platform kind enum
-    /// </summary>
-    public enum PlatformKind
-    {
-        /// <summary>
-        /// .NET and Pre-UWP WinRT
-        /// </summary>
-        Unchecked,
-
-        /// <summary>
-        /// Core UWP platform
-        /// </summary>
-        Uwp,
-
-        /// <summary>
-        /// Desktop, Mobile, IOT, Xbox extension SDK
-        /// </summary>
-        ExtensionSDK
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
deleted file mode 100644
index ea7b344a626..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerCS.cs
+++ /dev/null
@@ -1,230 +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.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class is a Roslyn code analyzer that checks for types / members that should be guarded against.
-    /// </summary>
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class PlatformSpecificAnalyzerCS : DiagnosticAnalyzer
-    {
-        /// <summary>
-        /// Gets supported diagnostics
-        /// </summary>
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
-        {
-            get { return ImmutableArray.Create(Analyzer.PlatformRule, Analyzer.VersionRule); }
-        }
-
-        /// <summary>
-        /// Gets instance of symbol from syntax node
-        /// </summary>
-        /// <param name="node">instance of <see cref="SyntaxNode"/></param>
-        /// <param name="semanticModel"><see cref="SemanticModel"/></param>
-        /// <returns><see cref="ISymbol"/></returns>
-        public static ISymbol GetTargetOfNode(SyntaxNode node, SemanticModel semanticModel)
-        {
-            var parentKind = node.Parent.Kind();
-
-            if (parentKind == SyntaxKind.InvocationExpression && node == ((InvocationExpressionSyntax)node.Parent).Expression)
-            {
-                // <target>(...)
-                // points to the method after overload resolution
-                return semanticModel.GetSymbolInfo((InvocationExpressionSyntax)node.Parent).Symbol;
-            }
-            else if (parentKind == SyntaxKind.ObjectCreationExpression && node == ((ObjectCreationExpressionSyntax)node.Parent).Type)
-            {
-                // New <target>
-                var objectCreationExpression = (ObjectCreationExpressionSyntax)node.Parent;
-                var target = semanticModel.GetSymbolInfo(objectCreationExpression).Symbol;
-
-                // points to the constructor after overload resolution
-                return target;
-            }
-            else
-            {
-                // f<target>(...)
-                // <target> x = ...
-                // Action x = <target>  -- note that following code does pick the right overload
-                // <target> += delegate -- the following code does recognize events
-                // nameof(<target>) -- I think it's nicer to report on this, even if not technically needed
-                // Field access? I'll disallow it for enum values, and allow it for everything else
-                var target = semanticModel.GetSymbolInfo(node).Symbol;
-
-                if (target == null)
-                {
-                    return null;
-                }
-
-                var targetKind = target.Kind;
-
-                if (targetKind == SymbolKind.Method || targetKind == SymbolKind.Event || targetKind == SymbolKind.Property || targetKind == SymbolKind.NamedType)
-                {
-                    return target;
-                }
-
-                if (targetKind == SymbolKind.Field && target.ContainingType.TypeKind == TypeKind.Enum)
-                {
-                    return target;
-                }
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Initializes the analyzer, registering for code analysis.
-        /// </summary>
-        /// <param name="context"><see cref="AnalysisContext"/></param>
-        public override void Initialize(AnalysisContext context)
-        {
-            ConcurrentDictionary<int, Diagnostic> reportsDictionary = new ConcurrentDictionary<int, Diagnostic>();
-
-            context.RegisterSyntaxNodeAction((c) => AnalyzeExpression(c, reportsDictionary), SyntaxKind.VariableDeclaration, SyntaxKind.FieldDeclaration, SyntaxKind.IdentifierName, SyntaxKind.SimpleMemberAccessExpression, SyntaxKind.QualifiedName);
-        }
-
-        private static IEnumerable<ISymbol> GetGuards(SyntaxNode node, SemanticModel semanticModel)
-        {
-            foreach (var condition in GetConditions(node))
-            {
-                // First check for invocations of ApiInformation.IsTypePresent
-                foreach (var invocation in condition.DescendantNodesAndSelf(i => i is InvocationExpressionSyntax))
-                {
-                    var targetMethod = semanticModel.GetSymbolInfo(invocation).Symbol;
-
-                    if (targetMethod?.ContainingType?.Name == "ApiInformation")
-                    {
-                        yield return targetMethod;
-                    }
-                }
-
-                // Next check for any property/field access
-                var accesses1 = condition.DescendantNodesAndSelf(d => d is MemberAccessExpressionSyntax).Select(n => semanticModel.GetSymbolInfo(n).Symbol);
-                var accesses2 = condition.DescendantNodesAndSelf(d => d is IdentifierNameSyntax).Select(n => semanticModel.GetSymbolInfo(n).Symbol);
-
-                foreach (var symbol in accesses1.Concat(accesses2))
-                {
-                    var symbolKind = symbol.Kind;
-
-                    if (symbolKind == SymbolKind.Field || symbolKind == SymbolKind.Property)
-                    {
-                        yield return symbol;
-                    }
-                }
-            }
-        }
-
-        private static IEnumerable<ExpressionSyntax> GetConditions(SyntaxNode node)
-        {
-            var check = node.FirstAncestorOrSelf<IfStatementSyntax>();
-
-            while (check != null)
-            {
-                yield return check.Condition;
-                check = check.Parent.FirstAncestorOrSelf<IfStatementSyntax>();
-            }
-        }
-
-        private void AnalyzeExpression(SyntaxNodeAnalysisContext context, ConcurrentDictionary<int, Diagnostic> reports)
-        {
-            var parentKind = context.Node.Parent.Kind();
-
-            // will be handled at higher level
-            if (parentKind == SyntaxKind.SimpleMemberAccessExpression || parentKind == SyntaxKind.QualifiedName)
-            {
-                return;
-            }
-
-            var target = GetTargetOfNode(context.Node, context.SemanticModel);
-
-            if (target == null)
-            {
-                return;
-            }
-
-            var platform = Analyzer.GetPlatformForSymbol(target);
-
-            // Some quick escapes
-            if (platform.Kind == PlatformKind.Unchecked)
-            {
-                return;
-            }
-
-            if (platform.Kind == PlatformKind.Uwp && platform.Version == Analyzer.N2SDKVersion)
-            {
-                return;
-            }
-
-            // Is this expression inside a method/constructor/property that claims to be specific?
-            var containingBlock = context.Node.FirstAncestorOrSelf<BlockSyntax>();
-
-            // for constructors and methods
-            MemberDeclarationSyntax containingMember = containingBlock?.FirstAncestorOrSelf<BaseMethodDeclarationSyntax>();
-
-            if (containingBlock == null || containingBlock?.Parent is AccessorDeclarationSyntax)
-            {
-                containingMember = context.Node.FirstAncestorOrSelf<PropertyDeclarationSyntax>();
-            }
-
-            // Is this invocation properly guarded? See readme.md for explanations.
-            if (IsProperlyGuarded(context.Node, context.SemanticModel))
-            {
-                return;
-            }
-
-            if (containingBlock != null)
-            {
-                foreach (var ret in containingBlock.DescendantNodes().OfType<ReturnStatementSyntax>())
-                {
-                    if (IsProperlyGuarded(ret, context.SemanticModel))
-                    {
-                        return;
-                    }
-                }
-            }
-
-            // We'll report only a single diagnostic per line, the first.
-            var loc = context.Node.GetLocation();
-            if (!loc.IsInSource)
-            {
-                return;
-            }
-
-            var line = loc.GetLineSpan().StartLinePosition.Line;
-            if (reports.TryGetValue(line, out var diagnostic) && diagnostic.Location.SourceSpan.Start <= loc.SourceSpan.Start)
-            {
-                return;
-            }
-
-            diagnostic = Diagnostic.Create(platform.Kind == PlatformKind.Uwp ? Analyzer.VersionRule : Analyzer.PlatformRule, loc);
-
-            reports[line] = diagnostic;
-
-            context.ReportDiagnostic(diagnostic);
-        }
-
-        private bool IsProperlyGuarded(SyntaxNode node, SemanticModel semanticModel)
-        {
-            foreach (var symbol in GetGuards(node, semanticModel))
-            {
-                if (symbol.ContainingType?.Name == "ApiInformation")
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
deleted file mode 100644
index ec67c731a74..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificAnalyzerVB.cs
+++ /dev/null
@@ -1,254 +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.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.VisualBasic;
-using Microsoft.CodeAnalysis.VisualBasic.Syntax;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class is a Roslyn code analyzer that checks for types / members that should be guarded against.
-    /// </summary>
-    [DiagnosticAnalyzer(LanguageNames.VisualBasic)]
-    public class PlatformSpecificAnalyzerVB : DiagnosticAnalyzer
-    {
-        /// <summary>
-        /// Gets supported diagnostics
-        /// </summary>
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
-        {
-            get { return ImmutableArray.Create(Analyzer.PlatformRule, Analyzer.VersionRule); }
-        }
-
-        /// <summary>
-        /// Gets instance of symbol from syntax node
-        /// </summary>
-        /// <param name="node">instance of <see cref="SyntaxNode"/></param>
-        /// <param name="semanticModel"><see cref="SemanticModel"/></param>
-        /// <returns><see cref="ISymbol"/></returns>
-        public static ISymbol GetTargetOfNode(SyntaxNode node, SemanticModel semanticModel)
-        {
-            var parentKind = node.Parent.Kind();
-
-            if (parentKind == SyntaxKind.InvocationExpression && node == ((InvocationExpressionSyntax)node.Parent).Expression)
-            {
-                // <target>(...)
-                // points to the method after overload resolution
-                return semanticModel.GetSymbolInfo((InvocationExpressionSyntax)node.Parent).Symbol;
-            }
-            else if (parentKind == SyntaxKind.AddressOfExpression)
-            {
-                // AddressOf <target>
-                return semanticModel.GetSymbolInfo(node).Symbol; // points to the method after overload resolution
-            }
-            else if (parentKind == SyntaxKind.ObjectCreationExpression && node == ((ObjectCreationExpressionSyntax)node.Parent).Type)
-            {
-                // New <target>
-                var objectCreationExpression = (ObjectCreationExpressionSyntax)node.Parent;
-                var target = semanticModel.GetSymbolInfo(objectCreationExpression).Symbol;
-
-                // points to the constructor after overload resolution
-                return target;
-            }
-            else if (parentKind == SyntaxKind.AddHandlerStatement && node == ((AddRemoveHandlerStatementSyntax)node.Parent).EventExpression)
-            {
-                // AddHandler <target>, delegate
-                return semanticModel.GetSymbolInfo(node).Symbol; // points to the event
-            }
-            else if (parentKind == SyntaxKind.NameOfExpression)
-            {
-                // NameOf(<target>)
-                return null;
-            }
-            else
-            {
-                // f(Of <target>)(...)  -- no warning
-                // Dim x As <target> = ...  -- no warning
-                // property access -- warning
-                // field access -- only warning on enum fields
-                // method access without arguments -- warning
-                var target = semanticModel.GetSymbolInfo(node).Symbol;
-
-                if (target == null)
-                {
-                    return null;
-                }
-
-                var targetKind = target.Kind;
-
-                if (targetKind == SymbolKind.Method || targetKind == SymbolKind.Property || targetKind == SymbolKind.NamedType)
-                {
-                    return target;
-                }
-
-                if (targetKind == SymbolKind.Field && target.ContainingType.TypeKind == TypeKind.Enum)
-                {
-                    return target;
-                }
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Initializes the analyzer, registering for code analysis.
-        /// </summary>
-        /// <param name="context"><see cref="AnalysisContext"/></param>
-        public override void Initialize(AnalysisContext context)
-        {
-            ConcurrentDictionary<int, Diagnostic> reportsDictionary = new ConcurrentDictionary<int, Diagnostic>();
-
-            context.RegisterSyntaxNodeAction((c) => AnalyzeExpression(c, reportsDictionary), SyntaxKind.LocalDeclarationStatement, SyntaxKind.IdentifierName, SyntaxKind.SimpleMemberAccessExpression, SyntaxKind.QualifiedName);
-        }
-
-        private static IEnumerable<ISymbol> GetGuards(SyntaxNode node, SemanticModel semanticModel)
-        {
-            foreach (var condition in GetConditions(node))
-            {
-                // First check for invocations of ApiInformation.IsTypePresent
-                foreach (var invocation in condition.DescendantNodesAndSelf(i => i is InvocationExpressionSyntax))
-                {
-                    var targetMethod = semanticModel.GetSymbolInfo(invocation).Symbol;
-
-                    if (targetMethod?.ContainingType?.Name == "ApiInformation")
-                    {
-                        yield return targetMethod;
-                    }
-                }
-
-                // Next check for any property/field access
-                var accesses1 = condition.DescendantNodesAndSelf(d => d is MemberAccessExpressionSyntax).Select(n => semanticModel.GetSymbolInfo(n).Symbol);
-                var accesses2 = condition.DescendantNodesAndSelf(d => d is IdentifierNameSyntax).Select(n => semanticModel.GetSymbolInfo(n).Symbol);
-
-                foreach (var symbol in accesses1.Concat(accesses2))
-                {
-                    if (symbol == null)
-                    {
-                        continue;
-                    }
-
-                    var symbolKind = symbol.Kind;
-
-                    if (symbolKind == SymbolKind.Field || symbolKind == SymbolKind.Property)
-                    {
-                        yield return symbol;
-                    }
-                }
-            }
-        }
-
-        private static IEnumerable<ExpressionSyntax> GetConditions(SyntaxNode node)
-        {
-            var check1 = node.FirstAncestorOrSelf<MultiLineIfBlockSyntax>();
-
-            while (check1 != null)
-            {
-                yield return check1.IfStatement.Condition;
-                check1 = check1.Parent.FirstAncestorOrSelf<MultiLineIfBlockSyntax>();
-            }
-
-            var check2 = node.FirstAncestorOrSelf<SingleLineIfStatementSyntax>();
-
-            while (check2 != null)
-            {
-                yield return check2.Condition;
-                check2 = check2.Parent.FirstAncestorOrSelf<SingleLineIfStatementSyntax>();
-            }
-        }
-
-        private void AnalyzeExpression(SyntaxNodeAnalysisContext context, ConcurrentDictionary<int, Diagnostic> reports)
-        {
-            var parentKind = context.Node.Parent.Kind();
-
-            // will be handled at higher level
-            if (parentKind == SyntaxKind.SimpleMemberAccessExpression || parentKind == SyntaxKind.QualifiedName)
-            {
-                return;
-            }
-
-            var target = GetTargetOfNode(context.Node, context.SemanticModel);
-
-            if (target == null)
-            {
-                return;
-            }
-
-            var platform = Analyzer.GetPlatformForSymbol(target);
-
-            // Some quick escapes
-            if (platform.Kind == PlatformKind.Unchecked)
-            {
-                return;
-            }
-
-            if (platform.Kind == PlatformKind.Uwp && platform.Version == Analyzer.N2SDKVersion)
-            {
-                return;
-            }
-
-            // Is this expression inside a method/constructor/property that claims to be specific?
-            DeclarationStatementSyntax containingMember = context.Node.FirstAncestorOrSelf<MethodBlockBaseSyntax>();
-
-            if (containingMember is AccessorBlockSyntax)
-            {
-                containingMember = containingMember.FirstAncestorOrSelf<PropertyBlockSyntax>();
-            }
-
-            // Is this invocation properly guarded? See readme.md for explanations.
-            if (IsProperlyGuarded(context.Node, context.SemanticModel))
-            {
-                return;
-            }
-
-            if (containingMember != null)
-            {
-                foreach (var ret in containingMember.DescendantNodes().OfType<ReturnStatementSyntax>())
-                {
-                    if (IsProperlyGuarded(ret, context.SemanticModel))
-                    {
-                        return;
-                    }
-                }
-            }
-
-            // We'll report only a single diagnostic per line, the first.
-            var loc = context.Node.GetLocation();
-            if (!loc.IsInSource)
-            {
-                return;
-            }
-
-            var line = loc.GetLineSpan().StartLinePosition.Line;
-            if (reports.TryGetValue(line, out var diagnostic) && diagnostic.Location.SourceSpan.Start <= loc.SourceSpan.Start)
-            {
-                return;
-            }
-
-            diagnostic = Diagnostic.Create(platform.Kind == PlatformKind.Uwp ? Analyzer.VersionRule : Analyzer.PlatformRule, loc);
-
-            reports[line] = diagnostic;
-
-            context.ReportDiagnostic(diagnostic);
-        }
-
-        private bool IsProperlyGuarded(SyntaxNode node, SemanticModel semanticModel)
-        {
-            foreach (var symbol in GetGuards(node, semanticModel))
-            {
-                if (symbol.ContainingType?.Name == "ApiInformation")
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
deleted file mode 100644
index 439d1958f19..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerCS.cs
+++ /dev/null
@@ -1,168 +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.Collections.Generic;
-using System.Collections.Immutable;
-using System.Composition;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Simplification;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class provides guard suggestion and can make the suggested changes.
-    /// </summary>
-    [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(PlatformSpecificFixerCS))]
-    [Shared]
-    public class PlatformSpecificFixerCS : CodeFixProvider
-    {
-        /// <summary>
-        /// Gets the list of Diagnostics that can be fixed.
-        /// </summary>
-        public sealed override ImmutableArray<string> FixableDiagnosticIds
-        {
-            get { return ImmutableArray.Create(Analyzer.PlatformRule.Id, Analyzer.VersionRule.Id); }
-        }
-
-        /// <summary>
-        /// Gets the Fix All provider
-        /// </summary>
-        /// <returns><see cref="WellKnownFixAllProviders"/></returns>
-        public sealed override FixAllProvider GetFixAllProvider()
-        {
-            return WellKnownFixAllProviders.BatchFixer;
-        }
-
-        /// <summary>
-        /// Registers for code fix.
-        /// </summary>
-        /// <param name="context"><see cref="CodeFixContext"/></param>
-        /// <returns>awaitable <see cref="Task"/></returns>
-        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
-        {
-            try
-            {
-                var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
-                var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
-
-                // Which node are we interested in? -- if the squiggle is over A.B().C,
-                // then we need the largest IdentifierName/SimpleMemberAccess/QualifiedName
-                // that encompasses "C" itself
-                var diagnostic = context.Diagnostics.First();
-                var span = new TextSpan(diagnostic.Location.SourceSpan.End - 1, 1);
-                var node = root.FindToken(span.Start).Parent;
-
-                SyntaxKind nodeKind = node.Kind();
-
-                while (nodeKind != SyntaxKind.IdentifierName && nodeKind != SyntaxKind.SimpleMemberAccessExpression && nodeKind != SyntaxKind.QualifiedName)
-                {
-                    node = node.Parent;
-
-                    if (node == null)
-                    {
-                        return;
-                    }
-
-                    nodeKind = node.Kind();
-                }
-
-                while (true)
-                {
-                    if (node.Parent?.Kind() == SyntaxKind.SimpleMemberAccessExpression)
-                    {
-                        node = node.Parent;
-                        continue;
-                    }
-
-                    if (node.Parent?.Kind() == SyntaxKind.QualifiedName)
-                    {
-                        node = node.Parent;
-                        continue;
-                    }
-
-                    break;
-                }
-
-                var target = PlatformSpecificAnalyzerCS.GetTargetOfNode(node, semanticModel);
-                var g = Analyzer.GetGuardForSymbol(target);
-
-                // Introduce a guard? (only if it is a method/accessor/constructor, i.e. somewhere that allows code)
-                var containingBlock = node.FirstAncestorOrSelf<BlockSyntax>();
-                if (containingBlock != null)
-                {
-                    var act1 = CodeAction.Create($"Add 'If ApiInformation.{g.KindOfCheck}'", (c) => IntroduceGuardAsync(context.Document, node, g, c), "PlatformSpecificGuard");
-                    context.RegisterCodeFix(act1, diagnostic);
-                }
-            }
-            catch
-            {
-            }
-        }
-
-        private async Task<Document> IntroduceGuardAsync(Document document, SyntaxNode node, HowToGuard g, CancellationToken cancellationToken)
-        {
-            // + if (Windows.Foundation.Metadata.ApiInformation.IsTypePresent(targetContainingType))
-            // {
-            //     old-statement
-            // + }
-            try
-            {
-                var oldStatement = node.FirstAncestorOrSelf<StatementSyntax>();
-                var oldLeadingTrivia = oldStatement.GetLeadingTrivia();
-
-                var conditionReceiver = SyntaxFactory.ParseName($"Windows.Foundation.Metadata.ApiInformation.{g.KindOfCheck}").WithAdditionalAnnotations(Simplifier.Annotation);
-                ArgumentListSyntax conditionArgument = null;
-
-                if (g.MemberToCheck == null)
-                {
-                    var conditionString1 = SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal(g.TypeToCheck));
-                    conditionArgument = SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(conditionString1)));
-                }
-                else
-                {
-                    var conditionString1 = SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal(g.TypeToCheck));
-                    var conditionString2 = SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal(g.MemberToCheck));
-                    var conditionInt3 = SyntaxFactory.LiteralExpression(SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal(g.ParameterCountToCheck ?? 0));
-
-                    IEnumerable<ArgumentSyntax> conditions = null;
-
-                    if (g.ParameterCountToCheck.HasValue)
-                    {
-                        conditions = new ArgumentSyntax[] { SyntaxFactory.Argument(conditionString1), SyntaxFactory.Argument(conditionString2), SyntaxFactory.Argument(conditionInt3) };
-                    }
-                    else
-                    {
-                        conditions = new ArgumentSyntax[] { SyntaxFactory.Argument(conditionString1), SyntaxFactory.Argument(conditionString2) };
-                    }
-
-                    conditionArgument = SyntaxFactory.ArgumentList(SyntaxFactory.SeparatedList(conditions));
-                }
-
-                var condition = SyntaxFactory.InvocationExpression(conditionReceiver, conditionArgument);
-
-                var thenStatements = SyntaxFactory.Block(oldStatement.WithoutLeadingTrivia());
-                var ifStatement = SyntaxFactory.IfStatement(condition, thenStatements).WithLeadingTrivia(oldLeadingTrivia).WithAdditionalAnnotations(Formatter.Annotation);
-
-                var oldRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-                var newRoot = oldRoot.ReplaceNode(oldStatement, ifStatement);
-
-                return document.WithSyntaxRoot(newRoot);
-            }
-            catch
-            {
-            }
-
-            return document;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
deleted file mode 100644
index e7f91129fd3..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/PlatformSpecificFixerVB.cs
+++ /dev/null
@@ -1,168 +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.Collections.Generic;
-using System.Collections.Immutable;
-using System.Composition;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Simplification;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.CodeAnalysis.VisualBasic;
-using Microsoft.CodeAnalysis.VisualBasic.Syntax;
-
-namespace Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer
-{
-    /// <summary>
-    /// This class provides guard suggestion and can make the suggested changes.
-    /// </summary>
-    [ExportCodeFixProvider(LanguageNames.VisualBasic, Name = nameof(PlatformSpecificFixerCS))]
-    [Shared]
-    public class PlatformSpecificFixerVB : CodeFixProvider
-    {
-        /// <summary>
-        /// Gets the list of Diagnostics that can be fixed.
-        /// </summary>
-        public sealed override ImmutableArray<string> FixableDiagnosticIds
-        {
-            get { return ImmutableArray.Create(Analyzer.PlatformRule.Id, Analyzer.VersionRule.Id); }
-        }
-
-        /// <summary>
-        /// Gets the Fix All provider
-        /// </summary>
-        /// <returns><see cref="WellKnownFixAllProviders"/></returns>
-        public sealed override FixAllProvider GetFixAllProvider()
-        {
-            return WellKnownFixAllProviders.BatchFixer;
-        }
-
-        /// <summary>
-        /// Registers for code fix.
-        /// </summary>
-        /// <param name="context"><see cref="CodeFixContext"/></param>
-        /// <returns>awaitable <see cref="Task"/></returns>
-        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
-        {
-            try
-            {
-                var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
-                var semanticModel = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
-
-                // Which node are we interested in? -- if the squiggle is over A.B().C,
-                // then we need the largest IdentifierName/SimpleMemberAccess/QualifiedName
-                // that encompasses "C" itself
-                var diagnostic = context.Diagnostics.First();
-                var span = new TextSpan(diagnostic.Location.SourceSpan.End - 1, 1);
-                var node = root.FindToken(span.Start).Parent;
-
-                SyntaxKind nodeKind = node.Kind();
-
-                while (nodeKind != SyntaxKind.IdentifierName && nodeKind != SyntaxKind.SimpleMemberAccessExpression && nodeKind != SyntaxKind.QualifiedName)
-                {
-                    node = node.Parent;
-
-                    if (node == null)
-                    {
-                        return;
-                    }
-
-                    nodeKind = node.Kind();
-                }
-
-                while (true)
-                {
-                    if (node.Parent?.Kind() == SyntaxKind.SimpleMemberAccessExpression)
-                    {
-                        node = node.Parent;
-                        continue;
-                    }
-
-                    if (node.Parent?.Kind() == SyntaxKind.QualifiedName)
-                    {
-                        node = node.Parent;
-                        continue;
-                    }
-
-                    break;
-                }
-
-                var target = PlatformSpecificAnalyzerVB.GetTargetOfNode(node, semanticModel);
-                var g = Analyzer.GetGuardForSymbol(target);
-
-                // Introduce a guard? (only if it is a method/accessor/constructor, i.e. somewhere that allows code)
-                var containingBlock = node.FirstAncestorOrSelf<MethodBlockBaseSyntax>();
-                if (containingBlock != null)
-                {
-                    var act1 = CodeAction.Create($"Add 'If ApiInformation.{g.KindOfCheck}'", (c) => IntroduceGuardAsync(context.Document, node, g, c), "PlatformSpecificGuard");
-                    context.RegisterCodeFix(act1, diagnostic);
-                }
-            }
-            catch
-            {
-            }
-        }
-
-        private async Task<Document> IntroduceGuardAsync(Document document, SyntaxNode node, HowToGuard g, CancellationToken cancellationToken)
-        {
-            // + If Windows.Foundation.Metadata.ApiInformation.IsTypePresent(targetContainingType) Then
-            //      old-statement
-            // + End If
-            try
-            {
-                var oldStatement = node.FirstAncestorOrSelf<StatementSyntax>();
-                var oldLeadingTrivia = oldStatement.GetLeadingTrivia();
-
-                var conditionReceiver = SyntaxFactory.ParseName($"Windows.Foundation.Metadata.ApiInformation.{g.KindOfCheck}").WithAdditionalAnnotations(Simplifier.Annotation);
-                ArgumentListSyntax conditionArgument = null;
-
-                if (g.MemberToCheck == null)
-                {
-                    var conditionString1 = SyntaxFactory.StringLiteralExpression(SyntaxFactory.StringLiteralToken($"\"{g.TypeToCheck}\"", g.TypeToCheck));
-                    conditionArgument = SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList<ArgumentSyntax>(SyntaxFactory.SimpleArgument(conditionString1)));
-                }
-                else
-                {
-                    var conditionString1 = SyntaxFactory.StringLiteralExpression(SyntaxFactory.StringLiteralToken($"\"{g.TypeToCheck}\"", g.TypeToCheck));
-                    var conditionString2 = SyntaxFactory.StringLiteralExpression(SyntaxFactory.StringLiteralToken($"\"{g.MemberToCheck}\"", g.MemberToCheck));
-                    var conditionInt3 = SyntaxFactory.LiteralExpression(SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal(g.ParameterCountToCheck ?? 0));
-
-                    IEnumerable<ArgumentSyntax> conditions = null;
-
-                    if (g.ParameterCountToCheck.HasValue)
-                    {
-                        conditions = new ArgumentSyntax[] { SyntaxFactory.SimpleArgument(conditionString1), SyntaxFactory.SimpleArgument(conditionString2), SyntaxFactory.SimpleArgument(conditionInt3) };
-                    }
-                    else
-                    {
-                        conditions = new ArgumentSyntax[] { SyntaxFactory.SimpleArgument(conditionString1), SyntaxFactory.SimpleArgument(conditionString2) };
-                    }
-
-                    conditionArgument = SyntaxFactory.ArgumentList(SyntaxFactory.SeparatedList(conditions));
-                }
-
-                var condition = SyntaxFactory.InvocationExpression(conditionReceiver, conditionArgument);
-
-                var ifStatement = SyntaxFactory.IfStatement(condition);
-                var thenStatements = SyntaxFactory.SingletonList(oldStatement.WithoutLeadingTrivia());
-                var ifBlock = SyntaxFactory.MultiLineIfBlock(ifStatement).WithStatements(thenStatements).WithLeadingTrivia(oldLeadingTrivia).WithAdditionalAnnotations(Formatter.Annotation);
-
-                var oldRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-                var newRoot = oldRoot.ReplaceNode(oldStatement, ifBlock);
-
-                return document.WithSyntaxRoot(newRoot);
-            }
-            catch
-            {
-            }
-
-            return document;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/install.ps1 b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/install.ps1
deleted file mode 100644
index c1c3d88223e..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/install.ps1
+++ /dev/null
@@ -1,58 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-if($project.Object.SupportsPackageDependencyResolution)
-{
-    if($project.Object.SupportsPackageDependencyResolution())
-    {
-        # Do not install analyzers via install.ps1, instead let the project system handle it.
-        return
-    }
-}
-
-$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers") * -Resolve
-
-foreach($analyzersPath in $analyzersPaths)
-{
-    if (Test-Path $analyzersPath)
-    {
-        # Install the language agnostic analyzers.
-        foreach ($analyzerFilePath in Get-ChildItem -Path "$analyzersPath\*.dll" -Exclude *.resources.dll)
-        {
-            if($project.Object.AnalyzerReferences)
-            {
-                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
-            }
-        }
-    }
-}
-
-# $project.Type gives the language name like (C# or VB.NET)
-$languageFolder = ""
-if($project.Type -eq "C#")
-{
-    $languageFolder = "cs"
-}
-if($project.Type -eq "VB.NET")
-{
-    $languageFolder = "vb"
-}
-if($languageFolder -eq "")
-{
-    return
-}
-
-foreach($analyzersPath in $analyzersPaths)
-{
-    # Install language specific analyzers.
-    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
-    if (Test-Path $languageAnalyzersPath)
-    {
-        foreach ($analyzerFilePath in Get-ChildItem -Path "$languageAnalyzersPath\*.dll" -Exclude *.resources.dll)
-        {
-            if($project.Object.AnalyzerReferences)
-            {
-                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/uninstall.ps1 b/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/uninstall.ps1
deleted file mode 100644
index 65a86237039..00000000000
--- a/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/tools/uninstall.ps1
+++ /dev/null
@@ -1,65 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-if($project.Object.SupportsPackageDependencyResolution)
-{
-    if($project.Object.SupportsPackageDependencyResolution())
-    {
-        # Do not uninstall analyzers via uninstall.ps1, instead let the project system handle it.
-        return
-    }
-}
-
-$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers") * -Resolve
-
-foreach($analyzersPath in $analyzersPaths)
-{
-    # Uninstall the language agnostic analyzers.
-    if (Test-Path $analyzersPath)
-    {
-        foreach ($analyzerFilePath in Get-ChildItem -Path "$analyzersPath\*.dll" -Exclude *.resources.dll)
-        {
-            if($project.Object.AnalyzerReferences)
-            {
-                $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
-            }
-        }
-    }
-}
-
-# $project.Type gives the language name like (C# or VB.NET)
-$languageFolder = ""
-if($project.Type -eq "C#")
-{
-    $languageFolder = "cs"
-}
-if($project.Type -eq "VB.NET")
-{
-    $languageFolder = "vb"
-}
-if($languageFolder -eq "")
-{
-    return
-}
-
-foreach($analyzersPath in $analyzersPaths)
-{
-    # Uninstall language specific analyzers.
-    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
-    if (Test-Path $languageAnalyzersPath)
-    {
-        foreach ($analyzerFilePath in Get-ChildItem -Path "$languageAnalyzersPath\*.dll" -Exclude *.resources.dll)
-        {
-            if($project.Object.AnalyzerReferences)
-            {
-                try
-                {
-                    $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
-                }
-                catch
-                {
-
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 9e8e27cba22..7b4d6b3a1c6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -897,14 +897,6 @@
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/high-performance/Introduction.md"
       },
-      {
-        "Name": "PlatformSpecificAnalyzer",
-        "Subcategory": "Developer",
-        "About": "Platform Specific Analyzer is a Roslyn analyzer that analyzes and suggests code fixes to ensure that any version / platform specific API are guarded by correct runtime checks",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/platform-specific/PlatformSpecificAnalyzer.md"
-      },
       {
         "Name": "CompareStateTrigger",
         "Type": "CompareStateTriggerPage",
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index b9f6ee4728f..bde15545a69 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -76,12 +76,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Parsers", "Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj", "{42CA4935-54BE-42EA-AC19-992378C08DE6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlatformSpecific", "PlatformSpecific", "{096ECFD7-7035-4487-9C87-81DCE9389620}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DifferencesGen", "Microsoft.Toolkit.Uwp.PlatformDifferencesGen\DifferencesGen.csproj", "{292D34E8-0F01-4FA8-951D-8232F75A88D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer", "Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer\Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj", "{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Toolkit.Uwp.Input.GazeInteraction", "Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj", "{A5E98964-45B1-442D-A07A-298A3221D81E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}"
@@ -680,55 +674,6 @@ Global
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x64.Build.0 = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x64.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|ARM.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|x64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Native|x86.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM64.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x64.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x86.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x86.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|ARM.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|x64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Native|x86.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM64.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x64.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.Build.0 = Release|Any CPU
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.Build.0 = Debug|Win32
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -1076,8 +1021,6 @@ Global
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA} = {9333C63A-F64F-4797-82B3-017422668A5D}
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5} = {096ECFD7-7035-4487-9C87-81DCE9389620}
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF} = {096ECFD7-7035-4487-9C87-81DCE9389620}
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6} = {B30036C4-D514-4E5B-A323-587A061772CE}
 		{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{4E9466D1-D5AA-46AC-801B-C8FDAB79F0D4} = {B30036C4-D514-4E5B-A323-587A061772CE}

From 1cb4df26de0ed40ff3c3ad3993daf7618ae8ff2a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 19 Aug 2020 13:45:47 +0200
Subject: [PATCH 400/595] Speed/memory improvements to
 SetPropertyAndNotifyOnCompletion

---
 .../ComponentModel/ObservableObject.cs        | 58 +++++++------------
 .../Input/AsyncRelayCommand.cs                |  2 +-
 .../Input/AsyncRelayCommand{T}.cs             |  2 +-
 .../Mvvm/Test_ObservableObject.cs             |  2 +-
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index eaff311f873..4e5eb57ecaa 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -312,27 +312,22 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// public Task MyTask
         /// {
         ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
+        ///     private set => SetAndNotifyOnCompletion(() => ref myTask, value);
         /// }
         /// </code>
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
-        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
-        /// </param>
+        /// <param name="fieldAccessor">The <see cref="FieldAccessor{T}"/> instance to access the backing field for the property.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
-        /// and new value for the target property are the same. The return value being <see langword="true"/> only
-        /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current and new
+        /// value for the target property are the same. The return value being <see langword="true"/> only indicates that the
+        /// new value being assigned to field provided by <paramref name="fieldAccessor"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="fieldExpression"/> is not valid.</exception>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fieldAccessor, TTask? newValue, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
@@ -341,21 +336,19 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
             // instance. This will result in no further allocations after the first time this method is called for a given
             // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
             // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
-            return SetPropertyAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
+            return SetPropertyAndNotifyOnCompletion(fieldAccessor, newValue, _ => { }, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(FieldAccessor{TTask},TTask,string)"/>,
         /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
         /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="fieldAccessor">The <see cref="FieldAccessor{T}"/> instance to access the backing field for the property.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
@@ -364,10 +357,12 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="fieldExpression"/> is not valid.</exception>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fieldAccessor, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
+            // Invoke the accessor once to get a field reference for the synchronous part
+            ref TTask? field = ref fieldAccessor();
+
             if (ReferenceEquals(field, newValue))
             {
                 return false;
@@ -398,16 +393,6 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
                 return true;
             }
 
-            // Get the target field to set. This is needed because we can't
-            // capture the ref field in a closure (for the async method).
-            if (!((fieldExpression.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
-            {
-                ThrowArgumentExceptionForInvalidFieldExpression();
-
-                // This is never executed, as the method above always throws
-                return false;
-            }
-
             // We use a local async function here so that the main method can
             // remain synchronous and return a value that can be immediately
             // used by the caller. This mirrors Set<T>(ref T, T, string).
@@ -427,7 +412,7 @@ async void MonitorTask()
                 {
                 }
 
-                TTask? currentTask = (TTask?)fieldInfo.GetValue(this);
+                TTask? currentTask = fieldAccessor();
 
                 // Only notify if the property hasn't changed
                 if (ReferenceEquals(newValue, currentTask))
@@ -444,19 +429,18 @@ async void MonitorTask()
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
+        /// A custom <see langword="delegate"/> that returns a reference to a backing field to a property.
         /// </summary>
-        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
-        {
-            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
-        }
+        /// <typeparam name="T">The type of reference to return.</typeparam>
+        /// <returns>A reference to the backing field of a property.</returns>
+        protected delegate ref T FieldAccessor<T>();
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
+        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>
-        private static void ThrowArgumentExceptionForInvalidFieldExpression()
+        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
         {
-            throw new ArgumentException("The given expression must be in the form () => field");
+            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index ee03b23a1f0..b2c74b300db 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -58,7 +58,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(() => ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 14d2c65d4b7..3d8d733ddcd 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -58,7 +58,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(() => ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 89e70171139..82f64fffbdd 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -226,7 +226,7 @@ public class SampleModelWithTask<T> : ObservableObject
             public Task<T> Data
             {
                 get => data;
-                set => SetPropertyAndNotifyOnCompletion(ref data, () => data, value);
+                set => SetPropertyAndNotifyOnCompletion(() => ref data, value);
             }
         }
     }

From f9995415d212dec7880d62d0a9f84deaabead8f9 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 16:28:48 -0700
Subject: [PATCH 401/595] Update
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .../SamplePages/TextToolbar/TextToolbarPage.xaml.cs          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
index 8e26d0fd635..42a46a44a3b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -106,8 +106,7 @@ private void UseRichTextFormatter()
                 return;
             }
 
-            var formatter = new RichTextFormatter();
-            _toolbar.Formatter = formatter;
+            _toolbar.Formatter = new RichTextFormatter();
         }
 
         private void UseMarkDownFormatter()
@@ -203,4 +202,4 @@ private void EditZone_TextChanged(object sender, RoutedEventArgs e)
 
         private int DemoCounter { get; set; } = 0;
     }
-}
\ No newline at end of file
+}

From 16d8ac080aebe97ad9e5f04f704f6f77736e080a Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 16:29:03 -0700
Subject: [PATCH 402/595] Update
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .../SamplePages/TextToolbar/TextToolbarPage.xaml.cs            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
index 42a46a44a3b..a299a577d2c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -116,8 +116,7 @@ private void UseMarkDownFormatter()
                 return;
             }
 
-            var formatter = new MarkDownFormatter();
-            _toolbar.Formatter = formatter;
+            _toolbar.Formatter = new MarkDownFormatter();
         }
 
         private void UseCustomFormatter()

From 4f3bbd12db3d64171c5ed2cda86210b4c27bfb33 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 16:29:24 -0700
Subject: [PATCH 403/595] Update
 Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .../TextToolbar/TextToolbar.Events.cs                        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
index e74e5345cfb..30a9491d6ad 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
@@ -67,8 +67,7 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
         /// <param name="args">Property Changed Args</param>
         private static void OnFormatterChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var bar = obj as TextToolbar;
-            if (bar != null && bar.Formatter != null)
+            if (obj is TextToolbar bar && bar.Formatter != null)
             {
                 if (args.OldValue is Formatter formatter)
                 {
@@ -316,4 +315,4 @@ public bool ShiftKeyDown
         /// </summary>
         public event EventHandler<EditorChangedArgs> EditorChanged;
     }
-}
\ No newline at end of file
+}

From acf41acfae771e697e6940277ad5421255bc305d Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 16:32:57 -0700
Subject: [PATCH 404/595] Update
 Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
index 2cb3e50f530..c8418670bbc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
@@ -45,7 +45,7 @@ protected override void OnApplyTemplate()
         {
             if (Formatter == null)
             {
-                throw new InvalidOperationException("No formatter specificed.");
+                throw new InvalidOperationException("No formatter specified.");
             }
             else
             {
@@ -55,4 +55,4 @@ protected override void OnApplyTemplate()
             base.OnApplyTemplate();
         }
     }
-}
\ No newline at end of file
+}

From 5b2af5686d4167102cc3adda7a5eb8bdf6313357 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 17:03:32 -0700
Subject: [PATCH 405/595] Null check on Formatter, and using pattern matching
 on TextToolbar.

---
 .../TextToolbar/TextToolbar.Events.cs         | 58 +++++++++----------
 .../TextToolbar/TextToolbar.Methods.cs        |  9 +--
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
index 30a9491d6ad..b9bcb3ce1d8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
@@ -32,8 +32,7 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
                 return;
             }
 
-            var bar = obj as TextToolbar;
-            if (bar != null)
+            if (obj is TextToolbar bar)
             {
                 var oldEditor = args.OldValue as RichEditBox;
                 var newEditor = args.NewValue as RichEditBox;
@@ -46,8 +45,15 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
                 if (newEditor != null)
                 {
                     newEditor.AddHandler(KeyDownEvent, bar.KeyEventHandler, handledEventsToo: true);
-                    bar.Formatter.SetModel(bar);
-                    bar.DefaultButtons = bar.Formatter.DefaultButtons;
+                    if (bar.Formatter != null)
+                    {
+                        bar.Formatter.SetModel(bar);
+                        bar.DefaultButtons = bar.Formatter.DefaultButtons;
+                    }
+                    else
+                    {
+                        bar.DefaultButtons = null;
+                    }
                 }
 
                 var editorArgs = new EditorChangedArgs
@@ -67,16 +73,19 @@ private static void OnEditorChanged(DependencyObject obj, DependencyPropertyChan
         /// <param name="args">Property Changed Args</param>
         private static void OnFormatterChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            if (obj is TextToolbar bar && bar.Formatter != null)
+            if (obj is TextToolbar bar)
             {
                 if (args.OldValue is Formatter formatter)
                 {
                     formatter.UnsetModel(bar);
                 }
 
-                bar.Formatter.SetModel(bar);
-                bar.DefaultButtons = bar.Formatter.DefaultButtons;
-                bar.BuildBar();
+                if (bar.Formatter != null)
+                {
+                    bar.Formatter.SetModel(bar);
+                    bar.DefaultButtons = bar.Formatter.DefaultButtons;
+                    bar.BuildBar();
+                }
             }
         }
 
@@ -87,14 +96,11 @@ private static void OnFormatterChanged(DependencyObject obj, DependencyPropertyC
         /// <param name="args">Property Changed Args</param>
         private static void OnButtonMapChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var bar = obj as TextToolbar;
-            if (bar != null)
+            if (obj is TextToolbar bar)
             {
-                var oldSource = args.OldValue as ButtonMap;
-                var newSource = args.NewValue as ButtonMap;
                 var root = bar.GetTemplateChild(RootControl) as CommandBar;
 
-                if (oldSource != null)
+                if (args.OldValue is ButtonMap oldSource)
                 {
                     oldSource.CollectionChanged -= bar.OnButtonMapModified;
 
@@ -107,7 +113,7 @@ private static void OnButtonMapChanged(DependencyObject obj, DependencyPropertyC
                     }
                 }
 
-                if (newSource != null)
+                if (args.NewValue is ButtonMap newSource)
                 {
                     newSource.CollectionChanged += bar.OnButtonMapModified;
 
@@ -126,19 +132,16 @@ private static void OnButtonMapChanged(DependencyObject obj, DependencyPropertyC
         /// <param name="args">Property Changed Args</param>
         private static void OnDefaultButtonModificationsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var bar = obj as TextToolbar;
-            if (bar != null)
+            if (obj is TextToolbar bar)
             {
-                var oldSource = args.OldValue as DefaultButtonModificationList;
-                var newSource = args.NewValue as DefaultButtonModificationList;
                 var root = bar.GetTemplateChild(RootControl) as CommandBar;
 
-                if (oldSource != null)
+                if (args.OldValue is DefaultButtonModificationList oldSource)
                 {
                     oldSource.CollectionChanged -= bar.OnDefaultButtonModificationListChanged;
                 }
 
-                if (newSource != null)
+                if (args.NewValue is DefaultButtonModificationList newSource)
                 {
                     newSource.CollectionChanged += bar.OnDefaultButtonModificationListChanged;
 
@@ -158,8 +161,7 @@ private static void OnDefaultButtonModificationsChanged(DependencyObject obj, De
         /// <param name="e">Collection Changed Args</param>
         private void OnButtonMapModified(object sender, NotifyCollectionChangedEventArgs e)
         {
-            var root = GetTemplateChild(RootControl) as CommandBar;
-            if (root != null)
+            if (GetTemplateChild(RootControl) is CommandBar root)
             {
                 switch (e.Action)
                 {
@@ -168,8 +170,7 @@ private void OnButtonMapModified(object sender, NotifyCollectionChangedEventArgs
                         {
                             AddToolbarItem(item, root);
 
-                            var button = item as ToolbarButton;
-                            if (button != null)
+                            if (item is ToolbarButton button)
                             {
                                 button.PropertyChanged += ToolbarItemPropertyChanged;
                             }
@@ -182,8 +183,7 @@ private void OnButtonMapModified(object sender, NotifyCollectionChangedEventArgs
                         {
                             RemoveToolbarItem(item);
 
-                            var button = item as ToolbarButton;
-                            if (button != null)
+                            if (item is ToolbarButton button)
                             {
                                 button.PropertyChanged -= ToolbarItemPropertyChanged;
                             }
@@ -225,8 +225,7 @@ private void OnDefaultButtonModificationListChanged(object sender, NotifyCollect
         /// <param name="e">Property Changed Event</param>
         private void ToolbarItemPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            var root = GetTemplateChild(RootControl) as CommandBar;
-            if (root != null)
+            if (GetTemplateChild(RootControl) is CommandBar root)
             {
                 if (e.PropertyName == nameof(IToolbarItem.Position))
                 {
@@ -249,8 +248,7 @@ private void Editor_KeyDown(object sender, KeyRoutedEventArgs e)
 
             LastKeyPress = e.Key;
 
-            var root = GetTemplateChild(RootControl) as CommandBar;
-            if (root != null)
+            if (GetTemplateChild(RootControl) is CommandBar root)
             {
                 if (ControlKeyDown && e.Key != VirtualKey.Control)
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
index 7d30afc9e3f..589a6a61258 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
@@ -23,8 +23,7 @@ public partial class TextToolbar
         /// <returns>Default Toolbar Button</returns>
         public ToolbarButton GetDefaultButton(ButtonType button)
         {
-            var root = GetTemplateChild(RootControl) as CommandBar;
-            if (root != null)
+            if (GetTemplateChild(RootControl) is CommandBar root)
             {
                 var element = root.PrimaryCommands.OfType<ToolbarButton>().FirstOrDefault(item => ((FrameworkElement)item).Name == button.ToString());
                 return element;
@@ -38,8 +37,7 @@ public ToolbarButton GetDefaultButton(ButtonType button)
         /// </summary>
         private void BuildBar()
         {
-            var root = GetTemplateChild(RootControl) as CommandBar;
-            if (root != null)
+            if (GetTemplateChild(RootControl) is CommandBar root)
             {
                 root.PrimaryCommands.Clear();
 
@@ -90,8 +88,7 @@ private void AddToolbarItem(IToolbarItem item, CommandBar root)
 
             if (!root.PrimaryCommands.Contains(item))
             {
-                var button = item as ToolbarButton;
-                if (button != null)
+                if (item is ToolbarButton button)
                 {
                     button.Model = this;
                 }

From c80e1544e959eb77d5a4607aba1d146189703db8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 17:06:15 -0700
Subject: [PATCH 406/595] Applied PR feedback.

---
 .../SamplePages/TextToolbar/TextToolbarCode.bind               | 3 +--
 .../SamplePages/TextToolbar/TextToolbarPage.xaml.cs            | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
index 3b455448330..74d8d36f80a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarCode.bind
@@ -18,8 +18,7 @@ private void EditZone_TextChanged(object sender, Windows.UI.Xaml.RoutedEventArgs
 
 private void UseCustomFormatter()
 {
-    var formatter = new SampleFormatter();
-    Toolbar.Formatter = formatter;
+    Toolbar.Formatter = new SampleFormatter();
 }
 
 private int DemoCounter { get; set; } = 0;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
index a299a577d2c..1d70f2ebc67 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs
@@ -126,8 +126,7 @@ private void UseCustomFormatter()
                 return;
             }
 
-            var formatter = new SampleFormatter();
-            _toolbar.Formatter = formatter;
+            _toolbar.Formatter = new SampleFormatter();
         }
 
         private void AddCustomButton()

From 32f36c84a38ede183565effcfef3331a4674e092 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 19:27:27 -0700
Subject: [PATCH 407/595] Replaced ToolbarFormatterActiveConverter to a generic
 TypeToObjectConverter.

---
 .../SamplePages/TextToolbar/TextToolbar.bind  | 11 ++-
 .../TextToolbar/TextToolbarPage.xaml          | 11 ++-
 .../ToolbarFormatterActiveConverter.cs        | 48 ----------
 .../Converters/TypeToObjectConverter.cs       | 95 +++++++++++++++++++
 .../Converters/Test_TypeToObjectConverter.cs  | 57 +++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  1 +
 6 files changed, 171 insertions(+), 52 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Converters/TypeToObjectConverter.cs
 create mode 100644 UnitTests/UnitTests.UWP/Converters/Test_TypeToObjectConverter.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
index 5be1d7361ef..826d35feae1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
@@ -12,8 +12,15 @@
       mc:Ignorable="d">
 
   <Page.Resources>
-    <converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
-                                                 FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
+    <converters:TypeToObjectConverter x:Key="IsMarkdownFormatter"
+                                                 Type="markDown:MarkDownFormatter">
+            <converters:TypeToObjectConverter.TrueValue>
+                <Visibility>Visible</Visibility>
+            </converters:TypeToObjectConverter.TrueValue>
+            <converters:TypeToObjectConverter.FalseValue>
+                <Visibility>Collapsed</Visibility>
+            </converters:TypeToObjectConverter.FalseValue>
+        </converters:TypeToObjectConverter>
   </Page.Resources>
 
   <Grid x:Name="MainGrid"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
index 8bf46959e0a..19164c11265 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml
@@ -11,8 +11,15 @@
       mc:Ignorable="d">
 
     <Page.Resources>
-        <converters:ToolbarFormatterActiveConverter x:Key="IsMarkdownFormatter"
-                                                 FormatterType="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown.MarkDownFormatter" />
+        <converters:TypeToObjectConverter x:Key="IsMarkdownFormatter"
+                                                 Type="markDown:MarkDownFormatter">
+            <converters:TypeToObjectConverter.TrueValue>
+                <Visibility>Visible</Visibility>
+            </converters:TypeToObjectConverter.TrueValue>
+            <converters:TypeToObjectConverter.FalseValue>
+                <Visibility>Collapsed</Visibility>
+            </converters:TypeToObjectConverter.FalseValue>
+        </converters:TypeToObjectConverter>
     </Page.Resources>
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
deleted file mode 100644
index 0729753334b..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarFormatterActiveConverter.cs
+++ /dev/null
@@ -1,48 +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.Uwp.UI.Controls.TextToolbarFormats;
-using Windows.UI.Xaml.Data;
-
-namespace Microsoft.Toolkit.Uwp.UI.Converters
-{
-    /// <summary>
-    /// Compares if Formats are equal and returns bool
-    /// </summary>
-    public class ToolbarFormatterActiveConverter : IValueConverter
-    {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Formatter formatter)
-            {
-                CurrentFormatter = formatter.GetType();
-                return CurrentFormatter.ToString() == FormatterType;
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            if (CurrentFormatter != null)
-            {
-                return CurrentFormatter;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Formatter"/>'s <see cref="Type"/> to compare
-        /// </summary>
-        public string FormatterType { get; set; }
-
-        private Type CurrentFormatter { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI/Converters/TypeToObjectConverter.cs b/Microsoft.Toolkit.Uwp.UI/Converters/TypeToObjectConverter.cs
new file mode 100644
index 00000000000..e7ad49ac726
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Converters/TypeToObjectConverter.cs
@@ -0,0 +1,95 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.UI.Converters
+{
+    /// <summary>
+    /// This class returns an object or another, depending on whether the type of the provided value matches another provided Type.
+    /// </summary>
+    public class TypeToObjectConverter : DependencyObject, IValueConverter
+    {
+        /// <summary>
+        /// Identifies the <see cref="TrueValue"/> property.
+        /// </summary>
+        public static readonly DependencyProperty TrueValueProperty =
+            DependencyProperty.Register(nameof(TrueValue), typeof(object), typeof(TypeToObjectConverter), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="FalseValue"/> property.
+        /// </summary>
+        public static readonly DependencyProperty FalseValueProperty =
+            DependencyProperty.Register(nameof(FalseValue), typeof(object), typeof(TypeToObjectConverter), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="Type"/> property.
+        /// </summary>
+        public static readonly DependencyProperty TypeProperty =
+            DependencyProperty.Register(nameof(Type), typeof(Type), typeof(TypeToObjectConverter), new PropertyMetadata(typeof(object)));
+
+        /// <summary>
+        /// Gets or sets the value to be returned when the type of the provided value matches <see cref="Type"/>.
+        /// </summary>
+        public object TrueValue
+        {
+            get { return GetValue(TrueValueProperty); }
+            set { SetValue(TrueValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value to be returned when the type of the provided value does not match <see cref="Type"/>.
+        /// </summary>
+        public object FalseValue
+        {
+            get { return GetValue(FalseValueProperty); }
+            set { SetValue(FalseValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type used to compare the type of the provided value.
+        /// </summary>
+        public Type Type
+        {
+            get { return (Type)GetValue(TypeProperty); }
+            set { SetValue(TypeProperty, value); }
+        }
+
+        /// <summary>
+        /// Convert the <paramref name="value"/>'s Type to an other object.
+        /// </summary>
+        /// <param name="value">The source data being passed to the target.</param>
+        /// <param name="targetType">The type of the target property, as a type reference.</param>
+        /// <param name="parameter">An optional parameter to be used to invert the converter logic.</param>
+        /// <param name="language">The language of the conversion.</param>
+        /// <returns>The value to be passed to the target dependency property.</returns>
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var typeMatches = value != null && Type.Equals(value.GetType());
+
+            // Negate if needed
+            if (ConverterTools.TryParseBool(parameter))
+            {
+                typeMatches = !typeMatches;
+            }
+
+            return ConverterTools.Convert(typeMatches ? TrueValue : FalseValue, targetType);
+        }
+
+        /// <summary>
+        /// Not implemented.
+        /// </summary>
+        /// <param name="value">The source data being passed to the target.</param>
+        /// <param name="targetType">The type of the target property, as a type reference.</param>
+        /// <param name="parameter">Optional parameter. Not used.</param>
+        /// <param name="language">The language of the conversion. Not used.</param>
+        /// <returns>The value to be passed to the target dependency property.</returns>
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/Converters/Test_TypeToObjectConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_TypeToObjectConverter.cs
new file mode 100644
index 00000000000..9f5b6653832
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Converters/Test_TypeToObjectConverter.cs
@@ -0,0 +1,57 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Converters;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using Windows.UI.Xaml;
+
+namespace UnitTests.Converters
+{
+    [TestClass]
+    public class Test_TypeToObjectConverter
+    {
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_StringConvertStringToVisibility()
+        {
+            var converter = new TypeToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                Type = typeof(string)
+            };
+            var result = converter.Convert("anything", typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Visible, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_StringDoesntConvertBoolToVisibility()
+        {
+            var converter = new TypeToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                Type = typeof(string)
+            };
+            var result = converter.Convert(true, typeof(Visibility), null, "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+
+        [TestCategory("Converters")]
+        [UITestMethod]
+        public void Test_StringConvertStringToVisibilityWithNegateTrue()
+        {
+            var converter = new TypeToObjectConverter
+            {
+                TrueValue = Visibility.Visible,
+                FalseValue = Visibility.Collapsed,
+                Type = typeof(string)
+            };
+            var result = converter.Convert("anything", typeof(Visibility), "true", "en-us");
+            Assert.AreEqual(Visibility.Collapsed, result);
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 0b40d7f34d8..898608f956f 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -133,6 +133,7 @@
     <Compile Include="Converters\Test_EmptyCollectionToObjectConverter.cs" />
     <Compile Include="Converters\Test_EmptyStringToObjectConverter.cs" />
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
+    <Compile Include="Converters\Test_TypeToObjectConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
     <Compile Include="Extensions\Test_BitmapIconExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconSourceExtensionMarkupExtension.cs" />

From 62145a02546797c62715ac3f501186884f98c8d0 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 19:32:08 -0700
Subject: [PATCH 408/595] Revert "Removed TabView/TabViewItem,
 HeaderedTextBlock, LightBehavior/AnimationExtensions.Light, and some other
 smaller methods marked as Obsolete."

This reverts commit 274492be9708ee1f7eed68a6a0b786394ff6481f.
---
 .../Services/LinkedIn/LinkedInDataProvider.cs |  11 +
 .../Services/LinkedIn/LinkedInService.cs      |   9 +
 .../Services/Twitter/TwitterDataProvider.cs   |  11 +
 .../Services/Twitter/TwitterService.cs        |   9 +
 .../Services/Weibo/WeiboDataProvider.cs       |  11 +
 .../Services/Weibo/WeiboService.cs            |   9 +
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  31 +
 .../HeaderedTextBlock/HeaderedTextBlock.png   | Bin 0 -> 3308 bytes
 .../HeaderedTextBlockCode.bind                |  16 +
 .../HeaderedTextBlockPage.xaml                |   9 +
 .../HeaderedTextBlockPage.xaml.cs             |  18 +
 .../SamplePages/Light/LightBehavior.png       | Bin 0 -> 6164 bytes
 .../SamplePages/Light/LightBehaviorCode.bind  |   8 +
 .../SamplePages/Light/LightBehaviorPage.xaml  |  39 +
 .../Light/LightBehaviorPage.xaml.cs           |  52 ++
 .../SamplePages/Light/LightBehaviorXaml.bind  |  25 +
 .../SamplePages/TabView/TabView.png           | Bin 0 -> 1392 bytes
 .../SamplePages/TabView/TabViewPage.xaml      |  19 +
 .../SamplePages/TabView/TabViewPage.xaml.cs   |  73 ++
 .../SamplePages/TabView/TabViewXaml.bind      |  97 +++
 .../SamplePages/samples.json                  |  37 +
 .../Behaviors/Light.cs                        |  69 ++
 .../ConnectedAnimations/Connected.cs          |  16 +
 .../Extensions/AnimationExtensions.Light.cs   | 210 ++++-
 .../HeaderedTextBlockMetadata.cs              |  49 ++
 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj |   3 +
 .../TabViewItemMetadata.cs                    |  43 +
 .../TabViewMetadata.cs                        |  54 ++
 .../HeaderedTextBlock.Properties.cs           | 172 ++++
 .../HeaderedTextBlock/HeaderedTextBlock.cs    |  76 ++
 .../HeaderedTextBlock/HeaderedTextBlock.xaml  |  60 ++
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   1 +
 ...Toolkit.Uwp.UI.Controls.csproj.DotSettings |   1 +
 .../Strings/en-US/Resources.resw              |   8 +
 .../TabView/TabClosingEventArgs.cs            |  36 +
 .../TabView/TabDraggedOutsideEventArgs.cs     |  35 +
 .../TabView/TabView.HeaderLayout.cs           | 221 ++++++
 .../TabView/TabView.ItemSources.cs            | 115 +++
 .../TabView/TabView.Properties.cs             | 245 ++++++
 .../TabView/TabView.cs                        | 320 ++++++++
 .../TabView/TabView.xaml                      | 736 ++++++++++++++++++
 .../TabView/TabViewItem.Properties.cs         |  79 ++
 .../TabView/TabViewItem.cs                    | 116 +++
 .../TabView/TabWidthMode.cs                   |  36 +
 .../Themes/Generic.xaml                       |   2 +
 .../TileControl/TileControl.cs                |   7 +
 .../VisualStudioToolsManifest.xml             |   3 +
 .../Extensions/StringExtensions.cs            |   8 +
 48 files changed, 3201 insertions(+), 4 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs

diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index 27c7739c333..f852688bc57 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -154,6 +154,17 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
+        /// <summary>
+        /// Log user out of LinkedIn.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            LogoutAsync();
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+        }
+
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index 7a79b8fc344..251e5fb711d 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -92,6 +92,15 @@ public Task<LinkedInShareResponse> ShareActivityAsync(LinkedInShareRequest share
             return Provider.ShareDataAsync<LinkedInShareRequest, LinkedInShareResponse>(shareRequest);
         }
 
+        /// <summary>
+        /// Log user out of LinkedIn.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+            Provider.Logout();
+        }
+
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index 41db01d748b..a6eda59f07e 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -273,6 +273,17 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
+        /// <summary>
+        /// Log user out of Twitter.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            LogoutAsync();
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+        }
+
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index b461458ce8d..703657cf2fb 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -400,6 +400,15 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
+        /// <summary>
+        /// Log user out of Twitter.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+            Provider.Logout();
+        }
+
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
index 6975a33d005..3dd6d59a8ac 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
@@ -163,6 +163,17 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
+        /// <summary>
+        /// Log user out of Weibo.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            LogoutAsync();
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+        }
+
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
index ea2f6cea3b1..f5f8dd7ec99 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
@@ -183,6 +183,15 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
+        /// <summary>
+        /// Log user out of Weibo.
+        /// </summary>
+        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
+        public void Logout()
+        {
+            Provider.Logout();
+        }
+
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 18981c05b81..51c0fd428b1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -280,6 +280,7 @@
     <Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
     <Content Include="SamplePages\ImageCropper\ImageCropper.png" />
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.png" />
+    <Content Include="SamplePages\TabView\TabView.png" />
     <Content Include="SamplePages\PeoplePicker\PeoplePicker.png" />
     <Content Include="SamplePages\PersonView\PersonView.png" />
     <Content Include="SamplePages\TokenizingTextBox\TokenizingTextBox.png" />
@@ -316,6 +317,7 @@
     <Content Include="SamplePages\AlignmentGrid\AlignmentGrid.png" />
     <Content Include="SamplePages\HeaderedContentControl\HeaderedContentControl.png" />
     <Content Include="SamplePages\HeaderedItemsControl\HeaderedItemsControl.png" />
+    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlock.png" />
     <Content Include="SamplePages\ImageBlendBrush\ImageBlendBrush.png" />
     <Content Include="SamplePages\ImageCache\ImageCache.png" />
     <Content Include="SamplePages\ImageEx\ImageEx.png" />
@@ -324,6 +326,7 @@
     <Content Include="SamplePages\Incremental Loading Collection\icon.png" />
     <Content Include="SamplePages\LayoutTransformControl\LayoutTransformControl.png" />
     <Content Include="SamplePages\InfiniteCanvas\InfiniteCanvas.png" />
+    <Content Include="SamplePages\Light\LightBehavior.png" />
     <Content Include="SamplePages\LinkedIn Service\LinkedInLogo.png" />
     <Content Include="Assets\Helpers.png" />
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
@@ -364,6 +367,8 @@
     <Content Include="SamplePages\Twitter Service\TwitterLogo.png" />
     <Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
     <Content Include="SamplePages\Twitter Service\icon.png" />
+    <Content Include="SamplePages\Facebook Service\FacebookCode.bind" />
+    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockCode.bind" />
     <Content Include="SamplePages\ViewExtensions\ViewExtensions.png" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehavior.png" />
     <Content Include="SamplePages\Visual Extensions\VisualExtensions.png" />
@@ -423,6 +428,8 @@
     <Content Include="SamplePages\Connected Animations\ConnectedAnimationsCode.bind" />
     <Content Include="SamplePages\Loading\LoadingCode.bind" />
     <Content Include="SamplePages\ReorderGridAnimation\ReorderGrid.bind" />
+    <Content Include="SamplePages\Light\LightBehaviorCode.bind" />
+    <Content Include="SamplePages\Light\LightBehaviorXaml.bind" />
     <Content Include="SamplePages\TextBoxMask\TextBoxMask.bind" />
     <Content Include="SamplePages\TileControl\TileControl.bind">
       <SubType>Designer</SubType>
@@ -504,6 +511,9 @@
     <Content Include="SamplePages\RemoteDevicePicker\RemoteDevicePickerCode.bind" />
     <Content Include="SamplePages\DataGrid\DataGridCode.bind" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
+    <Content Include="SamplePages\TabView\TabViewXaml.bind">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -645,6 +655,9 @@
     <Compile Include="Models\LandingPageResource.cs" />
     <Compile Include="Models\LandingPageLink.cs" />
     <Compile Include="Models\PaneState.cs" />
+    <Compile Include="SamplePages\TabView\TabViewPage.xaml.cs">
+      <DependentUpon>TabViewPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
       <DependentUpon>UniformGridPage.xaml</DependentUpon>
     </Compile>
@@ -853,6 +866,9 @@
     </Compile>
     <Compile Include="SamplePages\Incremental Loading Collection\PeopleSource.cs" />
     <Compile Include="SamplePages\Incremental Loading Collection\Person.cs" />
+    <Compile Include="SamplePages\Light\LightBehaviorPage.xaml.cs">
+      <DependentUpon>LightBehaviorPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\LinkedIn Service\LinkedInPage.xaml.cs">
       <DependentUpon>LinkedInPage.xaml</DependentUpon>
     </Compile>
@@ -904,6 +920,9 @@
     <Compile Include="SamplePages\Fade\FadeBehaviorPage.xaml.cs">
       <DependentUpon>FadeBehaviorPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs">
+      <DependentUpon>HeaderedTextBlockPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\ImageEx\ImageExPage.xaml.cs">
       <DependentUpon>ImageExPage.xaml</DependentUpon>
     </Compile>
@@ -1036,6 +1055,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SamplePages\TabView\TabViewPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1328,6 +1351,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SamplePages\Light\LightBehaviorPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SamplePages\LinkedIn Service\LinkedInPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1396,6 +1423,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SamplePages\ImageEx\ImageExPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b495ab237ab617b406082956fa4df6764313695
GIT binary patch
literal 3308
zcmeH~**6=C7RE!&Lrtfps8CaTYN&%!Eipt@kydpu#nhIVrIa2af{KI|HIy1^o|V#|
z#&Ag0P%+Q5LyRdWGMKM*|AV{MeYg*Iul3t|KYb71!?)MQJ%F0<^N8~R004f|yO4(f
z0E_h5-p0jo)(gJ0)}0MDe?!wpTxS)+^&ATT@a3CA3?9AC+@AHtO42TM?bZ_&pUMlc
zio3@h=)1=x=nuF=iKt-~BC$pCwht0Cu3TMhXMf{l43ZNQdh@pd#4?YK4<7#{Qs%v&
zNJ02z+c(#+inVx`d(WiV)qW1^G5f#xfBlMVN}WBVc+aU?)91JPe1ih@s2RWdDE7b#
zlSE;AJNxYW-cbeRgJqx>_4-4jy@15z@Bekg<CNPPre2t>?02C>h|5THccD*?22UmI
zbwaK!FtbuOkn44;^MrC+yHxb07glX%DTmXso0g#<B)qoTv7B>K@Er)LZ}tm=>AKK_
z_H^FFNs$+~FeR`+fi;hS+{J1mv$>dEhK3*Li%OHsMxWHc&@J9AHrLq0X!JNWUA->Q
znfdlMQvc@MHI?3WDt^4UUz4w%B~1e5uL1q8hE_l~;aq%e>^`#VvFhc7%Ghwv7*r@L
zhJQ{WpJT}ef>=`}iZr>sIHZ&uz`T;|sI{TiD4t&y#`F9{8n83{k`t!HGi2`iI~ruL
zRg!dd;dp7c2%&21x2Nuyt`}+5ww!`E#?htvT^FoVZzQ)jB&~d974ys&)1S5pu?!S`
z%`#z)41pmg*|#|6DsKk~Y$M0Zyu+<0vYk;}7A(I4)B1B}d2c^OdU+yBIe)}qoVA8d
zJ}MQW$h|C61fT?tbfn~WYdf2YO7F0i^~&_n7ip7FYR+ka?6DnGr;JUB=8f-pWiNjd
zrs<ak=e$H7vv#;z_k}dv-Fvw4sRWh^WvNoC3-3{fvIKyC!u}cUoT~O{e0eBbO`qkP
zvE>W%?C_MTm_dDWw(Y>D!pG|{WJ>wWC!g0SyWJ^%ev)z&u|Ji8bt;{@ySKC9To=D;
z@%-I41W!)12g42isvBIQTmOEI2*_kR;j-sEN-qI7-z^_|Sf&CA(lifK6|(nqcl4_q
z`M7lOyu<%R)03fAr~XF{>L&e^6Jo#UnQl2_Cr~|1BtSDu0Iih$^+f&hoobE|())qO
zw5Y0z_W>_~gQMA(Zxjcw4^}8S4C8Mi(yVzM6?j_BVE*npZM%o^K1NCZmYOsp|Ln1G
zS;>9jkr}KXTaCFQ_q4-JqPk(|Q6${<hgtqN?k_IkhrR7I*e5&AqmWYZy!NIk;M&~O
zu~DZ&Zwlo@D}~1qe8tZFd|>g~997JC(|!K8$_xdb*_Is>f~;#MYl*`^Cc9MbV`~SC
z-@pvfdNMkD#KB*E_r)i+Pg{R{F0#G1@5wM-7(|KdNoN^S#Slkk#|hzuHEH{-YM>3x
zoJq{Cx12{%3-b*<OyNP^nT<gnjBz2}*?IS4`R{70RhERZ7T0HLM~VSe+?wYj1uhI*
zuhn+owcHzLm0Vi^w~Y_UOr7m0Pb`c{oBP@4B3@po31!(+u2#r`!P{b%VVGZaU297D
z4PQV-)CjHNl?G?qzL0hNI!!H$u{w&ZsG_Us%3mx7L`<|CUduz<pC<NSh<_Yk*l<^J
z<O%FLL&SJ3Dy}T_-9&OpYhY0tor03klTO9S)&&je{N_{#C#joyN1Uvh4Ht<*7E+O2
z>4EvaiW~NYHy5BTs3#r1985Qm_qZU;sKUG7O$%Z)z9*r9we7n?X&+|VY5M3&6T_3O
z@aNVtu24X5F}ffoUU(8H4z>tO8SHjFVk!P-0@xU{P291pu{^qp!H`Zn2Jc=+e<%4Y
zxb>ZavuqZumUhBP@NJ94hc>{(WTJRN!EKI&0*(KaWpRBwEI|R5G@Bqlu;&m2P=p_=
z;x!WQ$e<OlQEPzDBBNQd7jnGFSn!{Ya4{18=DheSsTZ1B?#!O6QgbSVkoPP27Mjc~
ze}MHbpMO7;x4UDD=zbYK*34$je%s_ofVMy77m3GdE7O;OQdJnaTWBc-C;_R6;P_cq
zpW1p;JR!F4l(eo10c7P;Z*Flq$7r|IeZXy5e90Ch7nMcF7nJJ<0z&T}{dw?Qpo5az
zAZ0Zsp)=|{He9BfCC!5u39ZM6d7_KmM{k`Qu%}LR9vwU_UQ|GLVHtjL+5#cPjOJ)M
zH8LfBw96mOe4AcWA4y;5Z)_vfIO}A1Y-<}(o5ALrR2`GecxEqYXle%AdoCv^W>YII
z%;A?ogJ>E@oQUG$EkiG!<{y4W@EC3We|VOTcH;$|k?H%qlnV>W3%xFB-b5;A8iCU@
z4^A~BBCpK%8W9UYB!CtRp~~FXF?wBB3%&kI-R3PrWl55f5l#@yHoYj78cW_Fqvj30
zd|LQIfL_x5hfo9(xU&nGE|d9D$r5Td66OGyV}}Yk2L$Rb6Jo8KJ`{saB$;u{2oNWf
zem!ox4@~@NsDO6EMXj#%EW3qggwG4*a{1xt2jlDuVwP`Ir-Q&>QmjkLG?T%@Vb%NB
zR>#MC)@O~%eXO8WsMQgoc~yoYZr?K71i%?C5ZiTMIAh~JAWU9wSrKO#v_JV%NXBt)
z?2m+5U<8v@7rF<Kj(`h9uIDxz95#^d3zNHT$CtICLXLaT)W+#p1Yvk*=CCsY=55w;
zLVJM-g{@RaV{4J2?Tz+tzk<3v8NKW$A292qq|C;&^;b2CTy$AHDPNsPyMHbI62M39
zuig4ix5e)BsSR6F4@M`KYPctiE8NRHzZ2K+84N2IYKiD+-l6ER)Aq^PSyI%E3*+~b
z_^e}Y<?AVn_^aJuE#To_8)UT~>#rW7puRNiBjbfvd1Ncf&Cx%!?y)@5;XaCA<DRwf
z%`iQ-H7IY=Q<4Z4bLF&j`<VN<YQo%0coZi7peeZa(eU)0Hz7&B9t>5%MRl_f6MWx0
z7l1)IM*wVlH{(!}6fYr_A$=o~PM<E3f|c0^-D=LceZy6PYE<Vw?Ehg+Mw8aLkv*8h
zhYTJ?Zx*_KO)UAmEq6nxIGoHmazVbklEpi3pK))+XJSKPgn+Y%JWx60Y<x>_*Yf%^
zdFvyF%(3`&=|D^Ooa4NCGr>76UjtNm-Bfb_7JS8_*ctlEF0Yk-rDgQ62p2(%?sRC{
z?wf}RSUMGV?Ygr)XP}F);%%sf&82EPtoQ&Qm4V5U3FcE3jOyiW3k?8c;Ov$IDo8Pc
z()X6s#qFyNcPk3d@)d06<uY^UNNy2ijO<zXSVTin*eZR+$RIQ)F7H4n4@2X1Sv*dj
z<K1WpPGWjR>$Ze;=5kjF5w}&b4wQGD<OdYQG=#06BTqrwB*ZOHDBN+Zw)I+NHmlz6
zKI6RW;xd!EIY5Y5h5UtyNJ!3>T-?*rblDAA!Q5H_rU2r)tzwn1C(#X;J~ZVr({YkD
zg6wo?IS;YBKdggVja@ppyo)+9+dMu3G!I>GjqOxfi^o0-hl(_<7hmjWt$Q?_A#1qe
z+u01Zc++Enk6|X^pFA8*`JO?f1*}vjbu!#VElniGR!cel7I(2bJu(E|i&BPIR}@mE
zG)qOxYmoZ3D2hzX5+=Sfjimr(E`$_}ch!O{%QSI)9>hmYT-<rJQvDA&)OF1vC@I(#
zP}(gD0i>8*GGZe^Z3(2r$~0rRsg07MS<f?o>AnB+zwd#+H=^bD+VhE(_f9!uYP7w2
TO!KSG-WPzWF%(j1=oIlU(~cTl

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
new file mode 100644
index 00000000000..a2db4b8dc80
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
@@ -0,0 +1,16 @@
+<Page
+    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:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    mc:Ignorable="d">
+  
+    <Grid>
+        <controls:HeaderedTextBlock 
+            Header="@[Header:String:Name]"
+            Text="@[Text:String:Windows Community Toolkit]"
+            Orientation="@[Orientation:Enum:Orientation.Vertical]"
+            Margin="20,10,0,0" />
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
new file mode 100644
index 00000000000..a5795898a0e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
@@ -0,0 +1,9 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.HeaderedTextBlockPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
new file mode 100644
index 00000000000..77cdba59f3e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
@@ -0,0 +1,18 @@
+// 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 Microsoft.Toolkit.Uwp.SampleApp.Models;
+
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    public sealed partial class HeaderedTextBlockPage
+    {
+        public HeaderedTextBlockPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehavior.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2235f1b9e4577a48af0b24d219f8485b2a71878
GIT binary patch
literal 6164
zcmZ9QcQl*r8^@DaF`JayBSuRrwEEhs5hB)W#0)}PlvZh#m{qg(Y|$DaX4EXAX3=4k
zB34qfLlIJ=W?R+%^8WjK{&=3}+~?f)ea<z%*C*N963xpc$^`%bcuh@=FaQ7$#{BOC
zvoqfn&wE}lKdgaBQ#&y8xexYC0sw?YOpOfeLW?#DzK@pMq45)95ga9Nj;>@|sr>nD
zBb@pSO=Xcoc^X?Jv2w9hyZp#udlnKkApBQS0A-^=-~O2Sw*!Ah07a;dI>8@tDWqsS
zvO-WcZOMQ#g$?zS%|vSs`r1H8)S{*az6DI&3zEMrXUdSy;e!JA-Sl`>p*MZypSqm`
z(Q&_S&|w87QrGrDP{hajHkQH3UkjWS7X^U(k)5Zt34xpJtcw#uDS%&mo3Ue$uTnXA
zU(?Nv0D3OC=pP9fKiaE3`HKeo2q<EF%9LU-y>f$|BB=nPYi$4q_~=1jzs>C|UXn@j
z7X$|N)`<Py`YsXZiJ$<>OI|zG7_d@a4*UP99o%#{n5Uc(p5R?%?v(UG+?{z!QaIKt
zfv17X#EbyAT16NpW-PaFSUY#<1CJfJj2i{OkqEG##vyj+yUH#N$0kAM;2@vg;23WW
zVog{L$B0icIIRp;CidTQV=&@62l4WEiJvlCY{}@DY#>yc%)DHG5txI!J6Bn~Y;aA0
zxfWCoCO*J-NnWhtx0wBrBy%?ROlBV#X!Dl0NzPXgI9;o_Xu<JRCIC10Ib8SBHvm+6
z8V0Ji!in`v_P*h@AMnzjX&wl>v;krsl?^6JZU(D5wwLPs$++zphG(nR4~VxmV711D
zyz*|dt;tAz@VYYH@Y?kQ7vi%{X=F9?sHzM1J6{DlhULA>4Y-2!j%%-kS5Sn_Aix}&
z@{e!+=;IK@jR({RtadgKC{idDFuZQ|!<DT<zIy(%(`Gz{#R$-EA7h1%;HZ$<7@GL*
zEs}Jc3?R*)MP0A{C=-3XbK_D6S3Zwwu(q61$e{bP^1JKz3<**zQWrsB8g6IybLf_?
z)MQcG^u>3vsnnhqIGaaMWHcCNvADB-yA~-AD$L0ItVa)BL%4~9p7JGrJ&-;bOa<)X
zIqrA%O`X_0FmjOGUp`PsdvN~9LCkp)iex%(#_pljxpUmb@3A)C=M(bWCRkRly@gSp
z<=u3X@=5|U=i<2}uC4=&g_6nwJbrv!$1cn5IQc<o*=)8#@n8iMYgWUzuD^Ug>|XJ|
z3&C@~7&s9X4%LNt!E7I9okf~JfO3j11+KhOih`rI0Y)PA(Lc$if##Qnqv;pG-*puf
zKne}Gop-U`AvbBj@}%YbWu*_HR|{4Q7-nFb$6(@>+}XQU(N=O%6-tv=YVXm-@p@N=
z4=!-S9dkWcr{zEjRo{%alykS@As3V~S@W&BLJmD*OuO=^tzyV{9%i_fq~ysEb_~pQ
zZoc>bgg3p=RuMdX@V==)tYDC*^5hm6YTb(hoVZ&hTG3k7Kk|JF4GcX?yTEHv%z_;A
z1(z}{bg+Kw$G7OLDz2iei+p2E#Zv|ivfhRSNLj2*^dA!6QQYeIYk6+DAj^s?yWOoV
z#T`~7nbAYB?5DfN#Pldss+Euc1W4}PAAT**Qbc!kc0Ysk5m9TC4)pQR`{Z-ND3XkK
zN>NJ%)YNk8pZVnDix3yQCuKi<{sex6QRY;}6f0y=JG5a&F*4CXD8g8{`$H>7v1WZw
zoV_&1n4~!QzT|zGvsjM!GG)3Gfe$t<9kj9$ZB?<qOMO1iiQWCQ+#w*KTEMc)Hz>Pi
zT&*4W5-HE3(AgnV$UjP8<J|~{AU1=MHfzf(`GKW72FJQsVs+jPG?MNKxY^mf?|ckN
za=O&KI@$@V_j>{fDX%wYNn0s{5T6Uo%YmvJ;P)X!yHET|n{}<un|a+<^>v|NdA!{U
z*`%g9@kJaqKmr$W=tfG88{JhTE7YU8vM|@&g<qzku4cg0|4oE=pYVBh`$_>Fz8fTv
zi7lIQQrGie7slk5t0;`RGVAXP<J!g`<F}ls;mgk&zr<#+q*w6+1;Rqmu$Wae?Qx71
ztD9S)yZ}7=yJ!;i0k6dwF#gpW5aumbf{nxvjIY5|h55}4THGGkB#v`uznHBH9c8Om
zVTfbFD07uOM-+jbnBw~^Px%bp6L)%}tYX2f=<J;$a<(4oRa5M<DG}*PCpOK&z716X
z?rd#P;da-jaxK}4>69h!uN_bE`btX|Ua8*wEvzDWI}1}&=7A_*mjj>{GFv%cGJH(S
z)7z+C2IsyoO?=a@TBhV){a%>Y)1!%Bbtd@_+e^~8Q*r{(eas!3cIfro^^w<uEaQAa
z`_OxzbjMTk%njFDc8ylEf>`B(nf2Y4zFMpK5bQ(#0nU=?s0?r}BqbeBAUx9>5hlKd
zb^({;ssE(|ec+oyT<|OTjaah!ztq8Xx8C5qIKbdAKO2V12E9zQ1X{oC_uLEXC~H8A
zi9O8ZC^lKQKi_YyQIUS~z9fcH<CA~x8NY6IL^#0`2)W?<2Bl#|J*e|@gL6r-no(P4
zUJS>juQ|YlVG!r#1Qj=5F+|DP(J<4a!3|G<{n98++~#Px725>;;kjUy$iNQ5O0G*I
zrBxI7L^eg)ChOoub*||3#x9{9Sm_qW?4_h*>@wMjRr%4ICL+^b_Z)KaZC%=)1Zpl*
z@#)f;dtX#b8w(psHXRwP9At)2`f9o+p@VnULV*m?s90&4gPNWlB}oLB6-;3R8%hdH
z8*cEtgg@FfS{PO4*t_K&1d5jP(#To!S&f)J38f{mOwQ@iiM}(}b?Xt>af4OiO`DO#
z;)75cLzMcoiCiBkIV2OVc3Y0X1+z+0qz`#(@r?kzKJ&9#u^~_2m*enQF&Ya?fGqdd
zBd_M#hx9lmdn2^M#8fcBrD98rmQ|xq9zcsO+8^vP)%Rxo#9D=()OyFwpIN^9N0u?+
zI?)s%qr-=Bn(=AJ*zMMTl@5G8s1GjoYBZi@b!IF~{>oaD))Qh4nk;zfTVKyOuuVVK
zZeneD2w)Kr8<m>X^o^Rq`|NqC$Jh(j`!PD+i)KD}ch{{kc$It@(LoVb($_u|h9X+i
zGrqda*Zs~rZrZZ(mK|;7MlR*Q&)jVvJEOIS9W*`K3pJJ0Bsb0NJ>QM+4STu7L$sV1
z#s7mTY-_5&#}Q!UhP^&2zp}I1BoLFS8cY~Dp1!4UWTLNx7Brd=wrgaaDFg<QAUi~B
z!@h@ku9&p_r&xyeAlg}^^)TY&-uHW6R|Ou9D@xxbfr(LEO1<R6I@^L{UHQs>?8=jw
zo)*@^LE_n`j{ev!FS+@F$xLmrM)AD?W|uR0!jUo*Dj?`qsG7JE4*9Wwi$%dy<8?if
z3A9<x@>}mvbZ|IhaK}FM+f$w825Zgw<+IP7EYY{x?uDkj&(yxe-9Qz!alARYna-Fd
zG%k)DH~{c9yXKil`Q0)!?$LBF()b>Rs#^_D^crQ1Vq?<OmnO$(eG}ob(G7nd`et0;
zq+KVE=0ql<x3Ui$`eawq-YcdXZndgcSUHb`EA=lNghxEI)L}t>w6E>`TAiK&K>Hqv
zXRoPtj-1-=x{Ucf=dO3Rc)q^peMtP}g2C;gHQ#+>4zhV}NH=cV`H>4!{84Ka7@XZI
z{j(KcYQ1=%b8Wp9D-Wcn2pPRap)@+%X1fD<xsjqd<VPGoNh^r8Ox+Uu{LAp&;}q?M
zv<$!pQ^2F3mDIBv?3cyrSdh-QXMm-UU8>CD_@38;DiK(zN>WC2dc_ow>_Q(f7&Jfe
z$v=%{!AweTalG@YXTwDd_?7wY4A`;}c!;>|yR#~bFC_6-vco3uMuT3i)^c}V{2f+7
zBey&OD1oLe9h$Y0Y*ru-FFTIuuN16`TcLWJ;8dl2w|)<X6v-2nSmu3Yw#WevD(<+*
z6=%OB750bc_qY`GejX*%_m3I;jDUo-g;h8$En{2ZTJV#r`3n=``Gy<S^!rRf8eymR
zwn&2ob1Ud}=$)STfzRi%S$r;%9P`YYpisF&6kxHIaB)X*Va|p6ynMeB07XQG%UE1a
zq-6g&a91l4JZ1&B<sS=whZLl6X}w)7Rbor#OWL)IB#~^1c2LAL{B>-n9V<jFwUQtI
z3=A8#J!2LxTA7kav9n{e<y7jY#2Rr-lL&<u3nL_sM(C+yKh1wQj*|KvivKoz<i0i!
z1JT{|pw5Jj;^zrt3-Ojrovv5Y6F0uSKy@08H1W_qS{{88#^(^>mA<F9aqqH!Qr|3`
zS%DRoCTh0_vek@7s=m$DtcaYR{~pNrb#mI3$dqciLIS&%k_7qAYZEO}?+8u}hR3A(
zGk841wOYns;n6>eu|rUx-Bj+yON|Q%b3w%i{*BQH(ehUu4~ui82rjAXrwtxYzXNPM
zAk}3U;0%H#M0sTPwv=CKOHWTktvr>L4!#`SU_GeQ@kHu;#O1^;2lrN1Lt1RZOHcuQ
zJnq)?I-qlxq7p8cb6%x8-6Pis{8ol<C@xVg>T4L$w=S=d-kz4hwqOeA{PHBNsLAPM
zh#je6!>(U2KS7Prh6(7~gRz0(k=Y*|`&-MjL1yy6YI8?|7%>b=y7me^{A~0wR_u|x
zix4y7{8c6;(`Qu<g$ajkS9=rwloUNZuF&+o9b7zqf}Sk$>7u^)gMQup_n-c83eA1d
zu6QqBO4fR2u3P`qUCe!yV^{ScBb|@F;qLa<hPd51!RyhHP{%UdF8Oa@Lki38|0U%T
znCQPr{!H(>L+ff=Rdt|;6^iGwUGZJ=!R9I*b!(ENXdh^ddO+vY(v5NP<_xsxo!m=v
zIvN=E(knW?@LvkJh%ve2y~)+bK{Uo%O2<XoO>YGBMD&MNhEU5uW27Pd$sD<bX!T9o
zvT%*|V~@w=7VSC&tIQGu0hP@dgzce+)%-^DGGft*%%V5Ul1jaDX94`QqDOk)9N@C7
z`@v^(av9RF_8nSk`93alE!w)zXhcV`YHCyRJP6DW5>%4xc(Kdlk+u>Ie>$r2sP?;S
z7PG%&=esAl0uTyG-D=LXB(Ny@4!gC0sLrb4=Via(3c1JPX==eUkIkNIja}&N{+V@u
zNwiY4-jC$Q*`mP$&V7+x+0!wqI7n7+WNk51s+HRvt`95P*VX>q(%{~i**B;-qH1D#
zH0in|n%(4pO+apILJ{p3yo67ezhW8n2EM)L;Kq4w5nbV@Iqv6l_DPOVejCQQ>GvG5
zjRpMB_=RiB!sF=#&C=Up>hYTEq5)>kJz;L<vy<mQQoNpdfsa<x8YY}W?C9;Z*WWe)
zbCpSA$>PQ?%0sb)kWB+0!g$;xl8?ycHdIXc%KmWkd;B!sCIbw^CfTkJ2?ZEXkAerL
zy@6=k{s1hpD3(=nJ;1MJ?xm(LVPf*VEwlBm+X3*ot`0oT8CXj+$h0CdFZk1K2~4BM
zKPk7v$Jy%rOu9lgwG{o*^MapvHcoH?Htt?>Sh}TEl`ewpcFe2yfFA8-vzKXkCtC0L
zWSWGn<pwZ>J^cz~t`5^@tiu@}W4%0cxoyP!UMggVY)g|P3g1U~AE~!KX^~Nk64ZAd
zYf5uzq~WETuty#%k!nuXgiq0`c+GM?p$aWorC<e`vzB_iN-f2zPv5WDdS{GAFQ<}l
z=r!7$9KN$eHYVtDv|K%GA{z4UY<eo-re>3G?-^3R+11)17E1U>PO0+^pdz>@{Q-ag
zg7HdXg**-V#o}J0#dP9zF)pjNwOFcwdYPq=XMZW8c^4MwtJSS;w507`YYUjJR0vh2
z!^Y5zam3K@KY2}z*6B>HhmbGE%{vCAq*3X5l=BmsF(-3?$$1g*Qd5yy$jx>dByGwZ
z0W6B-D)tK+p-hv2?^7m6Fs$0}ULGhyucjS#O4SA&7MS*Z?c9d|zKYS-7g)##wvr@9
za%V|(2K%Hbphi=qQMaH`_EPgN%2SmfAD<?S{=X6kBra>_qJgpRc%D6!9%^Yh%>PqM
z5?J*Z5L8*_Rdk@4<9b@R`;o<PhnT)p7-iymb0%h~dSn)-F98%WCjqO!#FF(loy8u9
z{T@=BscULcZBPGvhwE$FNT8a7yJLqPn^VwBYU`8n;lH>36ZF<FX{PA6YRH6qfR)@g
z9aoeM5_cX8B~GXx^9ilAGG`JnF@+nskimArQx6J`{Bi~93c)yF8IAs(NfAk}!O5wb
z5~d~{3GGsH;|#n^wDwBw^(5|s`N6(VaR}eMkh|%{2S%?_$mqpP>W%bdO>y!#D1%fE
z^Y||$JBZ(0C9Ug(-*Toy<G3(ms8bcP+dB%LGFd|iQu%x2!YS>;1MM>i!mcYN{AI?}
zg82YveORTg$J=X|pQ=2w)A<++QK=Yf0e#$7Vu2Ch<XIZ`Fw#e&1UQ2>(F#et04UgQ
z89VRnALfgs)+|N@N|GJ}1(YgfmM0d9=aUa3=cvD1;PRf4-`wpzTgo!LdyJ*y0cQMM
zbv{cLzZIELH$X9nX(w7Jt0t<Rb9TmN_`J;9>axcp9j<^x>;FBCx$gDAfzaVrItBDx
zAI4a)j0p?hcOYHQ4GjEyX>0I9i^^rMk%g^XABA{whf_FC0W>6tF~cK$c;<oiCydlN
zQQ1+ogrY%A1=;AB@*{;Y@k=())FZn@;&XWt;5BTyKg7VtKNG~6%O-o#-Lrvt%%2SA
zxWr^50_x~D$$(!aaIkb=^4Cm+PtRfWSKPSA;PaC08Z%QtkvRWD_}vRT26h1<=oG-l
z<CR$IF+6_Nm-m9;Z8+_#M8-Cx`C8XvmYVz9P4QEid{D$+$3*Tq-cptO8svdG<f$S>
zcN<DP;_6GZL6#P2J^s|96_VBZ-$jV1S&zzH<`g7in2^a{tcc5;mh5P3m%PLCxy6Q+
za%H81D7_zo9C9|S`1<Hq!o;1{`kDt^H~K^UM3^bT1RS?c1NTXAFlvCw3e=RpgtJrB
z;~yv*KNgbG<JjHWPRNvhee*O>K<J)Zd21L%bl{}mXezN&l2JFP^LKqgH9OrE$X*~H
zcxM#d$7%$4#|#c-u=J7dmdYhs95dQ_9dm3v_ilW$7U|{JkDrnOnK)JnOby@>KEjOT
zcF9^lKld{yTej-TEM*zuUBeB-?T)E{=7+`out=LB6N*7meva&<di)=?C}W8}1dRd|
z)Gpy>;-6_?>1Q%(EFr5K(;&Tn^F$)0hz9c@KZV<A6HYM!&~C2YsmWi>erF){0nW#B
zZMV>zH~MdkwEI&$qmvJ%ltADqK5%+WhqQnN!|A3(i?xvF%20K4e)b2&5yjUe1rXR#
zBc6O{l3&&8-2)Frt*_Ke>r{ct>7f;;)=BI@0sDQ3u!u{5N%r^RPP0anr3~FJ*i@Jx
z>by+!mtB}=zY}C)PWEo|T;=cTtq;}&jv2=eN!5g3N+1OiSA1PhQepCo@kr;ti^F+p
zj_qQvz2m^d?qH-3IMVHSZmpwa=<^<*y+#npux6i$*-%VZOE6s>)%M0<Smh4?<}YDM
ziK)#j?NuWWh5z86Jvi*7*jAMH#5ql)swQI;w=RF52}h@81(0u&YKs<$9TUQ)v%RS!
zKHg!}390mQ0j4ZP!uFHJjNy|XIYkBFIvOstgkCP)2`4isa9U9SX>$8u3ck<ZSbM6x
zT<j?2GH?33x0nPb$_(Q>C)!osjU4IMna2Ks=$;Y+lC22-bpC&e+DV;~|LQDIGTMFM
zY$<@bT7`Iah*Y}aby}#oW0dm?meXB*Xf_mJ)3HJ>^(`7OwH{i0SC}ASxT9;qO2MbJ
zms<S>3>qztX`j=6VVFA_$z}rn&)vA%YO&$8cYP+J$ErBCZ27-DZt_f|YmX2Rd2%u~
z&QIPmPa`Z>$AXCwxxfisW$nYQW^-Hoo;!BTCS4}FxRm~rqJ3B{5v4o<td=P3mX-e;
z$kfGa3XFsb@fls`v96icJb67*ISQa>g@eoj%XN(C-A=5OmYL5ftGX@4;7U^7t?6@2
zmR;IqR%>a3;{+ksn7lf&qyb*vb5k~I%J~_Sh4#37{H<3~11=Iu0)#(Vy0=r8ObN>e
z6OYX1>plX`#jZl2h_&^bB}q_qj#NO|0F1S|aG$owO;p%$g(3t{i&a*fhm9_d1~${#
azb+0$RdwfQyenj4et;>;(x?G>HTHj)(0CpI

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
new file mode 100644
index 00000000000..4019e9a2ce7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorCode.bind
@@ -0,0 +1,8 @@
+// XAML UIElement
+<Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
+
+// C# - Light can be applied to any UIElement. In this case it is an image called ToolkitLogo.
+using Microsoft.Toolkit.Uwp.UI.Animations;
+
+var lightAnimationSet = ToolkitLogo.Light(distance: 10, duration: 500, delay: 0, color: Colors.Red);
+await lightAnimationSet.StartAsync();
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
new file mode 100644
index 00000000000..8eba95bedbd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
@@ -0,0 +1,39 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.LightBehaviorPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors"
+      xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <Grid>
+        <TextBlock x:Name="WarningText"
+                   Margin="0,20"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Top"
+                   Foreground="Red"
+                   Text="Light effects are not available on your version of Windows 10"
+                   TextWrapping="Wrap"
+                   Visibility="Collapsed" />
+        <Grid x:Name="XamlRoot"/>
+        
+        <!-- Shallow Copy -->
+        <Image>
+            <interactivity:Interaction.Behaviors>
+                <behaviors:Light Color="Red" />
+            </interactivity:Interaction.Behaviors>
+        </Image>
+
+        <StackPanel Visibility="Collapsed">
+            <Button>
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:CallMethodAction />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </Button>
+        </StackPanel>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
new file mode 100644
index 00000000000..fd59ec7d5be
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
@@ -0,0 +1,52 @@
+// 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.Linq;
+using Microsoft.Toolkit.Uwp.UI.Animations;
+using Microsoft.Toolkit.Uwp.UI.Animations.Behaviors;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Microsoft.Xaml.Interactivity;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    /// <summary>
+    /// A page that shows how to use the light behavior.
+    /// </summary>
+    public sealed partial class LightBehaviorPage : IXamlRenderListener
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        private Light _lightBehavior;
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LightBehaviorPage"/> class.
+        /// </summary>
+        public LightBehaviorPage()
+        {
+            this.InitializeComponent();
+
+            if (!AnimationExtensions.IsLightingSupported)
+            {
+                WarningText.Visibility = Visibility.Visible;
+            }
+
+            SampleController.Current.RegisterNewCommand("Apply", (s, e) =>
+            {
+                _lightBehavior?.StartAnimation();
+            });
+        }
+
+        public void OnXamlRendered(FrameworkElement control)
+        {
+            if (control.FindChildByName("EffectElement") is FrameworkElement element)
+            {
+                var behaviors = Interaction.GetBehaviors(element);
+#pragma warning disable CS0618 // Type or member is obsolete
+                _lightBehavior = behaviors.FirstOrDefault(item => item is Light) as Light;
+#pragma warning restore CS0618 // Type or member is obsolete
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
new file mode 100644
index 00000000000..2ca51bf1cfc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorXaml.bind
@@ -0,0 +1,25 @@
+<Page
+    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:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors"
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    mc:Ignorable="d">
+
+  <Grid>
+    <Image x:Name="EffectElement" Source="ms-appx:///Assets/ToolkitLogo.png" Height="100" Width="100">
+      <interactivity:Interaction.Behaviors>
+        <behaviors:Light x:Name="LightBehavior"
+                        Distance="@[Distance:DoubleSlider:10.0:0.1-50.0]"
+                        Duration="@[Duration:DoubleSlider:500.0:0.0-10000.0]"
+                        Delay="@[Delay:DoubleSlider:0.0:0.0-5000.0]"
+                        AutomaticallyStart="@[AutomaticallyStart:Bool:True]"
+                        EasingType="@[EasingType:Enum:EasingType.Linear]"
+                        EasingMode="@[EasingMode:Enum:EasingMode.EaseOut]"
+                        Color="@[Color:Brush:Red]" />
+      </interactivity:Interaction.Behaviors>
+    </Image>
+  </Grid>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aeebd1d673de8670b59cb522700c93f1c75b887
GIT binary patch
literal 1392
zcmeAS@N?(olHy`uVBq!ia0y~yU{nCI4{)#n$t4^1Z39v)>5jgR3=A9lx&I`x0{NT;
z9+AZi3_@Vc*rT+Q9VjSK;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XQ*fNOZn_apgHe6
zT^vIy;@;jkn3<9;(sHr$a7C&>Me2+jB8``VnSxjjMP@u{{Ps+A*_%VZT#Kdr^5tW8
z?PLG@_VH)g2NUMU?`QbaU-$RJ?e_cje?B@kH25n!957^Jks+S?oXJ@AJU_4Ksap8<
z*>{W?tq%CEyYu8#+2m?92lgE&r_PSKn^$z6<pqQJ&Z5byZ~MNxd7b0J<;$0U-@bkO
z&C{n(|9<>vX!n@AaI&`f&Rut(%&YBXu(h{8E`O?i>b#Gwa0B+aHT<iRUMhcL|JPr?
zetp)Ri7fety`*7w%+8Zn->QB0Y2Yh>nZ<d55$3SX=Q%GNK74rofm*NG`kVqAJV(jV
z5Eu=Cfe3+GzXk>-My5VNg$EMEQ9q9}FxG6!zhBS5Tj$4m^~aMNz|xVy)78&qol`;+
E0K}H&HUIzs

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
new file mode 100644
index 00000000000..32f465f2c64
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
@@ -0,0 +1,19 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TabViewPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <Grid>
+        <Grid x:Name="XamlRoot"/>
+        <controls:InAppNotification x:Name="TabViewNotification"
+                                    ShowDismissButton="True"
+                                    AnimationDuration="00:00:00.1000000"
+                                    VerticalOffset="100"
+                                    HorizontalOffset="0"
+                                    StackMode="Replace" />
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
new file mode 100644
index 00000000000..74d9a3db253
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
@@ -0,0 +1,73 @@
+// 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.ObjectModel;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Windows.UI.Popups;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    public sealed partial class TabViewPage : Page, IXamlRenderListener
+    {
+        #pragma warning disable CS0618 // Type or member is obsolete
+        private TabView _tabs;
+
+        private int _counter = 1;
+
+        public TabViewPage()
+        {
+            this.InitializeComponent();
+        }
+
+        public void OnXamlRendered(FrameworkElement control)
+        {
+            _tabs = control.FindChildByName("Tabs") as TabView;
+            if (_tabs != null)
+            {
+                _tabs.TabDraggedOutside += Tabs_TabDraggedOutside;
+                _tabs.TabClosing += Tabs_TabClosing;
+            }
+
+            var btn = control.FindDescendantByName("AddTabButtonUpper") as Button;
+            if (btn != null)
+            {
+                btn.Click += AddUpperTabClick;
+            }
+        }
+
+        private void AddUpperTabClick(object sender, RoutedEventArgs e)
+        {
+            _tabs.Items.Add(new TabViewItem()
+            {
+                Header = "Untitled " + _counter,
+                Icon = new SymbolIcon(Symbol.Document),
+                Content = "This is new tab #" + _counter++ + "."
+            });
+        }
+
+        private void Tabs_TabClosing(object sender, TabClosingEventArgs e)
+        {
+            TabViewNotification.Show("You're closing the '" + e.Tab.Header + "' tab.", 2000);
+        }
+
+        private void Tabs_TabDraggedOutside(object sender, TabDraggedOutsideEventArgs e)
+        {
+            // The sample app let's you drag items from a static TabView with TabViewItem's pre-defined.
+            // In the case of data bound scenarios e.Item should be your data item, and e.Tab should always be the TabViewItem.
+            var str = e.Item.ToString();
+
+            if (e.Tab != null)
+            {
+                str = e.Tab.Header.ToString();
+            }
+
+            TabViewNotification.Show("Tore Tab '" + str + "' Outside of TabView.", 2000);
+        }
+        #pragma warning restore CS0618 // Type or member is obsolete
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
new file mode 100644
index 00000000000..e81732aa2a3
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
@@ -0,0 +1,97 @@
+<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+      mc:Ignorable="d">
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition/>
+      <RowDefinition Height="Auto"/>
+    </Grid.RowDefinitions>
+    <controls:TabView x:Name="Tabs"
+                      TabWidthBehavior="@[Tab Width Behavior:Enum:TabWidthMode.Actual]"
+                      CanCloseTabs="@[Can Close Tabs:Bool:False]"
+                      IsCloseButtonOverlay="@[Overlay Close Button:Bool:False]"
+                      CanDragItems="@[Drag and Drop Enabled:Bool:False]"
+                      CanReorderItems="@[Drag and Drop Enabled]"
+                      AllowDrop="@[Drag and Drop Enabled]"
+                      SelectedTabWidth="200">
+      <controls:TabView.Resources>
+        <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
+        <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
+        <x:Double x:Key="TabViewItemHeaderMaxWidth">200</x:Double>
+      </controls:TabView.Resources>
+      <controls:TabView.Header>
+        <TextBlock Padding="16,8,0,8" FontSize="16" FontWeight="Bold" Text="TabView Control Header"/>
+      </controls:TabView.Header>
+      <controls:TabView.TabStartHeader>
+        <Button Width="48"
+                Height="{StaticResource TabViewItemHeaderMinHeight}"
+                Margin="0,0,-1,0"
+                BorderThickness="1"
+                Background="Transparent" 
+                Style="{StaticResource ButtonRevealStyle}" 
+                Padding="2,2,0,0">
+          <Viewbox MaxWidth="16" MaxHeight="16">
+            <SymbolIcon Symbol="AddFriend"/>
+          </Viewbox>
+        </Button>
+      </controls:TabView.TabStartHeader>
+
+      <!-- Tabs -->
+      <controls:TabViewItem Header="Home" Icon="Home">
+        <TextBlock Padding="16">The TabView control has multiple uses.</TextBlock>
+      </controls:TabViewItem>
+      <controls:TabViewItem Header="Tab 2 Has Longer Text" Icon="Audio">
+        <TextBlock Padding="16">It has a lot of versitility out of the box for different scenarios.</TextBlock>
+      </controls:TabViewItem>
+      <controls:TabViewItem Header="Tab 3" Icon="Video">
+        <TextBlock Padding="16">You can enable drag-and-drop and reorder the tabs too.</TextBlock>
+      </controls:TabViewItem>
+      <controls:TabViewItem Header="Not Closable" Icon="Calendar" IsClosable="False">
+        <TextBlock Padding="16">This tab isn't closable because its IsClosable property is set to False, even when CanCloseTabs is True.</TextBlock>
+      </controls:TabViewItem>
+
+      <controls:TabView.TabActionHeader>
+        <Button x:Name="AddTabButtonUpper"
+                Width="48"
+                Height="{StaticResource TabViewItemHeaderMinHeight}"
+                Margin="-1,0,0,0"
+                BorderThickness="1"
+                Background="Transparent"
+                Style="{StaticResource ButtonRevealStyle}">
+          <Viewbox MaxWidth="16"
+                    MaxHeight="16">
+            <FontIcon FontFamily="Segoe MDL2 Assets"
+                      Glyph="&#xE710;" />
+          </Viewbox>
+        </Button>
+
+      </controls:TabView.TabActionHeader>
+
+      <controls:TabView.TabEndHeader>
+        <Button Width="48"
+                Height="{StaticResource TabViewItemHeaderMinHeight}"
+                Margin="-1,0,0,0"
+                BorderThickness="1" 
+                Background="Transparent" 
+                Style="{StaticResource ButtonRevealStyle}">
+          <Viewbox MaxWidth="16" MaxHeight="16">
+            <SymbolIcon Symbol="Setting"/>
+          </Viewbox>
+        </Button>
+      </controls:TabView.TabEndHeader>
+
+      <controls:TabView.Footer>
+        <TextBlock Padding="16,8,16,8"
+                   HorizontalAlignment="Right"
+                   FontSize="16" FontWeight="Bold"
+                   Text="TabView Control Footer" />
+      </controls:TabView.Footer>
+    </controls:TabView>
+  </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 7b4d6b3a1c6..f106b270277 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -14,6 +14,18 @@
         "Icon": "/SamplePages/TextToolbar/TextToolbar.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TextToolbar.md"
       },
+      {
+        "Name": "TabView",
+        "Type": "TabViewPage",
+        "Subcategory": "Layout",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui",
+        "About": "A control for displaying multiple items in the same space and allows a user to easily switch between them.",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TabView",
+        "XamlCodeFile": "TabViewXaml.bind",
+        "Icon": "/SamplePages/TabView/TabView.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TabView.md"
+      },
       {
         "Name": "DataGrid",
         "Type": "DataGridPage",
@@ -74,6 +86,18 @@
         "Icon": "/SamplePages/ImageEx/ImageEx.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
+      {
+        "Name": "HeaderedTextBlock",
+        "Type": "HeaderedTextBlockPage",
+        "Subcategory": "Layout",
+        "About": "The HeaderedTextBlock control is designed to provide a header for read only text. This control is useful for displaying read only forms.",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock",
+        "XamlCodeFile": "HeaderedTextBlockCode.bind",
+        "Icon": "/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/HeaderedTextBlock.md",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The HeaderedTextBlock has been replaced with the HeaderedContentControl and will be removed in a future major release."
+      },
       {
         "Name": "MasterDetailsView",
         "Type": "MasterDetailsViewPage",
@@ -508,6 +532,19 @@
         "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Saturation.md"
       },
+      {
+        "Name": "Light",
+        "Type": "LightBehaviorPage",
+        "Subcategory": "Behavior",
+        "About": "The Light effect will be removed in a future major release",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "The Light effect will be removed in a future major release",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors",
+        "CodeFile": "LightBehaviorCode.bind",
+        "XamlCodeFile": "LightBehaviorXaml.bind",
+        "Icon": "/SamplePages/Light/LightBehavior.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Light.md"
+      },
       {
         "Name": "FadeHeader",
         "Type": "FadeHeaderBehaviorPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
new file mode 100644
index 00000000000..8940f3eb630
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
@@ -0,0 +1,69 @@
+// 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 Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations.Behaviors
+{
+    /// <summary>
+    /// Applies a basic point light to a UIElement. You control the intensity by setting the distance of the light.
+    /// </summary>
+    /// <seealso cref="Microsoft.Toolkit.Uwp.UI.Animations.Behaviors.CompositionBehaviorBase" />
+    /// <seealso cref="AnimationExtensions.IsLightingSupported"/>
+    [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
+
+    public class Light : CompositionBehaviorBase<FrameworkElement>
+    {
+        /// <summary>
+        /// The Blur value of the associated object
+        /// </summary>
+        public static readonly DependencyProperty DistanceProperty = DependencyProperty.Register(nameof(Distance), typeof(double), typeof(Light), new PropertyMetadata(0d, PropertyChangedCallback));
+
+        /// <summary>
+        /// The Color of the spotlight no the associated object.
+        /// </summary>
+        public static readonly DependencyProperty ColorProperty = DependencyProperty.Register("Color", typeof(Brush), typeof(Light), new PropertyMetadata(new SolidColorBrush(Colors.White)));
+
+        /// <summary>
+        /// Gets or sets the Blur.
+        /// </summary>
+        /// <value>
+        /// The Blur.
+        /// </value>
+        public double Distance
+        {
+            get { return (double)GetValue(DistanceProperty); }
+            set { SetValue(DistanceProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the spotlight.
+        /// </summary>
+        public Brush Color
+        {
+            get { return (Brush)GetValue(ColorProperty); }
+            set { SetValue(ColorProperty, value); }
+        }
+
+        /// <summary>
+        /// Starts the animation.
+        /// </summary>
+        public override void StartAnimation()
+        {
+            if (AnimationExtensions.IsLightingSupported)
+            {
+                AssociatedObject?.Light(
+                    duration: Duration,
+                    delay: Delay,
+                    easingType: EasingType,
+                    easingMode: EasingMode,
+                    distance: (float)Distance,
+                    color: ((SolidColorBrush)Color).Color)?.Start();
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
index 999ea1d40c4..a0e5afa756d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
@@ -361,6 +361,22 @@ public static void UnregisterListItemForConnectedAnimation(this Page page, ListV
             }
         }
 
+        /// <summary>
+        /// Sets the object that will be used during next Frame navigation for
+        /// Connected Animation involving a list control (item must be an element of
+        /// ListViewBase.ItemsSource collection).
+        /// Useful if the parameter used during page navigation is different from the
+        /// data item in the list control. Also useful during back navigation if the
+        /// item navigating back to is different from the item that was navigated from.
+        /// </summary>
+        /// <param name="frame">The Frame handling the navigation</param>
+        /// <param name="item">The data item from a list control to be animated during next frame navigation</param>
+        [Obsolete("Method is replaced by SetListDataItemForNextConnectedAnimation")]
+        public static void SetListDataItemForNextConnectedAnnimation(this Frame frame, object item)
+        {
+            GetConnectedAnimationHelper(frame)?.SetParameterForNextFrameNavigation(item);
+        }
+
         /// <summary>
         /// Sets the object that will be used during next Frame navigation for
         /// Connected Animation involving a list control (item must be an element of
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
index 3bc0da11259..0949dd235dd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
@@ -3,6 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Effects;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Windows.UI;
+using Windows.UI.Composition;
+using Windows.UI.Composition.Effects;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Hosting;
+using Windows.UI.Xaml.Media.Animation;
 
 namespace Microsoft.Toolkit.Uwp.UI.Animations
 {
@@ -12,12 +22,204 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     public static partial class AnimationExtensions
     {
         /// <summary>
-        /// Gets a value indicating whether this instance is lighting supported. Deprecated. Will always return <c>true</c>.
+        /// Stores all the point lights along with the visuals that they are applied to.
+        /// This is to stop multiplication of point lights on a single visual.
+        /// </summary>
+        private static Dictionary<Visual, PointLight> pointLights = new Dictionary<Visual, PointLight>();
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is lighting supported.
         /// </summary>
         /// <value>
-        /// Deprecated. Will always returns <c>true</c>.
+        /// <c>true</c> if this instance is lighting supported; otherwise, <c>false</c>.
         /// </value>
-        [Obsolete("This method is deprecated and will always return true")]
-        public static bool IsLightingSupported => true;
+        public static bool IsLightingSupported
+        {
+            get
+            {
+                bool lightingSupported = true;
+
+                if (!Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", "SetElementChildVisual"))
+                {
+                    lightingSupported = false;
+                }
+
+                if (!Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.Composition.CompositionSurfaceBrush"))
+                {
+                    lightingSupported = false;
+                }
+
+                return lightingSupported;
+            }
+        }
+
+        /// <summary>
+        /// Animates a point light and it's distance.
+        /// </summary>
+        /// <param name="associatedObject">The associated object.</param>
+        /// <param name="distance">The value.</param>
+        /// <param name="duration">The duration.</param>
+        /// <param name="delay">The delay.</param>
+        /// <param name="color">The color of the spotlight.</param>
+        /// <param name="easingType">The easing function</param>
+        /// <param name="easingMode">The easing mode</param>
+        /// <returns>An animation set.</returns>
+        [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
+        public static AnimationSet Light(
+            this FrameworkElement associatedObject,
+            double distance = 0d,
+            double duration = 500d,
+            double delay = 0d,
+            Color? color = null,
+            EasingType easingType = EasingType.Default,
+            EasingMode easingMode = EasingMode.EaseOut)
+        {
+            if (associatedObject == null)
+            {
+                return null;
+            }
+
+            var animationSet = new AnimationSet(associatedObject);
+            return animationSet.Light(distance, duration, delay, color, easingType, easingMode);
+        }
+
+        /// <summary>
+        /// Animates a point light and it's distance.
+        /// </summary>
+        /// <param name="animationSet">The animation set.</param>
+        /// <param name="distance">The distance of the light.</param>
+        /// <param name="duration">The duration in milliseconds.</param>
+        /// <param name="delay">The delay. (ignored if duration == 0)</param>
+        /// <param name="color">The color of the spotlight.</param>
+        /// <param name="easingType">The easing function</param>
+        /// <param name="easingMode">The easing mode</param>
+        /// <seealso cref="IsLightingSupported" />
+        /// <returns>
+        /// An Animation Set.
+        /// </returns>
+        [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
+        public static AnimationSet Light(
+            this AnimationSet animationSet,
+            double distance = 0d,
+            double duration = 500d,
+            double delay = 0d,
+            Color? color = null,
+            EasingType easingType = EasingType.Default,
+            EasingMode easingMode = EasingMode.EaseOut)
+        {
+            if (!IsLightingSupported)
+            {
+                return null;
+            }
+
+            if (animationSet == null)
+            {
+                return null;
+            }
+
+            var visual = animationSet.Visual;
+            var associatedObject = animationSet.Element as FrameworkElement;
+
+            if (associatedObject == null)
+            {
+                return animationSet;
+            }
+
+            var compositor = visual?.Compositor;
+            if (compositor == null)
+            {
+                return null;
+            }
+
+            var task = new AnimationTask();
+            task.AnimationSet = animationSet;
+
+            task.Task = DispatcherHelper.ExecuteOnUIThreadAsync(
+                () =>
+            {
+                const string sceneName = "PointLightScene";
+                PointLight pointLight;
+                CompositionDrawingSurface normalMap = null;
+
+                if (!pointLights.ContainsKey(visual))
+                {
+                    SurfaceLoader.Initialize(compositor);
+                    normalMap = SurfaceLoader.LoadText(string.Empty, new Windows.Foundation.Size(512, 512), new Graphics.Canvas.Text.CanvasTextFormat(), Colors.Transparent, Colors.Transparent);
+                }
+
+                if (pointLights.ContainsKey(visual))
+                {
+                    pointLight = pointLights[visual];
+                }
+                else
+                {
+                    pointLight = compositor.CreatePointLight();
+
+                    var normalBrush = compositor.CreateSurfaceBrush(normalMap);
+                    normalBrush.Stretch = CompositionStretch.Fill;
+
+                    // check to see if the visual already has a point light applied.
+                    var spriteVisual = ElementCompositionPreview.GetElementChildVisual(associatedObject) as SpriteVisual;
+                    var normalsBrush = spriteVisual?.Brush as CompositionEffectBrush;
+
+                    if (normalsBrush == null || normalsBrush.Comment != sceneName)
+                    {
+                        var lightEffect = new CompositeEffect()
+                        {
+                            Mode = CanvasComposite.Add,
+                            Sources =
+                            {
+                                new CompositionEffectSourceParameter("ImageSource"),
+                                new SceneLightingEffect()
+                                {
+                                    Name = sceneName,
+                                    AmbientAmount = 0,
+                                    DiffuseAmount = 0.5f,
+                                    SpecularAmount = 0,
+                                    NormalMapSource = new CompositionEffectSourceParameter("NormalMap"),
+                                }
+                            }
+                        };
+
+                        var effectFactory = compositor.CreateEffectFactory(lightEffect);
+                        var brush = effectFactory.CreateBrush();
+                        brush.SetSourceParameter("NormalMap", normalBrush);
+
+                        var sprite = compositor.CreateSpriteVisual();
+                        sprite.Size = visual.Size;
+                        sprite.Brush = brush;
+                        sprite.Comment = sceneName;
+
+                        ElementCompositionPreview.SetElementChildVisual(task.AnimationSet.Element, sprite);
+
+                        pointLight.CoordinateSpace = visual;
+                        pointLight.Targets.Add(visual);
+                    }
+                }
+
+                pointLight.Color = color ?? Colors.White;
+                var delayTime = task.Delay != null ? task.Delay.Value : TimeSpan.FromMilliseconds(delay);
+                var durationTime = task.Duration != null ? task.Duration.Value : TimeSpan.FromMilliseconds(duration);
+
+                if (durationTime.TotalMilliseconds <= 0)
+                {
+                    task.AnimationSet.AddEffectDirectPropertyChange(pointLight, (float)distance, nameof(pointLight.Offset));
+                }
+                else
+                {
+                    var diffuseAnimation = compositor.CreateVector3KeyFrameAnimation();
+                    diffuseAnimation.InsertKeyFrame(1f, new System.Numerics.Vector3(visual.Size.X / 2, visual.Size.Y / 2, (float)distance), GetCompositionEasingFunction(easingType, compositor, easingMode));
+                    diffuseAnimation.Duration = durationTime;
+                    diffuseAnimation.DelayTime = delayTime;
+
+                    task.AnimationSet.AddCompositionEffectAnimation(pointLight, diffuseAnimation, nameof(pointLight.Offset));
+                }
+
+                pointLights[visual] = pointLight;
+            }, Windows.UI.Core.CoreDispatcherPriority.Normal);
+
+            animationSet.AddAnimationThroughTask(task);
+            return animationSet;
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
new file mode 100644
index 00000000000..3cba40e11f1
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
@@ -0,0 +1,49 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
+using Microsoft.Windows.Design;
+using Microsoft.Windows.Design.Features;
+using Microsoft.Windows.Design.Metadata;
+using Microsoft.Windows.Design.Model;
+using Microsoft.Windows.Design.PropertyEditing;
+using System.ComponentModel;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal class HeaderedTextBlockDefaults : DefaultInitializer
+    {
+        public override void InitializeDefaults(ModelItem item)
+        {
+            item.Properties[nameof(HeaderedTextBlock.Header)].SetValue(string.Empty);
+            item.Properties[nameof(HeaderedTextBlock.Text)].SetValue(string.Empty);
+        }
+    }
+    internal class HeaderedTextBlockMetadata : AttributeTableBuilder
+	{
+        public HeaderedTextBlockMetadata()
+			: base()
+		{
+			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock),
+				b =>
+				{
+                    b.AddCustomAttributes(new FeatureAttribute(typeof(HeaderedTextBlockDefaults)));
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.TextStyle),
+                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Header), new CategoryAttribute(Properties.Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Text), new CategoryAttribute(Properties.Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Orientation), new CategoryAttribute(Properties.Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HideTextIfEmpty), new CategoryAttribute(Properties.Resources.CategoryAppearance));
+                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
+				}
+			);
+		}
+	}
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
index b7b241a6403..b611399dd13 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
@@ -85,6 +85,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TabViewItemMetadata.cs" />
     <Compile Include="BladeItemMetadata.cs" />
     <Compile Include="BladeViewMetadata.cs" />
     <Compile Include="CarouselMetadata.cs" />
@@ -92,6 +93,7 @@
     <Compile Include="AdaptiveGridViewMetadata.cs" />
     <Compile Include="ExpanderMetadata.cs" />
     <Compile Include="GridSplitterMetadata.cs" />
+    <Compile Include="HeaderedTextBlockMetadata.cs" />
     <Compile Include="ImageExMetadata.cs" />
     <Compile Include="InAppNotificationMetadata.cs" />
     <Compile Include="LayoutTransitionControlMetadata.cs" />
@@ -103,6 +105,7 @@
     <Compile Include="MetadataRegistration.cs" />
     <Compile Include="Common\MetadataRegistrationBase.cs" />
     <Compile Include="Common\PlatformTypes.cs" />
+    <Compile Include="TabViewMetadata.cs" />
     <Compile Include="OrbitViewMetadata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
new file mode 100644
index 00000000000..6ed6bc37bf8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
@@ -0,0 +1,43 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
+using Microsoft.Windows.Design;
+using Microsoft.Windows.Design.Features;
+using Microsoft.Windows.Design.Metadata;
+using Microsoft.Windows.Design.Model;
+using Microsoft.Windows.Design.PropertyEditing;
+using System.ComponentModel;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+
+	internal class TabViewItemMetadata : AttributeTableBuilder
+	{
+		public TabViewItemMetadata()
+			: base()
+		{
+            AddCallback(typeof(TabViewItem),
+                b =>
+                {
+                    b.AddCustomAttributes(nameof(TabViewItem.Header),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon)
+                        );
+                    b.AddCustomAttributes(nameof(TabViewItem.HeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(TabViewItem.IsClosable),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon)
+                        );
+                    b.AddCustomAttributes(nameof(TabViewItem.Icon),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon)
+                        );
+
+                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
+                }
+            );
+		}
+	}
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
new file mode 100644
index 00000000000..7bfa77541db
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
@@ -0,0 +1,54 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
+using Microsoft.Windows.Design;
+using Microsoft.Windows.Design.Metadata;
+using Microsoft.Windows.Design.PropertyEditing;
+using System.ComponentModel;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+	internal class TabViewMetadata : AttributeTableBuilder
+	{
+        public TabViewMetadata()
+			: base()
+		{
+			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TabView),
+				b =>
+                {
+                    // Layout
+                    b.AddCustomAttributes(nameof(TabView.TabWidthBehavior), new CategoryAttribute(Properties.Resources.CategoryLayout));
+                    b.AddCustomAttributes(nameof(TabView.SelectedTabWidth), new CategoryAttribute(Properties.Resources.CategoryLayout));
+                    b.AddCustomAttributes(nameof(TabView.IsCloseButtonOverlay), new CategoryAttribute(Properties.Resources.CategoryLayout));
+
+                    // Interactions
+                    b.AddCustomAttributes(nameof(TabView.CanCloseTabs), new CategoryAttribute(Properties.Resources.CategoryCommon));
+
+                    // Templates
+                    b.AddCustomAttributes(nameof(TabView.ItemHeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(TabView.TabActionHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(TabView.TabActionHeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(TabView.TabEndHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(TabView.TabEndHeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(TabView.TabStartHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(TabView.TabStartHeaderTemplate),
+                        new CategoryAttribute(Properties.Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
+				}
+			);
+		}
+	}
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
new file mode 100644
index 00000000000..7528591fc2b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
@@ -0,0 +1,172 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Defines the properties for the <see cref="HeaderedTextBlock"/> control.
+    /// </summary>
+    public partial class HeaderedTextBlock
+    {
+        /// <summary>
+        /// Defines the <see cref="HeaderTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+            nameof(HeaderTemplate),
+            typeof(DataTemplate),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Defines the <see cref="TextStyle"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty TextStyleProperty = DependencyProperty.Register(
+            nameof(TextStyle),
+            typeof(Style),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Defines the <see cref="Header"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+            nameof(Header),
+            typeof(string),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+            nameof(Text),
+            typeof(string),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+            nameof(Orientation),
+            typeof(Orientation),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(Orientation.Vertical, (d, e) => { ((HeaderedTextBlock)d).UpdateForOrientation((Orientation)e.NewValue); }));
+
+        /// <summary>
+        /// Defines the <see cref="HideTextIfEmpty"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HideTextIfEmptyProperty = DependencyProperty.Register(
+            nameof(HideTextIfEmpty),
+            typeof(bool),
+            typeof(HeaderedTextBlock),
+            new PropertyMetadata(false, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
+
+        /// <summary>
+        /// Gets or sets the header style.
+        /// </summary>
+        public DataTemplate HeaderTemplate
+        {
+            get
+            {
+                return (DataTemplate)GetValue(HeaderTemplateProperty);
+            }
+
+            set
+            {
+                SetValue(HeaderTemplateProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text style.
+        /// </summary>
+        public Style TextStyle
+        {
+            get
+            {
+                return (Style)GetValue(TextStyleProperty);
+            }
+
+            set
+            {
+                SetValue(TextStyleProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the header.
+        /// </summary>
+        public string Header
+        {
+            get
+            {
+                return (string)GetValue(HeaderProperty);
+            }
+
+            set
+            {
+                SetValue(HeaderProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text.
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                return (string)GetValue(TextProperty);
+            }
+
+            set
+            {
+                SetValue(TextProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of inline text elements within a Windows.UI.Xaml.Controls.TextBlock.
+        /// </summary>
+        /// <returns>
+        /// A collection that holds all inline text elements from the Windows.UI.Xaml.Controls.TextBlock. The default is an empty collection.</returns>
+        public InlineCollectionWrapper Inlines { get; } = new InlineCollectionWrapper();
+
+        /// <summary>
+        /// Gets or sets the orientation.
+        /// </summary>
+        public Orientation Orientation
+        {
+            get
+            {
+                return (Orientation)GetValue(OrientationProperty);
+            }
+
+            set
+            {
+                SetValue(OrientationProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the Text TextBlock is hidden if its value is empty
+        /// </summary>
+        public bool HideTextIfEmpty
+        {
+            get
+            {
+                return (bool)GetValue(HideTextIfEmptyProperty);
+            }
+
+            set
+            {
+                SetValue(HideTextIfEmptyProperty, value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
new file mode 100644
index 00000000000..b30dfea1d3d
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
@@ -0,0 +1,76 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Defines a control for providing a header for read-only text.
+    /// </summary>
+    [TemplatePart(Name = "HeaderContentPresenter", Type = typeof(ContentPresenter))]
+    [ContentProperty(Name = nameof(Inlines))]
+    [Obsolete("The HeaderedTextBlock has been replaced with the more generic HeaderedContentControl.")]
+    public partial class HeaderedTextBlock : Control
+    {
+        private ContentPresenter _headerContentPresenter;
+        private TextBlock _textContent;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HeaderedTextBlock"/> class.
+        /// </summary>
+        public HeaderedTextBlock()
+        {
+            DefaultStyleKey = typeof(HeaderedTextBlock);
+        }
+
+        /// <summary>
+        /// Called when applying the control template.
+        /// </summary>
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _headerContentPresenter = GetTemplateChild("HeaderContentPresenter") as ContentPresenter;
+            _textContent = GetTemplateChild("TextContent") as TextBlock;
+
+            UpdateVisibility();
+            Inlines.AddItemsToTextBlock(_textContent);
+            UpdateForOrientation(this.Orientation);
+        }
+
+        private void UpdateVisibility()
+        {
+            if (_headerContentPresenter != null)
+            {
+                _headerContentPresenter.Visibility = _headerContentPresenter.Content == null
+                                                     ? Visibility.Collapsed
+                                                     : Visibility.Visible;
+            }
+
+            if (_textContent != null)
+            {
+                _textContent.Visibility = string.IsNullOrWhiteSpace(_textContent.Text) && HideTextIfEmpty
+                                                    ? Visibility.Collapsed
+                                                    : Visibility.Visible;
+            }
+        }
+
+        private void UpdateForOrientation(Orientation orientationValue)
+        {
+            switch (orientationValue)
+            {
+                case Orientation.Vertical:
+                    VisualStateManager.GoToState(this, "Vertical", true);
+                    break;
+                case Orientation.Horizontal:
+                    VisualStateManager.GoToState(this, "Horizontal", true);
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
new file mode 100644
index 00000000000..6f94a07ba82
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
@@ -0,0 +1,60 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+
+    <Style x:Key="HeaderedTextBlockTextStyle"
+           TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextLineBounds" Value="TrimToBaseline" />
+        <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="Light" />
+        <Setter Property="LineHeight" Value="28" />
+    </Style>
+
+    <Style TargetType="controls:HeaderedTextBlock">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Orientation" Value="Vertical" />
+        <Setter Property="TextStyle" Value="{ThemeResource HeaderedTextBlockTextStyle}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:HeaderedTextBlock">
+                    <StackPanel x:Name="Panel"
+                                Orientation="{TemplateBinding Orientation}">
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.ColumnSpan="4"
+                                          x:DeferLoadStrategy="Lazy"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          AutomationProperties.Name="Header content"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                          Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+                                          IsHitTestVisible="False"
+                                          Visibility="Collapsed" />
+
+                        <TextBlock x:Name="TextContent"
+                                   AutomationProperties.Name="Text content"
+                                   Style="{TemplateBinding TextStyle}"
+                                   Text="{TemplateBinding Text}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="OrientationStates">
+                                <VisualState x:Name="Vertical" />
+                                <VisualState x:Name="Horizontal">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextContent.Margin" Value="10,0,0,0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 9b240477475..6174415e0f3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -17,6 +17,7 @@
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
         - HeaderedContentControl: Provides a header to content.
         - HeaderedItemsControl: Provides a header to items.
+        - HeaderedTextBlock: Provide a header for read-only text.
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
index 8a263d98309..0dd5cea5b9e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
@@ -5,6 +5,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=headeredtextblock/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=pulltorefreshlistview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
index d3b003e8b80..66cce5b66ab 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
@@ -213,6 +213,14 @@
     <value>Notification</value>
     <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
+  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Close tab</value>
+    <comment>Narrator Resource for TabView Close Button.</comment>
+  </data>
+  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Close tab</value>
+    <comment>Tooltip for TabView Close Button.</comment>
+  </data>
   <data name="WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
     <value>Remove</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
new file mode 100644
index 00000000000..893776ff0be
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
@@ -0,0 +1,36 @@
+// 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;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Event arguments for <see cref="TabView.TabClosing"/> event.
+    /// </summary>
+    public class TabClosingEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TabClosingEventArgs"/> class.
+        /// </summary>
+        /// <param name="item">Item being closed.</param>
+        /// <param name="tab"><see cref="TabViewItem"/> container being closed.</param>
+        public TabClosingEventArgs(object item, TabViewItem tab)
+        {
+            Item = item;
+            Tab = tab;
+        }
+
+        /// <summary>
+        /// Gets the Item being closed.
+        /// </summary>
+        public object Item { get; private set; }
+
+        /// <summary>
+        /// Gets the Tab being closed.
+        /// </summary>
+        public TabViewItem Tab { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
new file mode 100644
index 00000000000..dcf351aab9b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
@@ -0,0 +1,35 @@
+// 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;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// A class used by the <see cref="TabView"/> TabDraggedOutside Event
+    /// </summary>
+    public class TabDraggedOutsideEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TabDraggedOutsideEventArgs"/> class.
+        /// </summary>
+        /// <param name="item">data context of element dragged</param>
+        /// <param name="tab"><see cref="TabViewItem"/> container being dragged.</param>
+        public TabDraggedOutsideEventArgs(object item, TabViewItem tab)
+        {
+            Item = item;
+            Tab = tab;
+        }
+
+        /// <summary>
+        /// Gets or sets the Item/Data Context of the item being dragged outside of the <see cref="TabView"/>.
+        /// </summary>
+        public object Item { get; set; }
+
+        /// <summary>
+        /// Gets the Tab being dragged outside of the <see cref="TabView"/>.
+        /// </summary>
+        public TabViewItem Tab { get; private set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
new file mode 100644
index 00000000000..16885700b35
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
@@ -0,0 +1,221 @@
+// 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.Linq;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// TabView methods related to calculating the width of the <see cref="TabViewItem"/> Headers.
+    /// </summary>
+    public partial class TabView
+    {
+        // Attached property for storing widths of tabs if set by other means during layout.
+        private static double GetOriginalWidth(TabViewItem obj)
+        {
+            return (double)obj.GetValue(OriginalWidthProperty);
+        }
+
+        private static void SetOriginalWidth(TabViewItem obj, double value)
+        {
+            obj.SetValue(OriginalWidthProperty, value);
+        }
+
+        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
+        private static readonly DependencyProperty OriginalWidthProperty =
+            DependencyProperty.RegisterAttached("OriginalWidth", typeof(double), typeof(TabView), new PropertyMetadata(null));
+
+        private static void OnLayoutEffectingPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            var tabview = sender as TabView;
+            if (tabview != null && tabview._hasLoaded)
+            {
+                tabview.TabView_SizeChanged(tabview, null);
+            }
+        }
+
+        private void TabView_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            // We need to do this calculation here in Size Changed as the
+            // Columns don't have their Actual Size calculated in Measure or Arrange.
+            if (_hasLoaded && _tabViewContainer != null)
+            {
+                // Look for our special columns to calculate size of other 'stuff'
+                var taken = _tabViewContainer.ColumnDefinitions.Sum(cd => GetIgnoreColumn(cd) ? 0 : cd.ActualWidth);
+
+                // Get the column we want to work on for available space
+                var tabc = _tabViewContainer.ColumnDefinitions.FirstOrDefault(cd => GetConstrainColumn(cd));
+                if (tabc != null)
+                {
+                    var available = ActualWidth - taken;
+                    var required = 0.0;
+                    var mintabwidth = double.MaxValue;
+
+                    if (TabWidthBehavior == TabWidthMode.Actual)
+                    {
+                        if (_tabScroller != null)
+                        {
+                            // If we have a scroll container, get its size.
+                            required = _tabScroller.ExtentWidth;
+                        }
+
+                        // Restore original widths
+                        foreach (var item in Items)
+                        {
+                            var tab = ContainerFromItem(item) as TabViewItem;
+                            if (tab == null)
+                            {
+                                continue; // container not generated yet
+                            }
+
+                            if (tab.ReadLocalValue(OriginalWidthProperty) != DependencyProperty.UnsetValue)
+                            {
+                                tab.Width = GetOriginalWidth(tab);
+                            }
+                        }
+                    }
+                    else if (available > 0)
+                    {
+                        // Calculate the width for each tab from the provider and determine how much space they take.
+                        foreach (var item in Items)
+                        {
+                            var tab = ContainerFromItem(item) as TabViewItem;
+                            if (tab == null)
+                            {
+                                continue; // container not generated yet
+                            }
+
+                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
+
+                            double width = double.NaN;
+
+                            switch (TabWidthBehavior)
+                            {
+                                case TabWidthMode.Equal:
+                                    width = ProvideEqualWidth(tab, item, available);
+                                    break;
+                                case TabWidthMode.Compact:
+                                    width = ProvideCompactWidth(tab, item, available);
+                                    break;
+                            }
+
+                            if (tab.ReadLocalValue(OriginalWidthProperty) == DependencyProperty.UnsetValue)
+                            {
+                                SetOriginalWidth(tab, tab.Width);
+                            }
+
+                            if (width > double.Epsilon)
+                            {
+                                tab.Width = width;
+                                required += Math.Max(Math.Min(width, tab.MaxWidth), tab.MinWidth);
+                            }
+                            else
+                            {
+                                tab.Width = GetOriginalWidth(tab);
+                                required += tab.ActualWidth;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Fix negative bounds.
+                        available = 0.0;
+
+                        // Still need to determine a 'minimum' width (if available)
+                        // TODO: Consolidate this logic with above better?
+                        foreach (var item in Items)
+                        {
+                            var tab = ContainerFromItem(item) as TabViewItem;
+                            if (tab == null)
+                            {
+                                continue; // container not generated yet
+                            }
+
+                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
+                        }
+                    }
+
+                    if (!(mintabwidth < double.MaxValue))
+                    {
+                        mintabwidth = 0.0; // No Containers, no visual, 0 size.
+                    }
+
+                    if (available > mintabwidth)
+                    {
+                        // Constrain the column based on our required and available space
+                        tabc.MaxWidth = available;
+                    }
+
+                    //// TODO: If it's less, should we move the selected tab to only be the one shown by default?
+
+                    if (available <= mintabwidth || Math.Abs(available - mintabwidth) < double.Epsilon)
+                    {
+                        tabc.Width = new GridLength(mintabwidth);
+                    }
+                    else if (required >= available)
+                    {
+                        // Fix size as we don't have enough space for all the tabs.
+                        tabc.Width = new GridLength(available);
+                    }
+                    else
+                    {
+                        // We haven't filled up our space, so we want to expand to take as much as needed.
+                        tabc.Width = GridLength.Auto;
+                    }
+                }
+            }
+        }
+
+        private double ProvideEqualWidth(TabViewItem tab, object item, double availableWidth)
+        {
+            if (double.IsNaN(SelectedTabWidth))
+            {
+                if (Items.Count <= 1)
+                {
+                    return availableWidth;
+                }
+
+                return Math.Max(tab.MinWidth, availableWidth / Items.Count);
+            }
+            else if (Items.Count() <= 1)
+            {
+                // Default case of a single tab, make it full size.
+                return Math.Min(SelectedTabWidth, availableWidth);
+            }
+            else
+            {
+                var width = (availableWidth - SelectedTabWidth) / (Items.Count - 1);
+
+                // Constrain between Min and Selected (Max)
+                if (width < tab.MinWidth)
+                {
+                    width = tab.MinWidth;
+                }
+                else if (width > SelectedTabWidth)
+                {
+                    width = SelectedTabWidth;
+                }
+
+                // If it's selected make it full size, otherwise whatever the size should be.
+                return tab.IsSelected
+                    ? Math.Min(SelectedTabWidth, availableWidth)
+                    : width;
+            }
+        }
+
+        private double ProvideCompactWidth(TabViewItem tab, object item, double availableWidth)
+        {
+            // If we're selected and have a value for that, then just return that.
+            if (tab.IsSelected && !double.IsNaN(SelectedTabWidth))
+            {
+                return SelectedTabWidth;
+            }
+
+            // Otherwise use min size.
+            return tab.MinWidth;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
new file mode 100644
index 00000000000..61f61623b6f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
@@ -0,0 +1,115 @@
+// 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.Reflection;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// TabView methods related to tracking Items and ItemsSource changes.
+    /// </summary>
+    public partial class TabView
+    {
+        // Temporary tracking of previous collections for removing events.
+        private MethodInfo _removeItemsSourceMethod;
+
+        /// <inheritdoc/>
+        protected override void OnItemsChanged(object e)
+        {
+            IVectorChangedEventArgs args = (IVectorChangedEventArgs)e;
+
+            base.OnItemsChanged(e);
+
+            if (args.CollectionChange == CollectionChange.ItemRemoved && SelectedIndex == -1)
+            {
+                // If we remove the selected item we should select the previous item
+                int startIndex = (int)args.Index + 1;
+                if (startIndex > Items.Count)
+                {
+                    startIndex = 0;
+                }
+
+                SelectedIndex = FindNextTabIndex(startIndex, -1);
+            }
+
+            // Update Sizing (in case there are less items now)
+            TabView_SizeChanged(this, null);
+        }
+
+        private void ItemContainerGenerator_ItemsChanged(object sender, ItemsChangedEventArgs e)
+        {
+            var action = (CollectionChange)e.Action;
+            if (action == CollectionChange.Reset)
+            {
+                // Reset collection to reload later.
+                _hasLoaded = false;
+            }
+        }
+
+        private void SetInitialSelection()
+        {
+            if (SelectedItem == null)
+            {
+                // If we have an index, but didn't get the selection, make the selection
+                if (SelectedIndex >= 0 && SelectedIndex < Items.Count)
+                {
+                    SelectedItem = Items[SelectedIndex];
+                }
+
+                // Otherwise, select the first item by default
+                else if (Items.Count >= 1)
+                {
+                    SelectedItem = Items[0];
+                }
+            }
+        }
+
+        // Finds the next visible & enabled tab index.
+        private int FindNextTabIndex(int startIndex, int direction)
+        {
+            int index = startIndex;
+            if (direction != 0)
+            {
+                for (int i = 0; i < Items.Count; i++)
+                {
+                    index += direction;
+
+                    if (index >= Items.Count)
+                    {
+                        index = 0;
+                    }
+                    else if (index < 0)
+                    {
+                        index = Items.Count - 1;
+                    }
+
+                    var tabItem = ContainerFromIndex(index) as TabViewItem;
+                    if (tabItem != null && tabItem.IsEnabled && tabItem.Visibility == Visibility.Visible)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return index;
+        }
+
+        private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            // Use reflection to store a 'Remove' method of any possible collection in ItemsSource
+            // Cache for efficiency later.
+            if (ItemsSource != null)
+            {
+                _removeItemsSourceMethod = ItemsSource.GetType().GetMethod("Remove");
+            }
+            else
+            {
+                _removeItemsSourceMethod = null;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
new file mode 100644
index 00000000000..5d33b33f1cc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
@@ -0,0 +1,245 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// TabView properties.
+    /// </summary>
+    public partial class TabView
+    {
+        /// <summary>
+        /// Gets or sets the content to appear to the left or above the tab strip.
+        /// </summary>
+        public object TabStartHeader
+        {
+            get { return (object)GetValue(TabStartHeaderProperty); }
+            set { SetValue(TabStartHeaderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabStartHeader"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabStartHeader"/> dependency property.</returns>
+        public static readonly DependencyProperty TabStartHeaderProperty =
+            DependencyProperty.Register(nameof(TabStartHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabStartHeader"/>.
+        /// </summary>
+        public DataTemplate TabStartHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(TabStartHeaderTemplateProperty); }
+            set { SetValue(TabStartHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabStartHeaderTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty TabStartHeaderTemplateProperty =
+            DependencyProperty.Register(nameof(TabStartHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the content to appear next to the tab strip.
+        /// </summary>
+        public object TabActionHeader
+        {
+            get { return (object)GetValue(TabActionHeaderProperty); }
+            set { SetValue(TabActionHeaderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabActionHeader"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabActionHeader"/> dependency property.</returns>
+        public static readonly DependencyProperty TabActionHeaderProperty =
+            DependencyProperty.Register(nameof(TabActionHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabActionHeader"/>.
+        /// </summary>
+        public DataTemplate TabActionHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(TabActionHeaderTemplateProperty); }
+            set { SetValue(TabActionHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabActionHeaderTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabActionHeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty TabActionHeaderTemplateProperty =
+            DependencyProperty.Register(nameof(TabActionHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the content to appear to the right or below the tab strip.
+        /// </summary>
+        public object TabEndHeader
+        {
+            get { return (object)GetValue(TabEndHeaderProperty); }
+            set { SetValue(TabEndHeaderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabEndHeader"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabEndHeader"/> dependency property.</returns>
+        public static readonly DependencyProperty TabEndHeaderProperty =
+            DependencyProperty.Register(nameof(TabEndHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabEndHeader"/>.
+        /// </summary>
+        public DataTemplate TabEndHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(TabEndHeaderTemplateProperty); }
+            set { SetValue(TabEndHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabEndHeaderTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabEndHeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty TabEndHeaderTemplateProperty =
+            DependencyProperty.Register(nameof(TabEndHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the default <see cref="DataTemplate"/> for the <see cref="TabViewItem.HeaderTemplate"/>.
+        /// </summary>
+        public DataTemplate ItemHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(ItemHeaderTemplateProperty); }
+            set { SetValue(ItemHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="ItemHeaderTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty ItemHeaderTemplateProperty =
+            DependencyProperty.Register(nameof(ItemHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether by default a Tab can be closed or not if no value to <see cref="TabViewItem.IsClosable"/> is provided.
+        /// </summary>
+        public bool CanCloseTabs
+        {
+            get { return (bool)GetValue(CanCloseTabsProperty); }
+            set { SetValue(CanCloseTabsProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="CanCloseTabs"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="CanCloseTabs"/> dependency property.</returns>
+        public static readonly DependencyProperty CanCloseTabsProperty =
+            DependencyProperty.Register(nameof(CanCloseTabs), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a <see cref="TabViewItem"/> Close Button should be included in layout calculations.
+        /// </summary>
+        public bool IsCloseButtonOverlay
+        {
+            get { return (bool)GetValue(IsCloseButtonOverlayProperty); }
+            set { SetValue(IsCloseButtonOverlayProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IsCloseButtonOverlay"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="IsCloseButtonOverlay"/> dependency property.</returns>
+        public static readonly DependencyProperty IsCloseButtonOverlayProperty =
+            DependencyProperty.Register(nameof(IsCloseButtonOverlay), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets a value indicating the size of the selected tab.  By default this is set to Auto and the selected tab size doesn't change.
+        /// </summary>
+        public double SelectedTabWidth
+        {
+            get { return (double)GetValue(SelectedTabWidthProperty); }
+            set { SetValue(SelectedTabWidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="SelectedTabWidth"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="SelectedTabWidth"/> dependency property.</returns>
+        public static readonly DependencyProperty SelectedTabWidthProperty =
+            DependencyProperty.Register(nameof(SelectedTabWidth), typeof(double), typeof(TabView), new PropertyMetadata(double.NaN, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the current <see cref="TabWidthMode"/> which determins how tab headers' width behave.
+        /// </summary>
+        public TabWidthMode TabWidthBehavior
+        {
+            get { return (TabWidthMode)GetValue(TabWidthBehaviorProperty); }
+            set { SetValue(TabWidthBehaviorProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TabWidthBehavior"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="TabWidthBehavior"/> dependency property.</returns>
+        public static readonly DependencyProperty TabWidthBehaviorProperty =
+            DependencyProperty.Register(nameof(TabWidthBehavior), typeof(TabWidthMode), typeof(TabView), new PropertyMetadata(TabWidthMode.Actual, OnLayoutEffectingPropertyChanged));
+
+        /// <summary>
+        /// Gets the attached property value to indicate if this grid column should be ignored when calculating header sizes.
+        /// </summary>
+        /// <param name="obj">Grid Column.</param>
+        /// <returns>Boolean indicating if this column is ignored by TabViewHeader logic.</returns>
+        public static bool GetIgnoreColumn(ColumnDefinition obj)
+        {
+            return (bool)obj.GetValue(IgnoreColumnProperty);
+        }
+
+        /// <summary>
+        /// Sets the attached property value for <see cref="IgnoreColumnProperty"/>
+        /// </summary>
+        /// <param name="obj">Grid Column.</param>
+        /// <param name="value">Boolean value</param>
+        public static void SetIgnoreColumn(ColumnDefinition obj, bool value)
+        {
+            obj.SetValue(IgnoreColumnProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IgnoreColumnProperty"/> attached property.
+        /// </summary>
+        /// <returns>The identifier for the IgnoreColumn attached property.</returns>
+        public static readonly DependencyProperty IgnoreColumnProperty =
+            DependencyProperty.RegisterAttached("IgnoreColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
+
+        /// <summary>
+        /// Gets the attached value indicating this column should be restricted for the <see cref="TabViewItem"/> headers.
+        /// </summary>
+        /// <param name="obj">Grid Column.</param>
+        /// <returns>True if this column should be constrained.</returns>
+        public static bool GetConstrainColumn(ColumnDefinition obj)
+        {
+            return (bool)obj.GetValue(ConstrainColumnProperty);
+        }
+
+        /// <summary>
+        /// Sets the attached property value for the <see cref="ConstrainColumnProperty"/>
+        /// </summary>
+        /// <param name="obj">Grid Column.</param>
+        /// <param name="value">Boolean value.</param>
+        public static void SetConstrainColumn(ColumnDefinition obj, bool value)
+        {
+            obj.SetValue(ConstrainColumnProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="ConstrainColumnProperty"/> attached property.
+        /// </summary>
+        /// <returns>The identifier for the ConstrainColumn attached property.</returns>
+        public static readonly DependencyProperty ConstrainColumnProperty =
+            DependencyProperty.RegisterAttached("ConstrainColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
new file mode 100644
index 00000000000..0e86ab398f5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
@@ -0,0 +1,320 @@
+// 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.Linq;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// TabView is a control for displaying a set of tabs and their content.
+    /// </summary>
+    [Obsolete("Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui")]
+    [TemplatePart(Name = TabContentPresenterName, Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = TabViewContainerName, Type = typeof(Grid))]
+    [TemplatePart(Name = TabsItemsPresenterName, Type = typeof(ItemsPresenter))]
+    [TemplatePart(Name = TabsScrollViewerName, Type = typeof(ScrollViewer))]
+    [TemplatePart(Name = TabsScrollBackButtonName, Type = typeof(ButtonBase))]
+    [TemplatePart(Name = TabsScrollForwardButtonName, Type = typeof(ButtonBase))]
+    public partial class TabView : ListViewBase
+    {
+        private const int ScrollAmount = 50; // TODO: Should this be based on TabWidthMode
+
+        private const string TabContentPresenterName = "TabContentPresenter";
+        private const string TabViewContainerName = "TabViewContainer";
+        private const string TabsItemsPresenterName = "TabsItemsPresenter";
+        private const string TabsScrollViewerName = "ScrollViewer";
+        private const string TabsScrollBackButtonName = "ScrollBackButton";
+        private const string TabsScrollForwardButtonName = "ScrollForwardButton";
+
+        private ContentPresenter _tabContentPresenter;
+        private Grid _tabViewContainer;
+        private ItemsPresenter _tabItemsPresenter;
+        private ScrollViewer _tabScroller;
+        private ButtonBase _tabScrollBackButton;
+        private ButtonBase _tabScrollForwardButton;
+
+        private bool _hasLoaded;
+        private bool _isDragging;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TabView"/> class.
+        /// </summary>
+        public TabView()
+        {
+            DefaultStyleKey = typeof(TabView);
+
+            // Container Generation Hooks
+            RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
+            ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
+
+            // Drag and Layout Hooks
+            DragItemsStarting += TabView_DragItemsStarting;
+            DragItemsCompleted += TabView_DragItemsCompleted;
+            SizeChanged += TabView_SizeChanged;
+
+            // Selection Hook
+            SelectionChanged += TabView_SelectionChanged;
+        }
+
+        /// <summary>
+        /// Occurs when a tab is dragged by the user outside of the <see cref="TabView"/>.  Generally, this paradigm is used to create a new-window with the torn-off tab.
+        /// The creation and handling of the new-window is left to the app's developer.
+        /// </summary>
+        public event EventHandler<TabDraggedOutsideEventArgs> TabDraggedOutside;
+
+        /// <summary>
+        /// Occurs when a tab's Close button is clicked.  Set <see cref="CancelEventArgs.Cancel"/> to true to prevent automatic Tab Closure.
+        /// </summary>
+        public event EventHandler<TabClosingEventArgs> TabClosing;
+
+        /// <inheritdoc/>
+        protected override DependencyObject GetContainerForItemOverride() => new TabViewItem();
+
+        /// <inheritdoc/>
+        protected override bool IsItemItsOwnContainerOverride(object item)
+        {
+            return item is TabViewItem;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            if (_tabItemsPresenter != null)
+            {
+                _tabItemsPresenter.SizeChanged -= TabView_SizeChanged;
+            }
+
+            if (_tabScroller != null)
+            {
+                _tabScroller.Loaded -= ScrollViewer_Loaded;
+            }
+
+            _tabContentPresenter = GetTemplateChild(TabContentPresenterName) as ContentPresenter;
+            _tabViewContainer = GetTemplateChild(TabViewContainerName) as Grid;
+            _tabItemsPresenter = GetTemplateChild(TabsItemsPresenterName) as ItemsPresenter;
+            _tabScroller = GetTemplateChild(TabsScrollViewerName) as ScrollViewer;
+
+            if (_tabItemsPresenter != null)
+            {
+                _tabItemsPresenter.SizeChanged += TabView_SizeChanged;
+            }
+
+            if (_tabScroller != null)
+            {
+                _tabScroller.Loaded += ScrollViewer_Loaded;
+            }
+        }
+
+        private void ScrollViewer_Loaded(object sender, RoutedEventArgs e)
+        {
+            _tabScroller.Loaded -= ScrollViewer_Loaded;
+
+            if (_tabScrollBackButton != null)
+            {
+                _tabScrollBackButton.Click -= ScrollTabBackButton_Click;
+            }
+
+            if (_tabScrollForwardButton != null)
+            {
+                _tabScrollForwardButton.Click -= ScrollTabForwardButton_Click;
+            }
+
+            _tabScrollBackButton = _tabScroller.FindDescendantByName(TabsScrollBackButtonName) as ButtonBase;
+            _tabScrollForwardButton = _tabScroller.FindDescendantByName(TabsScrollForwardButtonName) as ButtonBase;
+
+            if (_tabScrollBackButton != null)
+            {
+                _tabScrollBackButton.Click += ScrollTabBackButton_Click;
+            }
+
+            if (_tabScrollForwardButton != null)
+            {
+                _tabScrollForwardButton.Click += ScrollTabForwardButton_Click;
+            }
+        }
+
+        private void ScrollTabBackButton_Click(object sender, RoutedEventArgs e)
+        {
+            _tabScroller.ChangeView(Math.Max(0, _tabScroller.HorizontalOffset - ScrollAmount), null, null);
+        }
+
+        private void ScrollTabForwardButton_Click(object sender, RoutedEventArgs e)
+        {
+            _tabScroller.ChangeView(Math.Min(_tabScroller.ScrollableWidth, _tabScroller.HorizontalOffset + ScrollAmount), null, null);
+        }
+
+        private void TabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_isDragging)
+            {
+                // Skip if we're dragging, we'll reset when we're done.
+                return;
+            }
+
+            if (_tabContentPresenter != null)
+            {
+                if (SelectedItem == null)
+                {
+                    _tabContentPresenter.Content = null;
+                    _tabContentPresenter.ContentTemplate = null;
+                }
+                else
+                {
+                    if (ContainerFromItem(SelectedItem) is TabViewItem container)
+                    {
+                        _tabContentPresenter.Content = container.Content;
+                        _tabContentPresenter.ContentTemplate = container.ContentTemplate;
+                    }
+                }
+            }
+
+            // If our width can be effected by the selection, need to run algorithm.
+            if (!double.IsNaN(SelectedTabWidth))
+            {
+                TabView_SizeChanged(sender, null);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+        {
+            base.PrepareContainerForItemOverride(element, item);
+
+            var tabitem = element as TabViewItem;
+
+            tabitem.Loaded -= TabViewItem_Loaded;
+            tabitem.Closing -= TabViewItem_Closing;
+            tabitem.Loaded += TabViewItem_Loaded;
+            tabitem.Closing += TabViewItem_Closing;
+
+            if (tabitem.Header == null)
+            {
+                tabitem.Header = item;
+            }
+
+            if (tabitem.HeaderTemplate == null)
+            {
+                var headertemplatebinding = new Binding()
+                {
+                    Source = this,
+                    Path = new PropertyPath(nameof(ItemHeaderTemplate)),
+                    Mode = BindingMode.OneWay
+                };
+                tabitem.SetBinding(TabViewItem.HeaderTemplateProperty, headertemplatebinding);
+            }
+
+            if (tabitem.IsClosable != true && tabitem.ReadLocalValue(TabViewItem.IsClosableProperty) == DependencyProperty.UnsetValue)
+            {
+                var iscloseablebinding = new Binding()
+                {
+                    Source = this,
+                    Path = new PropertyPath(nameof(CanCloseTabs)),
+                    Mode = BindingMode.OneWay,
+                };
+                tabitem.SetBinding(TabViewItem.IsClosableProperty, iscloseablebinding);
+            }
+        }
+
+        private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
+        {
+            var tabitem = sender as TabViewItem;
+
+            tabitem.Loaded -= TabViewItem_Loaded;
+
+            // Only need to do this once.
+            if (!_hasLoaded)
+            {
+                _hasLoaded = true;
+
+                // Need to set a tab's selection on load, otherwise ListView resets to null.
+                SetInitialSelection();
+
+                // Need to make sure ContentPresenter is set to content based on selection.
+                TabView_SelectionChanged(this, null);
+
+                // Need to make sure we've registered our removal method.
+                ItemsSource_PropertyChanged(this, null);
+
+                // Make sure we complete layout now.
+                TabView_SizeChanged(this, null);
+            }
+        }
+
+        private void TabViewItem_Closing(object sender, TabClosingEventArgs e)
+        {
+            var item = ItemFromContainer(e.Tab);
+
+            var args = new TabClosingEventArgs(item, e.Tab);
+            TabClosing?.Invoke(this, args);
+
+            if (!args.Cancel)
+            {
+                if (ItemsSource != null)
+                {
+                    _removeItemsSourceMethod?.Invoke(ItemsSource, new object[] { item });
+                }
+                else
+                {
+                    Items.Remove(item);
+                }
+            }
+        }
+
+        private void TabView_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
+        {
+            // Keep track of drag so we don't modify content until done.
+            _isDragging = true;
+        }
+
+        private void TabView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+        {
+            _isDragging = false;
+
+            // args.DropResult == None when outside of area (e.g. create new window)
+            if (args.DropResult == DataPackageOperation.None)
+            {
+                var item = args.Items.FirstOrDefault();
+                var tab = ContainerFromItem(item) as TabViewItem;
+
+                if (tab == null && item is FrameworkElement fe)
+                {
+                    tab = fe.FindParent<TabViewItem>();
+                }
+
+                if (tab == null)
+                {
+                    // We still don't have a TabViewItem, most likely is a static TabViewItem in the template being dragged and not selected.
+                    // This is a fallback scenario for static tabs.
+                    // Note: This can be wrong if two TabViewItems share the exact same Content (i.e. a string), this should be unlikely in any practical scenario.
+                    for (int i = 0; i < Items.Count; i++)
+                    {
+                        var tabItem = ContainerFromIndex(i) as TabViewItem;
+                        if (ReferenceEquals(tabItem.Content, item))
+                        {
+                            tab = tabItem;
+                            break;
+                        }
+                    }
+                }
+
+                TabDraggedOutside?.Invoke(this, new TabDraggedOutsideEventArgs(item, tab));
+            }
+            else
+            {
+                // If dragging the active tab, there's an issue with the CP blanking.
+                TabView_SelectionChanged(this, null);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
new file mode 100644
index 00000000000..d3310aadf06
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
@@ -0,0 +1,736 @@
+<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:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
+
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <SolidColorBrush x:Key="TabViewBackground"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <StaticResource x:Key="TabViewItemHeaderBackground"
+                            ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
+                            ResourceKey="SystemControlForegroundAccentBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForeground"
+                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
+                            ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
+                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
+                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="Dark">
+            <SolidColorBrush x:Key="TabViewBackground"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
+                             Color="{StaticResource SystemChromeLowColor}" />
+            <StaticResource x:Key="TabViewItemHeaderBackground"
+                            ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
+                            ResourceKey="SystemControlForegroundAccentBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForeground"
+                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
+                            ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
+                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
+                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <SolidColorBrush x:Key="TabViewBackground"
+                             Color="{ThemeResource SystemChromeLowColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
+                             Color="{ThemeResource SystemColorHighlightColor}" />
+            <StaticResource x:Key="TabViewItemHeaderBackground"
+                            ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
+                            ResourceKey="SystemControlForegroundAccentBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForeground"
+                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
+                            ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
+                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
+                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
+                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <Thickness x:Key="TabViewItemHeaderMargin">0</Thickness>
+    <Thickness x:Key="TabViewItemHeaderIconMargin">0,0,8,0</Thickness>
+    <Thickness x:Key="TabViewItemHeaderCloseMargin">8,0,-8,0</Thickness>
+    <Thickness x:Key="TabViewItemHeaderBorderThickness">0,1,1,0</Thickness>
+    <x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
+    <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
+    <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
+    <x:Double x:Key="TabViewItemHeaderMaxWidth">NaN</x:Double>
+    <x:Double x:Key="TabViewItemHeaderCloseWidth">32</x:Double>
+
+    <converters:EmptyObjectToObjectConverter x:Key="NullVisibilityConverter"
+                                             EmptyValue="Collapsed"
+                                             NotEmptyValue="Visible" />
+    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
+    <!--  65 is the size of both scroll buttons + 1 for layout rounding.  -->
+    <converters:DoubleToVisibilityConverter x:Key="GreaterThanToleranceVisibilityConverter"
+                                            GreaterThan="65.0" />
+
+    <converters:BoolToObjectConverter x:Key="CloseCollapsingSizeConverter"
+                                      FalseValue="{StaticResource TabViewItemHeaderCloseWidth}"
+                                      TrueValue="NaN" />
+
+    <!--  Default style for compatibility with WPF migrators.  -->
+    <Style TargetType="local:TabView">
+        <Setter Property="Background" Value="{ThemeResource TabViewBackground}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="IsSwipeEnabled" Value="False" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.IsHorizontalRailEnabled" Value="False" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="False" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True" />
+        <!--  Need UseLayoutRounding as Width being dynamically changed in same cases to fill up an entire space, otherwise gap.  -->
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="ItemContainerTransitions">
+            <Setter.Value>
+                <TransitionCollection>
+                    <AddDeleteThemeTransition />
+                    <ContentThemeTransition />
+                    <ReorderThemeTransition />
+                    <EntranceThemeTransition IsStaggeringEnabled="False" />
+                </TransitionCollection>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <!--  Note: We have to use StackPanel here due to other issues using ItemsStackPanel or VirtualizingStackPanel  -->
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template" Value="{StaticResource TabViewTemplate}" />
+    </Style>
+
+    <ControlTemplate x:Key="TabViewTemplate"
+                     TargetType="local:TabView">
+        <Grid x:Name="TabViewContainer">
+            <Grid.RowDefinitions>
+                <!--  0 Header  -->
+                <RowDefinition Height="Auto" />
+                <!--  1 Tabs  -->
+                <RowDefinition Height="Auto" />
+                <!--  2 Content  -->
+                <RowDefinition Height="*" />
+                <!--  3 Footer  -->
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <!--  0 TabStartHeader  -->
+                <ColumnDefinition Width="Auto" />
+                <!--  1 Tabs  -->
+                <ColumnDefinition Width="Auto"
+                                  local:TabView.ConstrainColumn="True"
+                                  local:TabView.IgnoreColumn="True" />
+                <!--  2 Reserved: Overflow Drop-down  -->
+                <ColumnDefinition Width="Auto" />
+                <!--  3 Auto Add Button  -->
+                <ColumnDefinition Width="Auto" />
+                <!--  4 Padding  -->
+                <ColumnDefinition Width="*"
+                                  local:TabView.IgnoreColumn="True" />
+                <!--  5 TabEndHeader  -->
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <ContentPresenter Grid.Row="0"
+                              Grid.ColumnSpan="6"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}" />
+
+            <ContentPresenter Grid.Row="1"
+                              Grid.Column="0"
+                              Content="{TemplateBinding TabStartHeader}"
+                              ContentTemplate="{TemplateBinding TabStartHeaderTemplate}" />
+
+            <ScrollViewer x:Name="ScrollViewer"
+                          Grid.Row="1"
+                          Grid.Column="1"
+                          AutomationProperties.AccessibilityView="Raw"
+                          BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
+                          HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                          HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                          IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                          IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                          IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}"
+                          IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                          IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}"
+                          Style="{StaticResource TabViewScrollViewer}"
+                          TabNavigation="{TemplateBinding TabNavigation}"
+                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                          VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                          ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                <ItemsPresenter x:Name="TabsItemsPresenter"
+                                Padding="{TemplateBinding Padding}" />
+            </ScrollViewer>
+
+            <ContentPresenter Grid.Row="1"
+                              Grid.Column="3"
+                              HorizontalAlignment="Left"
+                              Content="{TemplateBinding TabActionHeader}"
+                              ContentTemplate="{TemplateBinding TabActionHeaderTemplate}" />
+
+            <ContentPresenter Grid.Row="1"
+                              Grid.Column="5"
+                              Content="{TemplateBinding TabEndHeader}"
+                              ContentTemplate="{TemplateBinding TabEndHeaderTemplate}" />
+
+            <ContentPresenter x:Name="TabContentPresenter"
+                              Grid.Row="2"
+                              Grid.ColumnSpan="6"
+                              Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}" />
+
+            <ContentPresenter Grid.Row="3"
+                              Grid.ColumnSpan="6"
+                              Content="{TemplateBinding Footer}"
+                              ContentTemplate="{TemplateBinding FooterTemplate}" />
+        </Grid>
+    </ControlTemplate>
+
+    <!--  Based on Style for ListViewItemExpanded Template - https://msdn.microsoft.com/en-us/library/windows/apps/mt299136.aspx  -->
+    <ControlTemplate x:Key="TabViewItemHeaderTemplate"
+                     TargetType="local:TabViewItem">
+        <Grid x:Name="LayoutRoot"
+              ex:FrameworkElementExtensions.AncestorType="local:TabView"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Control.IsTemplateFocusTarget="True"
+              FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+              RenderTransformOrigin="0.5,0.5">
+            <Grid.RenderTransform>
+                <ScaleTransform x:Name="LayoutRootScale" />
+            </Grid.RenderTransform>
+            <Rectangle x:Name="SelectionIndicator"
+                       Height="2"
+                       Margin="0,-1"
+                       VerticalAlignment="Top"
+                       Fill="{ThemeResource TabViewSelectionIndicatorForeground}"
+                       Opacity="0" />
+
+            <Grid Padding="{TemplateBinding Padding}">
+                <Grid x:Name="ContentPresenterGrid">
+                    <Grid.RenderTransform>
+                        <TranslateTransform x:Name="ContentPresenterTranslateTransform" />
+                    </Grid.RenderTransform>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <!--  Modifications of default ListViewItem Template for our Tab Here  -->
+                    <Viewbox x:Name="IconBox"
+                             MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
+                             MaxHeight="{ThemeResource TabViewItemHeaderIconSize}"
+                             Margin="{ThemeResource TabViewItemHeaderIconMargin}"
+                             Visibility="{Binding Icon, Converter={StaticResource NullVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+                        <ContentPresenter x:Name="Icon"
+                                          Content="{TemplateBinding Icon}"
+                                          Foreground="{TemplateBinding Foreground}" />
+                    </Viewbox>
+                    <ContentPresenter x:Name="ContentPresenter"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      Content="{TemplateBinding Header}"
+                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                      ContentTransitions="{TemplateBinding ContentTransitions}"
+                                      FontWeight="{TemplateBinding FontWeight}"
+                                      OpticalMarginAlignment="TrimSideBearings" />
+                    <!--  Use grid to toggle visibility based on IsClosable property and inner border for hover animations.  -->
+                    <Border x:Name="CloseButtonContainer"
+                            Grid.Column="2"
+                            Width="{Binding (ex:FrameworkElementExtensions.Ancestor).IsCloseButtonOverlay, Converter={StaticResource CloseCollapsingSizeConverter}, ElementName=LayoutRoot}"
+                            HorizontalAlignment="Right"
+                            Visibility="{Binding IsClosable, Converter={StaticResource BoolToVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Border x:Name="CloseButtonBorder"
+                                Width="{StaticResource TabViewItemHeaderCloseWidth}"
+                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
+                                Background="{TemplateBinding Background}"
+                                Visibility="Collapsed">
+                            <Button x:Name="CloseButton"
+                                    x:Uid="/Microsoft.Toolkit.Uwp.UI.Controls/Resources/WindowsCommunityToolkit_TabView_CloseButton"
+                                    Style="{StaticResource TabViewItemCloseButtonStyle}">
+                                &#xE711;
+                            </Button>
+                        </Border>
+                    </Border>
+                </Grid>
+            </Grid>
+
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+
+                    <VisualState x:Name="PointerOver">
+                        <VisualState.Setters>
+                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
+                        </VisualState.Setters>
+
+                        <Storyboard>
+                            <!--  Close Button  -->
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="Visible" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="Pressed">
+                        <VisualState.Setters>
+                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPressed}" />
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
+                            <Setter Target="SelectionIndicator.Opacity" Value="0.4" />
+                        </VisualState.Setters>
+                    </VisualState>
+
+                    <VisualState x:Name="Selected">
+                        <VisualState.Setters>
+                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
+                        </VisualState.Setters>
+
+                        <Storyboard>
+                            <!--  Selected Bar  -->
+                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="0" />
+
+                            <!--  Close Button  -->
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="Visible" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="PointerOverSelected">
+                        <VisualState.Setters>
+                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
+                        </VisualState.Setters>
+
+                        <Storyboard>
+                            <!--  Selected Bar  -->
+                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="0" />
+
+                            <!--  Close Button  -->
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="Visible" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="PressedSelected">
+                        <VisualState.Setters>
+                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
+                        </VisualState.Setters>
+
+                        <Storyboard>
+                            <!--  Selected Bar  -->
+                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="1"
+                                             Duration="0" />
+
+                            <!--  Close Button  -->
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
+                                                           Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="Visible" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+
+                <VisualStateGroup x:Name="DisabledStates">
+                    <VisualState x:Name="Enabled" />
+
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
+                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+
+                <VisualStateGroup x:Name="DataVirtualizationStates">
+                    <VisualState x:Name="DataAvailable" />
+
+                    <VisualState x:Name="DataPlaceholder" />
+                </VisualStateGroup>
+
+                <VisualStateGroup x:Name="ReorderHintStates">
+                    <VisualState x:Name="NoReorderHint" />
+
+                    <VisualState x:Name="BottomReorderHint">
+                        <Storyboard>
+                            <DragOverThemeAnimation Direction="Bottom"
+                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                                    TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="TopReorderHint">
+                        <Storyboard>
+                            <DragOverThemeAnimation Direction="Top"
+                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                                    TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="RightReorderHint">
+                        <Storyboard>
+                            <DragOverThemeAnimation Direction="Right"
+                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                                    TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="LeftReorderHint">
+                        <Storyboard>
+                            <DragOverThemeAnimation Direction="Left"
+                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
+                                                    TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualStateGroup.Transitions>
+                        <VisualTransition GeneratedDuration="0:0:0.2"
+                                          To="NoReorderHint" />
+                    </VisualStateGroup.Transitions>
+                </VisualStateGroup>
+
+                <VisualStateGroup x:Name="DragStates">
+                    <VisualState x:Name="NotDragging" />
+
+                    <VisualState x:Name="Dragging">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="{ThemeResource ListViewItemDragThemeOpacity}"
+                                             Duration="0" />
+                            <DragItemThemeAnimation TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="DraggingTarget" />
+
+                    <VisualState x:Name="MultipleDraggingPrimary" />
+
+                    <VisualState x:Name="MultipleDraggingSecondary" />
+
+                    <VisualState x:Name="DraggedPlaceholder" />
+
+                    <VisualState x:Name="Reordering">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="{ThemeResource ListViewItemReorderThemeOpacity}"
+                                             Duration="0:0:0.240" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="ReorderingTarget">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
+                                             Duration="0:0:0.240" />
+                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
+                                             Storyboard.TargetProperty="ScaleX"
+                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
+                                             Duration="0:0:0.240" />
+                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
+                                             Storyboard.TargetProperty="ScaleY"
+                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
+                                             Duration="0:0:0.240" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="MultipleReorderingPrimary" />
+
+                    <VisualState x:Name="ReorderedPlaceholder">
+                        <Storyboard>
+                            <FadeOutThemeAnimation TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="DragOver">
+                        <Storyboard>
+                            <DropTargetItemThemeAnimation TargetName="LayoutRoot" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualStateGroup.Transitions>
+                        <VisualTransition GeneratedDuration="0:0:0.2"
+                                          To="NotDragging" />
+                    </VisualStateGroup.Transitions>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+        </Grid>
+    </ControlTemplate>
+
+    <!--  Based on Style for Windows.UI.Xaml.Controls.ListViewItem  -->
+    <Style TargetType="local:TabViewItem">
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TabViewItemHeaderBorderThickness}" />
+        <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource TabViewItemHeaderForeground}" />
+        <Setter Property="Margin" Value="{ThemeResource TabViewItemHeaderMargin}" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="IsHoldingEnabled" Value="True" />
+        <Setter Property="Padding" Value="14,0" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="MinWidth" Value="{ThemeResource TabViewItemHeaderMinWidth}" />
+        <Setter Property="MinHeight" Value="{ThemeResource TabViewItemHeaderMinHeight}" />
+        <Setter Property="MaxWidth" Value="{ThemeResource TabViewItemHeaderMaxWidth}" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="FocusVisualMargin" Value="0" />
+        <Setter Property="IsClosable" Value="False" />
+        <Setter Property="Template" Value="{StaticResource TabViewItemHeaderTemplate}" />
+    </Style>
+
+    <Style x:Key="TabViewItemCloseButtonStyle"
+           TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumHighBrush}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Margin" Value="6,0,6,0" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid"
+                          Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ButtonPointerOverForegroundThemeBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                   Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>-->
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlDisabledTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TabViewScrollViewer"
+           TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollMode" Value="Auto" />
+        <Setter Property="VerticalScrollMode" Value="Auto" />
+        <Setter Property="IsHorizontalRailEnabled" Value="True" />
+        <Setter Property="IsVerticalRailEnabled" Value="True" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="ZoomMode" Value="Disabled" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Visible" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="BorderThickness" Value="1,0,0,0" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ScrollViewer">
+                    <Border x:Name="Root"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <RepeatButton x:Name="ScrollBackButton"
+                                          VerticalAlignment="Stretch"
+                                          Background="Transparent"
+                                          BorderThickness="1"
+                                          Delay="50"
+                                          FontFamily="Segoe MDL2 Assets"
+                                          Interval="100"
+                                          Style="{StaticResource RepeatButtonRevealStyle}"
+                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                                &#xE76B;
+                            </RepeatButton>
+
+                            <ScrollContentPresenter x:Name="ScrollContentPresenter"
+                                                    Grid.Column="1"
+                                                    TabFocusNavigation="Once"
+                                                    Margin="{TemplateBinding Padding}" />
+
+                            <RepeatButton x:Name="ScrollForwardButton"
+                                          Grid.Column="2"
+                                          VerticalAlignment="Stretch"
+                                          Background="Transparent"
+                                          BorderThickness="1"
+                                          Delay="50"
+                                          FontFamily="Segoe MDL2 Assets"
+                                          Interval="100"
+                                          Style="{StaticResource RepeatButtonRevealStyle}"
+                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                                &#xE76C;
+                            </RepeatButton>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
new file mode 100644
index 00000000000..3ce0f3e5483
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
@@ -0,0 +1,79 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Item Container for a <see cref="TabView"/>.
+    /// </summary>
+    public partial class TabViewItem
+    {
+        /// <summary>
+        /// Gets or sets the header content for the tab.
+        /// </summary>
+        public object Header
+        {
+            get { return (object)GetValue(HeaderProperty); }
+            set { SetValue(HeaderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Header"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="Header"/> dependency property.</returns>
+        public static readonly DependencyProperty HeaderProperty =
+            DependencyProperty.Register(nameof(Header), typeof(object), typeof(TabViewItem), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the icon to appear in the tab header.
+        /// </summary>
+        public IconElement Icon
+        {
+            get { return (IconElement)GetValue(IconProperty); }
+            set { SetValue(IconProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Icon"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="Icon"/> dependency property.</returns>
+        public static readonly DependencyProperty IconProperty =
+            DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(TabViewItem), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the template to override for the tab header.
+        /// </summary>
+        public DataTemplate HeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
+            set { SetValue(HeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="HeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty HeaderTemplateProperty =
+            DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(TabViewItem), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the tab can be closed by the user with the close button.
+        /// </summary>
+        public bool IsClosable
+        {
+            get { return (bool)GetValue(IsClosableProperty); }
+            set { SetValue(IsClosableProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IsClosable"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="IsClosable"/> dependency property.</returns>
+        public static readonly DependencyProperty IsClosableProperty =
+            DependencyProperty.Register(nameof(IsClosable), typeof(bool), typeof(TabViewItem), new PropertyMetadata(null));
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
new file mode 100644
index 00000000000..69a968fd839
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
@@ -0,0 +1,116 @@
+// 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 Windows.Devices.Input;
+using Windows.System;
+using Windows.UI.Core;
+using Windows.UI.Input;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Input;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Item Container for a <see cref="TabView"/>.
+    /// </summary>
+    [TemplatePart(Name = TabCloseButtonName, Type = typeof(ButtonBase))]
+    public partial class TabViewItem : ListViewItem
+    {
+        private const string TabCloseButtonName = "CloseButton";
+
+        private ButtonBase _tabCloseButton;
+
+        private bool _isMiddleClick;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TabViewItem"/> class.
+        /// </summary>
+        public TabViewItem()
+        {
+            DefaultStyleKey = typeof(TabViewItem);
+        }
+
+        /// <summary>
+        /// Fired when the Tab's close button is clicked.
+        /// </summary>
+        public event EventHandler<TabClosingEventArgs> Closing;
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            if (_tabCloseButton != null)
+            {
+                _tabCloseButton.Click -= TabCloseButton_Click;
+            }
+
+            _tabCloseButton = GetTemplateChild(TabCloseButtonName) as ButtonBase;
+
+            if (_tabCloseButton != null)
+            {
+                _tabCloseButton.Click += TabCloseButton_Click;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerPressed(PointerRoutedEventArgs e)
+        {
+            _isMiddleClick = false;
+
+            if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
+            {
+                PointerPoint pointerPoint = e.GetCurrentPoint(this);
+
+                // Record if middle button is pressed
+                if (pointerPoint.Properties.IsMiddleButtonPressed)
+                {
+                    _isMiddleClick = true;
+                }
+
+                // Disable unwanted behaviour inherited by ListViewItem:
+                // Disable "Ctrl + Left click" to deselect tab
+                // Or variant like "Ctrl + Shift + Left click"
+                // Or "Ctrl + Alt + Left click"
+                if (pointerPoint.Properties.IsLeftButtonPressed)
+                {
+                    var ctrl = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control);
+                    if (ctrl.HasFlag(CoreVirtualKeyStates.Down))
+                    {
+                        // return here so the event won't be picked up by the base class
+                        // but keep this event unhandled so it can be picked up further
+                        return;
+                    }
+                }
+            }
+
+            base.OnPointerPressed(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerReleased(PointerRoutedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            // Close on Middle-Click
+            if (_isMiddleClick)
+            {
+                TabCloseButton_Click(this, null);
+            }
+
+            _isMiddleClick = false;
+        }
+
+        private void TabCloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (IsClosable)
+            {
+                Closing?.Invoke(this, new TabClosingEventArgs(Content, this));
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
new file mode 100644
index 00000000000..65b1ce03844
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
@@ -0,0 +1,36 @@
+// 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 Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Possible modes for how to layout a <see cref="TabViewItem"/> Header's Width in the <see cref="TabView"/>.
+    /// </summary>
+    public enum TabWidthMode
+    {
+        /// <summary>
+        /// Each tab header takes up as much space as it needs.  This is similar to how WPF and Visual Studio Code behave.
+        /// Suggest to keep <see cref="TabView.IsCloseButtonOverlay"/> set to false.
+        /// <see cref="TabView.SelectedTabWidth"/> is ignored.
+        /// In this scenario, tab width behavior is effectively turned off.  This can be useful when using custom styling or a custom panel for layout of <see cref="TabViewItem"/> as well.
+        /// </summary>
+        Actual,
+
+        /// <summary>
+        /// Each tab header will use the minimal space set by <see cref="FrameworkElement.MinWidth"/> on the <see cref="TabViewItem"/>.
+        /// Suggest to set the <see cref="TabView.SelectedTabWidth"/> to show more content for the selected item.
+        /// </summary>
+        Compact,
+
+        /// <summary>
+        /// Each tab header will fill to fit the available space.  If <see cref="TabView.SelectedTabWidth"/> is set, that will be used as a Maximum Width.
+        /// This is similar to how Microsoft Edge behaves when used with the <see cref="TabView.SelectedTabWidth"/>.
+        /// Suggest to set <see cref="TabView.IsCloseButtonOverlay"/> to true.
+        /// Suggest to set <see cref="TabView.SelectedTabWidth"/> to 200 and the TabViewItemHeaderMinWidth Resource to 90.
+        /// </summary>
+        Equal,
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 9c17a3717bd..592fbb45626 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -9,6 +9,7 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
@@ -26,6 +27,7 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
index cdc4af642c5..6799439d67a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
@@ -181,6 +181,13 @@ public class TileControl : ContentControl
         /// </summary>
         public event EventHandler ImageLoaded;
 
+        /// <summary>
+        /// Gets a value indicating whether the platform supports Composition.
+        /// </summary>
+        [Obsolete("This property is now obsolete and will be removed in a future version of the Toolkit.")]
+        public static bool IsCompositionSupported => !DesignTimeHelpers.IsRunningInLegacyDesignerMode &&
+                                                     ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TileControl"/> class.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index 27fe2b2f0bc..e2bc71350ef 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -13,6 +13,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
@@ -32,6 +33,8 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabViewItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index a39030a11a4..5e81855f128 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -86,6 +86,14 @@ public static bool IsDecimal(this string str)
         /// <returns><c>true</c> if the string contains only letters; otherwise, <c>false</c>.</returns>
         public static bool IsCharacterString(this string str) => Regex.IsMatch(str, CharactersRegex);
 
+        /// <summary>
+        /// Returns a string representation of an object.
+        /// </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) => value?.ToString();
+
         /// <summary>
         /// Returns a string with HTML comments, scripts, styles, and tags removed.
         /// </summary>

From 75da45cb656323cdf2a06c4e7d2e27e379f6b7c0 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 19 Aug 2020 19:41:50 -0700
Subject: [PATCH 409/595] Removed TabView/TabViewItem, HeaderedTextBlock, and
 some other smaller methods marked as Obsolete.

---
 .../Services/LinkedIn/LinkedInDataProvider.cs |  11 -
 .../Services/LinkedIn/LinkedInService.cs      |   9 -
 .../Services/Twitter/TwitterDataProvider.cs   |  11 -
 .../Services/Twitter/TwitterService.cs        |   9 -
 .../Services/Weibo/WeiboDataProvider.cs       |  11 -
 .../Services/Weibo/WeiboService.cs            |   9 -
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  21 -
 .../HeaderedTextBlock/HeaderedTextBlock.png   | Bin 3308 -> 0 bytes
 .../HeaderedTextBlockCode.bind                |  16 -
 .../HeaderedTextBlockPage.xaml                |   9 -
 .../HeaderedTextBlockPage.xaml.cs             |  18 -
 .../SamplePages/TabView/TabView.png           | Bin 1392 -> 0 bytes
 .../SamplePages/TabView/TabViewPage.xaml      |  19 -
 .../SamplePages/TabView/TabViewPage.xaml.cs   |  73 --
 .../SamplePages/TabView/TabViewXaml.bind      |  97 ---
 .../SamplePages/samples.json                  |  24 -
 .../ConnectedAnimations/Connected.cs          |  16 -
 .../HeaderedTextBlockMetadata.cs              |  49 --
 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj |   3 -
 .../TabViewItemMetadata.cs                    |  43 -
 .../TabViewMetadata.cs                        |  54 --
 .../HeaderedTextBlock.Properties.cs           | 172 ----
 .../HeaderedTextBlock/HeaderedTextBlock.cs    |  76 --
 .../HeaderedTextBlock/HeaderedTextBlock.xaml  |  60 --
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   1 -
 ...Toolkit.Uwp.UI.Controls.csproj.DotSettings |   1 -
 .../Strings/en-US/Resources.resw              |   8 -
 .../TabView/TabClosingEventArgs.cs            |  36 -
 .../TabView/TabDraggedOutsideEventArgs.cs     |  35 -
 .../TabView/TabView.HeaderLayout.cs           | 221 ------
 .../TabView/TabView.ItemSources.cs            | 115 ---
 .../TabView/TabView.Properties.cs             | 245 ------
 .../TabView/TabView.cs                        | 320 --------
 .../TabView/TabView.xaml                      | 736 ------------------
 .../TabView/TabViewItem.Properties.cs         |  79 --
 .../TabView/TabViewItem.cs                    | 116 ---
 .../TabView/TabWidthMode.cs                   |  36 -
 .../Themes/Generic.xaml                       |   2 -
 .../TileControl/TileControl.cs                |   7 -
 .../VisualStudioToolsManifest.xml             |   3 -
 .../Extensions/StringExtensions.cs            |   8 -
 41 files changed, 2779 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs

diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
index f852688bc57..27c7739c333 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs
@@ -154,17 +154,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of LinkedIn.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
index 251e5fb711d..7a79b8fc344 100644
--- a/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
+++ b/Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs
@@ -92,15 +92,6 @@ public Task<LinkedInShareResponse> ShareActivityAsync(LinkedInShareRequest share
             return Provider.ShareDataAsync<LinkedInShareRequest, LinkedInShareResponse>(shareRequest);
         }
 
-        /// <summary>
-        /// Log user out of LinkedIn.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of LinkedIn.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
index a6eda59f07e..41db01d748b 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs
@@ -273,17 +273,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of Twitter.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
index 703657cf2fb..b461458ce8d 100644
--- a/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
+++ b/Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs
@@ -400,15 +400,6 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
-        /// <summary>
-        /// Log user out of Twitter.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of Twitter.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
index 3dd6d59a8ac..6975a33d005 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs
@@ -163,17 +163,6 @@ public async Task<bool> LoginAsync()
             return false;
         }
 
-        /// <summary>
-        /// Log user out of Weibo.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            LogoutAsync();
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
index f5f8dd7ec99..ea2f6cea3b1 100644
--- a/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
+++ b/Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs
@@ -183,15 +183,6 @@ public Task<bool> LoginAsync()
             return Provider.LoginAsync();
         }
 
-        /// <summary>
-        /// Log user out of Weibo.
-        /// </summary>
-        [Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
-        public void Logout()
-        {
-            Provider.Logout();
-        }
-
         /// <summary>
         /// Log user out of Weibo.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 51c0fd428b1..5476e2d5c12 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -280,7 +280,6 @@
     <Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
     <Content Include="SamplePages\ImageCropper\ImageCropper.png" />
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.png" />
-    <Content Include="SamplePages\TabView\TabView.png" />
     <Content Include="SamplePages\PeoplePicker\PeoplePicker.png" />
     <Content Include="SamplePages\PersonView\PersonView.png" />
     <Content Include="SamplePages\TokenizingTextBox\TokenizingTextBox.png" />
@@ -317,7 +316,6 @@
     <Content Include="SamplePages\AlignmentGrid\AlignmentGrid.png" />
     <Content Include="SamplePages\HeaderedContentControl\HeaderedContentControl.png" />
     <Content Include="SamplePages\HeaderedItemsControl\HeaderedItemsControl.png" />
-    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlock.png" />
     <Content Include="SamplePages\ImageBlendBrush\ImageBlendBrush.png" />
     <Content Include="SamplePages\ImageCache\ImageCache.png" />
     <Content Include="SamplePages\ImageEx\ImageEx.png" />
@@ -367,8 +365,6 @@
     <Content Include="SamplePages\Twitter Service\TwitterLogo.png" />
     <Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
     <Content Include="SamplePages\Twitter Service\icon.png" />
-    <Content Include="SamplePages\Facebook Service\FacebookCode.bind" />
-    <Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockCode.bind" />
     <Content Include="SamplePages\ViewExtensions\ViewExtensions.png" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehavior.png" />
     <Content Include="SamplePages\Visual Extensions\VisualExtensions.png" />
@@ -511,9 +507,6 @@
     <Content Include="SamplePages\RemoteDevicePicker\RemoteDevicePickerCode.bind" />
     <Content Include="SamplePages\DataGrid\DataGridCode.bind" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
-    <Content Include="SamplePages\TabView\TabViewXaml.bind">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -655,9 +648,6 @@
     <Compile Include="Models\LandingPageResource.cs" />
     <Compile Include="Models\LandingPageLink.cs" />
     <Compile Include="Models\PaneState.cs" />
-    <Compile Include="SamplePages\TabView\TabViewPage.xaml.cs">
-      <DependentUpon>TabViewPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
       <DependentUpon>UniformGridPage.xaml</DependentUpon>
     </Compile>
@@ -920,9 +910,6 @@
     <Compile Include="SamplePages\Fade\FadeBehaviorPage.xaml.cs">
       <DependentUpon>FadeBehaviorPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs">
-      <DependentUpon>HeaderedTextBlockPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\ImageEx\ImageExPage.xaml.cs">
       <DependentUpon>ImageExPage.xaml</DependentUpon>
     </Compile>
@@ -1055,10 +1042,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\TabView\TabViewPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1423,10 +1406,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SamplePages\ImageEx\ImageExPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png
deleted file mode 100644
index 4b495ab237ab617b406082956fa4df6764313695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3308
zcmeH~**6=C7RE!&Lrtfps8CaTYN&%!Eipt@kydpu#nhIVrIa2af{KI|HIy1^o|V#|
z#&Ag0P%+Q5LyRdWGMKM*|AV{MeYg*Iul3t|KYb71!?)MQJ%F0<^N8~R004f|yO4(f
z0E_h5-p0jo)(gJ0)}0MDe?!wpTxS)+^&ATT@a3CA3?9AC+@AHtO42TM?bZ_&pUMlc
zio3@h=)1=x=nuF=iKt-~BC$pCwht0Cu3TMhXMf{l43ZNQdh@pd#4?YK4<7#{Qs%v&
zNJ02z+c(#+inVx`d(WiV)qW1^G5f#xfBlMVN}WBVc+aU?)91JPe1ih@s2RWdDE7b#
zlSE;AJNxYW-cbeRgJqx>_4-4jy@15z@Bekg<CNPPre2t>?02C>h|5THccD*?22UmI
zbwaK!FtbuOkn44;^MrC+yHxb07glX%DTmXso0g#<B)qoTv7B>K@Er)LZ}tm=>AKK_
z_H^FFNs$+~FeR`+fi;hS+{J1mv$>dEhK3*Li%OHsMxWHc&@J9AHrLq0X!JNWUA->Q
znfdlMQvc@MHI?3WDt^4UUz4w%B~1e5uL1q8hE_l~;aq%e>^`#VvFhc7%Ghwv7*r@L
zhJQ{WpJT}ef>=`}iZr>sIHZ&uz`T;|sI{TiD4t&y#`F9{8n83{k`t!HGi2`iI~ruL
zRg!dd;dp7c2%&21x2Nuyt`}+5ww!`E#?htvT^FoVZzQ)jB&~d974ys&)1S5pu?!S`
z%`#z)41pmg*|#|6DsKk~Y$M0Zyu+<0vYk;}7A(I4)B1B}d2c^OdU+yBIe)}qoVA8d
zJ}MQW$h|C61fT?tbfn~WYdf2YO7F0i^~&_n7ip7FYR+ka?6DnGr;JUB=8f-pWiNjd
zrs<ak=e$H7vv#;z_k}dv-Fvw4sRWh^WvNoC3-3{fvIKyC!u}cUoT~O{e0eBbO`qkP
zvE>W%?C_MTm_dDWw(Y>D!pG|{WJ>wWC!g0SyWJ^%ev)z&u|Ji8bt;{@ySKC9To=D;
z@%-I41W!)12g42isvBIQTmOEI2*_kR;j-sEN-qI7-z^_|Sf&CA(lifK6|(nqcl4_q
z`M7lOyu<%R)03fAr~XF{>L&e^6Jo#UnQl2_Cr~|1BtSDu0Iih$^+f&hoobE|())qO
zw5Y0z_W>_~gQMA(Zxjcw4^}8S4C8Mi(yVzM6?j_BVE*npZM%o^K1NCZmYOsp|Ln1G
zS;>9jkr}KXTaCFQ_q4-JqPk(|Q6${<hgtqN?k_IkhrR7I*e5&AqmWYZy!NIk;M&~O
zu~DZ&Zwlo@D}~1qe8tZFd|>g~997JC(|!K8$_xdb*_Is>f~;#MYl*`^Cc9MbV`~SC
z-@pvfdNMkD#KB*E_r)i+Pg{R{F0#G1@5wM-7(|KdNoN^S#Slkk#|hzuHEH{-YM>3x
zoJq{Cx12{%3-b*<OyNP^nT<gnjBz2}*?IS4`R{70RhERZ7T0HLM~VSe+?wYj1uhI*
zuhn+owcHzLm0Vi^w~Y_UOr7m0Pb`c{oBP@4B3@po31!(+u2#r`!P{b%VVGZaU297D
z4PQV-)CjHNl?G?qzL0hNI!!H$u{w&ZsG_Us%3mx7L`<|CUduz<pC<NSh<_Yk*l<^J
z<O%FLL&SJ3Dy}T_-9&OpYhY0tor03klTO9S)&&je{N_{#C#joyN1Uvh4Ht<*7E+O2
z>4EvaiW~NYHy5BTs3#r1985Qm_qZU;sKUG7O$%Z)z9*r9we7n?X&+|VY5M3&6T_3O
z@aNVtu24X5F}ffoUU(8H4z>tO8SHjFVk!P-0@xU{P291pu{^qp!H`Zn2Jc=+e<%4Y
zxb>ZavuqZumUhBP@NJ94hc>{(WTJRN!EKI&0*(KaWpRBwEI|R5G@Bqlu;&m2P=p_=
z;x!WQ$e<OlQEPzDBBNQd7jnGFSn!{Ya4{18=DheSsTZ1B?#!O6QgbSVkoPP27Mjc~
ze}MHbpMO7;x4UDD=zbYK*34$je%s_ofVMy77m3GdE7O;OQdJnaTWBc-C;_R6;P_cq
zpW1p;JR!F4l(eo10c7P;Z*Flq$7r|IeZXy5e90Ch7nMcF7nJJ<0z&T}{dw?Qpo5az
zAZ0Zsp)=|{He9BfCC!5u39ZM6d7_KmM{k`Qu%}LR9vwU_UQ|GLVHtjL+5#cPjOJ)M
zH8LfBw96mOe4AcWA4y;5Z)_vfIO}A1Y-<}(o5ALrR2`GecxEqYXle%AdoCv^W>YII
z%;A?ogJ>E@oQUG$EkiG!<{y4W@EC3We|VOTcH;$|k?H%qlnV>W3%xFB-b5;A8iCU@
z4^A~BBCpK%8W9UYB!CtRp~~FXF?wBB3%&kI-R3PrWl55f5l#@yHoYj78cW_Fqvj30
zd|LQIfL_x5hfo9(xU&nGE|d9D$r5Td66OGyV}}Yk2L$Rb6Jo8KJ`{saB$;u{2oNWf
zem!ox4@~@NsDO6EMXj#%EW3qggwG4*a{1xt2jlDuVwP`Ir-Q&>QmjkLG?T%@Vb%NB
zR>#MC)@O~%eXO8WsMQgoc~yoYZr?K71i%?C5ZiTMIAh~JAWU9wSrKO#v_JV%NXBt)
z?2m+5U<8v@7rF<Kj(`h9uIDxz95#^d3zNHT$CtICLXLaT)W+#p1Yvk*=CCsY=55w;
zLVJM-g{@RaV{4J2?Tz+tzk<3v8NKW$A292qq|C;&^;b2CTy$AHDPNsPyMHbI62M39
zuig4ix5e)BsSR6F4@M`KYPctiE8NRHzZ2K+84N2IYKiD+-l6ER)Aq^PSyI%E3*+~b
z_^e}Y<?AVn_^aJuE#To_8)UT~>#rW7puRNiBjbfvd1Ncf&Cx%!?y)@5;XaCA<DRwf
z%`iQ-H7IY=Q<4Z4bLF&j`<VN<YQo%0coZi7peeZa(eU)0Hz7&B9t>5%MRl_f6MWx0
z7l1)IM*wVlH{(!}6fYr_A$=o~PM<E3f|c0^-D=LceZy6PYE<Vw?Ehg+Mw8aLkv*8h
zhYTJ?Zx*_KO)UAmEq6nxIGoHmazVbklEpi3pK))+XJSKPgn+Y%JWx60Y<x>_*Yf%^
zdFvyF%(3`&=|D^Ooa4NCGr>76UjtNm-Bfb_7JS8_*ctlEF0Yk-rDgQ62p2(%?sRC{
z?wf}RSUMGV?Ygr)XP}F);%%sf&82EPtoQ&Qm4V5U3FcE3jOyiW3k?8c;Ov$IDo8Pc
z()X6s#qFyNcPk3d@)d06<uY^UNNy2ijO<zXSVTin*eZR+$RIQ)F7H4n4@2X1Sv*dj
z<K1WpPGWjR>$Ze;=5kjF5w}&b4wQGD<OdYQG=#06BTqrwB*ZOHDBN+Zw)I+NHmlz6
zKI6RW;xd!EIY5Y5h5UtyNJ!3>T-?*rblDAA!Q5H_rU2r)tzwn1C(#X;J~ZVr({YkD
zg6wo?IS;YBKdggVja@ppyo)+9+dMu3G!I>GjqOxfi^o0-hl(_<7hmjWt$Q?_A#1qe
z+u01Zc++Enk6|X^pFA8*`JO?f1*}vjbu!#VElniGR!cel7I(2bJu(E|i&BPIR}@mE
zG)qOxYmoZ3D2hzX5+=Sfjimr(E`$_}ch!O{%QSI)9>hmYT-<rJQvDA&)OF1vC@I(#
zP}(gD0i>8*GGZe^Z3(2r$~0rRsg07MS<f?o>AnB+zwd#+H=^bD+VhE(_f9!uYP7w2
TO!KSG-WPzWF%(j1=oIlU(~cTl

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
deleted file mode 100644
index a2db4b8dc80..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockCode.bind
+++ /dev/null
@@ -1,16 +0,0 @@
-<Page
-    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:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    mc:Ignorable="d">
-  
-    <Grid>
-        <controls:HeaderedTextBlock 
-            Header="@[Header:String:Name]"
-            Text="@[Text:String:Windows Community Toolkit]"
-            Orientation="@[Orientation:Enum:Orientation.Vertical]"
-            Margin="20,10,0,0" />
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
deleted file mode 100644
index a5795898a0e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.HeaderedTextBlockPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
deleted file mode 100644
index 77cdba59f3e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock/HeaderedTextBlockPage.xaml.cs
+++ /dev/null
@@ -1,18 +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 Microsoft.Toolkit.Uwp.SampleApp.Models;
-
-using Windows.UI.Xaml.Navigation;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class HeaderedTextBlockPage
-    {
-        public HeaderedTextBlockPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabView.png
deleted file mode 100644
index 9aeebd1d673de8670b59cb522700c93f1c75b887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1392
zcmeAS@N?(olHy`uVBq!ia0y~yU{nCI4{)#n$t4^1Z39v)>5jgR3=A9lx&I`x0{NT;
z9+AZi3_@Vc*rT+Q9VjSK;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XQ*fNOZn_apgHe6
zT^vIy;@;jkn3<9;(sHr$a7C&>Me2+jB8``VnSxjjMP@u{{Ps+A*_%VZT#Kdr^5tW8
z?PLG@_VH)g2NUMU?`QbaU-$RJ?e_cje?B@kH25n!957^Jks+S?oXJ@AJU_4Ksap8<
z*>{W?tq%CEyYu8#+2m?92lgE&r_PSKn^$z6<pqQJ&Z5byZ~MNxd7b0J<;$0U-@bkO
z&C{n(|9<>vX!n@AaI&`f&Rut(%&YBXu(h{8E`O?i>b#Gwa0B+aHT<iRUMhcL|JPr?
zetp)Ri7fety`*7w%+8Zn->QB0Y2Yh>nZ<d55$3SX=Q%GNK74rofm*NG`kVqAJV(jV
z5Eu=Cfe3+GzXk>-My5VNg$EMEQ9q9}FxG6!zhBS5Tj$4m^~aMNz|xVy)78&qol`;+
E0K}H&HUIzs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
deleted file mode 100644
index 32f465f2c64..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TabViewPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Grid>
-        <Grid x:Name="XamlRoot"/>
-        <controls:InAppNotification x:Name="TabViewNotification"
-                                    ShowDismissButton="True"
-                                    AnimationDuration="00:00:00.1000000"
-                                    VerticalOffset="100"
-                                    HorizontalOffset="0"
-                                    StackMode="Replace" />
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
deleted file mode 100644
index 74d9a3db253..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewPage.xaml.cs
+++ /dev/null
@@ -1,73 +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 System.Collections.ObjectModel;
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class TabViewPage : Page, IXamlRenderListener
-    {
-        #pragma warning disable CS0618 // Type or member is obsolete
-        private TabView _tabs;
-
-        private int _counter = 1;
-
-        public TabViewPage()
-        {
-            this.InitializeComponent();
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-            _tabs = control.FindChildByName("Tabs") as TabView;
-            if (_tabs != null)
-            {
-                _tabs.TabDraggedOutside += Tabs_TabDraggedOutside;
-                _tabs.TabClosing += Tabs_TabClosing;
-            }
-
-            var btn = control.FindDescendantByName("AddTabButtonUpper") as Button;
-            if (btn != null)
-            {
-                btn.Click += AddUpperTabClick;
-            }
-        }
-
-        private void AddUpperTabClick(object sender, RoutedEventArgs e)
-        {
-            _tabs.Items.Add(new TabViewItem()
-            {
-                Header = "Untitled " + _counter,
-                Icon = new SymbolIcon(Symbol.Document),
-                Content = "This is new tab #" + _counter++ + "."
-            });
-        }
-
-        private void Tabs_TabClosing(object sender, TabClosingEventArgs e)
-        {
-            TabViewNotification.Show("You're closing the '" + e.Tab.Header + "' tab.", 2000);
-        }
-
-        private void Tabs_TabDraggedOutside(object sender, TabDraggedOutsideEventArgs e)
-        {
-            // The sample app let's you drag items from a static TabView with TabViewItem's pre-defined.
-            // In the case of data bound scenarios e.Item should be your data item, and e.Tab should always be the TabViewItem.
-            var str = e.Item.ToString();
-
-            if (e.Tab != null)
-            {
-                str = e.Tab.Header.ToString();
-            }
-
-            TabViewNotification.Show("Tore Tab '" + str + "' Outside of TabView.", 2000);
-        }
-        #pragma warning restore CS0618 // Type or member is obsolete
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
deleted file mode 100644
index e81732aa2a3..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabView/TabViewXaml.bind
+++ /dev/null
@@ -1,97 +0,0 @@
-<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-      mc:Ignorable="d">
-
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="Auto"/>
-    </Grid.RowDefinitions>
-    <controls:TabView x:Name="Tabs"
-                      TabWidthBehavior="@[Tab Width Behavior:Enum:TabWidthMode.Actual]"
-                      CanCloseTabs="@[Can Close Tabs:Bool:False]"
-                      IsCloseButtonOverlay="@[Overlay Close Button:Bool:False]"
-                      CanDragItems="@[Drag and Drop Enabled:Bool:False]"
-                      CanReorderItems="@[Drag and Drop Enabled]"
-                      AllowDrop="@[Drag and Drop Enabled]"
-                      SelectedTabWidth="200">
-      <controls:TabView.Resources>
-        <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
-        <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
-        <x:Double x:Key="TabViewItemHeaderMaxWidth">200</x:Double>
-      </controls:TabView.Resources>
-      <controls:TabView.Header>
-        <TextBlock Padding="16,8,0,8" FontSize="16" FontWeight="Bold" Text="TabView Control Header"/>
-      </controls:TabView.Header>
-      <controls:TabView.TabStartHeader>
-        <Button Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="0,0,-1,0"
-                BorderThickness="1"
-                Background="Transparent" 
-                Style="{StaticResource ButtonRevealStyle}" 
-                Padding="2,2,0,0">
-          <Viewbox MaxWidth="16" MaxHeight="16">
-            <SymbolIcon Symbol="AddFriend"/>
-          </Viewbox>
-        </Button>
-      </controls:TabView.TabStartHeader>
-
-      <!-- Tabs -->
-      <controls:TabViewItem Header="Home" Icon="Home">
-        <TextBlock Padding="16">The TabView control has multiple uses.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Tab 2 Has Longer Text" Icon="Audio">
-        <TextBlock Padding="16">It has a lot of versitility out of the box for different scenarios.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Tab 3" Icon="Video">
-        <TextBlock Padding="16">You can enable drag-and-drop and reorder the tabs too.</TextBlock>
-      </controls:TabViewItem>
-      <controls:TabViewItem Header="Not Closable" Icon="Calendar" IsClosable="False">
-        <TextBlock Padding="16">This tab isn't closable because its IsClosable property is set to False, even when CanCloseTabs is True.</TextBlock>
-      </controls:TabViewItem>
-
-      <controls:TabView.TabActionHeader>
-        <Button x:Name="AddTabButtonUpper"
-                Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="-1,0,0,0"
-                BorderThickness="1"
-                Background="Transparent"
-                Style="{StaticResource ButtonRevealStyle}">
-          <Viewbox MaxWidth="16"
-                    MaxHeight="16">
-            <FontIcon FontFamily="Segoe MDL2 Assets"
-                      Glyph="&#xE710;" />
-          </Viewbox>
-        </Button>
-
-      </controls:TabView.TabActionHeader>
-
-      <controls:TabView.TabEndHeader>
-        <Button Width="48"
-                Height="{StaticResource TabViewItemHeaderMinHeight}"
-                Margin="-1,0,0,0"
-                BorderThickness="1" 
-                Background="Transparent" 
-                Style="{StaticResource ButtonRevealStyle}">
-          <Viewbox MaxWidth="16" MaxHeight="16">
-            <SymbolIcon Symbol="Setting"/>
-          </Viewbox>
-        </Button>
-      </controls:TabView.TabEndHeader>
-
-      <controls:TabView.Footer>
-        <TextBlock Padding="16,8,16,8"
-                   HorizontalAlignment="Right"
-                   FontSize="16" FontWeight="Bold"
-                   Text="TabView Control Footer" />
-      </controls:TabView.Footer>
-    </controls:TabView>
-  </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index f106b270277..2b8f564b7bb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -14,18 +14,6 @@
         "Icon": "/SamplePages/TextToolbar/TextToolbar.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TextToolbar.md"
       },
-      {
-        "Name": "TabView",
-        "Type": "TabViewPage",
-        "Subcategory": "Layout",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui",
-        "About": "A control for displaying multiple items in the same space and allows a user to easily switch between them.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TabView",
-        "XamlCodeFile": "TabViewXaml.bind",
-        "Icon": "/SamplePages/TabView/TabView.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TabView.md"
-      },
       {
         "Name": "DataGrid",
         "Type": "DataGridPage",
@@ -86,18 +74,6 @@
         "Icon": "/SamplePages/ImageEx/ImageEx.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
-      {
-        "Name": "HeaderedTextBlock",
-        "Type": "HeaderedTextBlockPage",
-        "Subcategory": "Layout",
-        "About": "The HeaderedTextBlock control is designed to provide a header for read only text. This control is useful for displaying read only forms.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock",
-        "XamlCodeFile": "HeaderedTextBlockCode.bind",
-        "Icon": "/SamplePages/HeaderedTextBlock/HeaderedTextBlock.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/HeaderedTextBlock.md",
-        "BadgeUpdateVersionRequired": "DEPRECATED",
-        "DeprecatedWarning": "The HeaderedTextBlock has been replaced with the HeaderedContentControl and will be removed in a future major release."
-      },
       {
         "Name": "MasterDetailsView",
         "Type": "MasterDetailsViewPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
index a0e5afa756d..999ea1d40c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
@@ -361,22 +361,6 @@ public static void UnregisterListItemForConnectedAnimation(this Page page, ListV
             }
         }
 
-        /// <summary>
-        /// Sets the object that will be used during next Frame navigation for
-        /// Connected Animation involving a list control (item must be an element of
-        /// ListViewBase.ItemsSource collection).
-        /// Useful if the parameter used during page navigation is different from the
-        /// data item in the list control. Also useful during back navigation if the
-        /// item navigating back to is different from the item that was navigated from.
-        /// </summary>
-        /// <param name="frame">The Frame handling the navigation</param>
-        /// <param name="item">The data item from a list control to be animated during next frame navigation</param>
-        [Obsolete("Method is replaced by SetListDataItemForNextConnectedAnimation")]
-        public static void SetListDataItemForNextConnectedAnnimation(this Frame frame, object item)
-        {
-            GetConnectedAnimationHelper(frame)?.SetParameterForNextFrameNavigation(item);
-        }
-
         /// <summary>
         /// Sets the object that will be used during next Frame navigation for
         /// Connected Animation involving a list control (item must be an element of
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.cs
deleted file mode 100644
index 3cba40e11f1..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/HeaderedTextBlockMetadata.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.
-
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Features;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.Model;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-    internal class HeaderedTextBlockDefaults : DefaultInitializer
-    {
-        public override void InitializeDefaults(ModelItem item)
-        {
-            item.Properties[nameof(HeaderedTextBlock.Header)].SetValue(string.Empty);
-            item.Properties[nameof(HeaderedTextBlock.Text)].SetValue(string.Empty);
-        }
-    }
-    internal class HeaderedTextBlockMetadata : AttributeTableBuilder
-	{
-        public HeaderedTextBlockMetadata()
-			: base()
-		{
-			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock),
-				b =>
-				{
-                    b.AddCustomAttributes(new FeatureAttribute(typeof(HeaderedTextBlockDefaults)));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.TextStyle),
-                        new CategoryAttribute(Properties.Resources.CategoryAppearance),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Header), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Text), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.Orientation), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(HeaderedTextBlock.HideTextIfEmpty), new CategoryAttribute(Properties.Resources.CategoryAppearance));
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-				}
-			);
-		}
-	}
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
index b611399dd13..b7b241a6403 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
@@ -85,7 +85,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TabViewItemMetadata.cs" />
     <Compile Include="BladeItemMetadata.cs" />
     <Compile Include="BladeViewMetadata.cs" />
     <Compile Include="CarouselMetadata.cs" />
@@ -93,7 +92,6 @@
     <Compile Include="AdaptiveGridViewMetadata.cs" />
     <Compile Include="ExpanderMetadata.cs" />
     <Compile Include="GridSplitterMetadata.cs" />
-    <Compile Include="HeaderedTextBlockMetadata.cs" />
     <Compile Include="ImageExMetadata.cs" />
     <Compile Include="InAppNotificationMetadata.cs" />
     <Compile Include="LayoutTransitionControlMetadata.cs" />
@@ -105,7 +103,6 @@
     <Compile Include="MetadataRegistration.cs" />
     <Compile Include="Common\MetadataRegistrationBase.cs" />
     <Compile Include="Common\PlatformTypes.cs" />
-    <Compile Include="TabViewMetadata.cs" />
     <Compile Include="OrbitViewMetadata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
deleted file mode 100644
index 6ed6bc37bf8..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewItemMetadata.cs
+++ /dev/null
@@ -1,43 +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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Features;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.Model;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-
-	internal class TabViewItemMetadata : AttributeTableBuilder
-	{
-		public TabViewItemMetadata()
-			: base()
-		{
-            AddCallback(typeof(TabViewItem),
-                b =>
-                {
-                    b.AddCustomAttributes(nameof(TabViewItem.Header),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-                    b.AddCustomAttributes(nameof(TabViewItem.HeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabViewItem.IsClosable),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-                    b.AddCustomAttributes(nameof(TabViewItem.Icon),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon)
-                        );
-
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-                }
-            );
-		}
-	}
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
deleted file mode 100644
index 7bfa77541db..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TabViewMetadata.cs
+++ /dev/null
@@ -1,54 +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 Microsoft.Toolkit.Uwp.UI.Controls.Design.Common;
-using Microsoft.Windows.Design;
-using Microsoft.Windows.Design.Metadata;
-using Microsoft.Windows.Design.PropertyEditing;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-	internal class TabViewMetadata : AttributeTableBuilder
-	{
-        public TabViewMetadata()
-			: base()
-		{
-			AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TabView),
-				b =>
-                {
-                    // Layout
-                    b.AddCustomAttributes(nameof(TabView.TabWidthBehavior), new CategoryAttribute(Properties.Resources.CategoryLayout));
-                    b.AddCustomAttributes(nameof(TabView.SelectedTabWidth), new CategoryAttribute(Properties.Resources.CategoryLayout));
-                    b.AddCustomAttributes(nameof(TabView.IsCloseButtonOverlay), new CategoryAttribute(Properties.Resources.CategoryLayout));
-
-                    // Interactions
-                    b.AddCustomAttributes(nameof(TabView.CanCloseTabs), new CategoryAttribute(Properties.Resources.CategoryCommon));
-
-                    // Templates
-                    b.AddCustomAttributes(nameof(TabView.ItemHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabActionHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabActionHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabEndHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabEndHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(nameof(TabView.TabStartHeader), new CategoryAttribute(Properties.Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(TabView.TabStartHeaderTemplate),
-                        new CategoryAttribute(Properties.Resources.CategoryCommon),
-                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
-                    );
-                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-				}
-			);
-		}
-	}
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
deleted file mode 100644
index 7528591fc2b..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.Properties.cs
+++ /dev/null
@@ -1,172 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Defines the properties for the <see cref="HeaderedTextBlock"/> control.
-    /// </summary>
-    public partial class HeaderedTextBlock
-    {
-        /// <summary>
-        /// Defines the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-            nameof(HeaderTemplate),
-            typeof(DataTemplate),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Defines the <see cref="TextStyle"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TextStyleProperty = DependencyProperty.Register(
-            nameof(TextStyle),
-            typeof(Style),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Defines the <see cref="Header"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            nameof(Header),
-            typeof(string),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Defines the <see cref="Text"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            nameof(Text),
-            typeof(string),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(null, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            nameof(Orientation),
-            typeof(Orientation),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(Orientation.Vertical, (d, e) => { ((HeaderedTextBlock)d).UpdateForOrientation((Orientation)e.NewValue); }));
-
-        /// <summary>
-        /// Defines the <see cref="HideTextIfEmpty"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HideTextIfEmptyProperty = DependencyProperty.Register(
-            nameof(HideTextIfEmpty),
-            typeof(bool),
-            typeof(HeaderedTextBlock),
-            new PropertyMetadata(false, (d, e) => { ((HeaderedTextBlock)d).UpdateVisibility(); }));
-
-        /// <summary>
-        /// Gets or sets the header style.
-        /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get
-            {
-                return (DataTemplate)GetValue(HeaderTemplateProperty);
-            }
-
-            set
-            {
-                SetValue(HeaderTemplateProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the text style.
-        /// </summary>
-        public Style TextStyle
-        {
-            get
-            {
-                return (Style)GetValue(TextStyleProperty);
-            }
-
-            set
-            {
-                SetValue(TextStyleProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the header.
-        /// </summary>
-        public string Header
-        {
-            get
-            {
-                return (string)GetValue(HeaderProperty);
-            }
-
-            set
-            {
-                SetValue(HeaderProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the text.
-        /// </summary>
-        public string Text
-        {
-            get
-            {
-                return (string)GetValue(TextProperty);
-            }
-
-            set
-            {
-                SetValue(TextProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets the collection of inline text elements within a Windows.UI.Xaml.Controls.TextBlock.
-        /// </summary>
-        /// <returns>
-        /// A collection that holds all inline text elements from the Windows.UI.Xaml.Controls.TextBlock. The default is an empty collection.</returns>
-        public InlineCollectionWrapper Inlines { get; } = new InlineCollectionWrapper();
-
-        /// <summary>
-        /// Gets or sets the orientation.
-        /// </summary>
-        public Orientation Orientation
-        {
-            get
-            {
-                return (Orientation)GetValue(OrientationProperty);
-            }
-
-            set
-            {
-                SetValue(OrientationProperty, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the Text TextBlock is hidden if its value is empty
-        /// </summary>
-        public bool HideTextIfEmpty
-        {
-            get
-            {
-                return (bool)GetValue(HideTextIfEmptyProperty);
-            }
-
-            set
-            {
-                SetValue(HideTextIfEmptyProperty, value);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
deleted file mode 100644
index b30dfea1d3d..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.cs
+++ /dev/null
@@ -1,76 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Defines a control for providing a header for read-only text.
-    /// </summary>
-    [TemplatePart(Name = "HeaderContentPresenter", Type = typeof(ContentPresenter))]
-    [ContentProperty(Name = nameof(Inlines))]
-    [Obsolete("The HeaderedTextBlock has been replaced with the more generic HeaderedContentControl.")]
-    public partial class HeaderedTextBlock : Control
-    {
-        private ContentPresenter _headerContentPresenter;
-        private TextBlock _textContent;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HeaderedTextBlock"/> class.
-        /// </summary>
-        public HeaderedTextBlock()
-        {
-            DefaultStyleKey = typeof(HeaderedTextBlock);
-        }
-
-        /// <summary>
-        /// Called when applying the control template.
-        /// </summary>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _headerContentPresenter = GetTemplateChild("HeaderContentPresenter") as ContentPresenter;
-            _textContent = GetTemplateChild("TextContent") as TextBlock;
-
-            UpdateVisibility();
-            Inlines.AddItemsToTextBlock(_textContent);
-            UpdateForOrientation(this.Orientation);
-        }
-
-        private void UpdateVisibility()
-        {
-            if (_headerContentPresenter != null)
-            {
-                _headerContentPresenter.Visibility = _headerContentPresenter.Content == null
-                                                     ? Visibility.Collapsed
-                                                     : Visibility.Visible;
-            }
-
-            if (_textContent != null)
-            {
-                _textContent.Visibility = string.IsNullOrWhiteSpace(_textContent.Text) && HideTextIfEmpty
-                                                    ? Visibility.Collapsed
-                                                    : Visibility.Visible;
-            }
-        }
-
-        private void UpdateForOrientation(Orientation orientationValue)
-        {
-            switch (orientationValue)
-            {
-                case Orientation.Vertical:
-                    VisualStateManager.GoToState(this, "Vertical", true);
-                    break;
-                case Orientation.Horizontal:
-                    VisualStateManager.GoToState(this, "Horizontal", true);
-                    break;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
deleted file mode 100644
index 6f94a07ba82..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
-
-    <Style x:Key="HeaderedTextBlockTextStyle"
-           TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
-        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-        <Setter Property="TextWrapping" Value="Wrap" />
-        <Setter Property="TextLineBounds" Value="TrimToBaseline" />
-        <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Light" />
-        <Setter Property="LineHeight" Value="28" />
-    </Style>
-
-    <Style TargetType="controls:HeaderedTextBlock">
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="Orientation" Value="Vertical" />
-        <Setter Property="TextStyle" Value="{ThemeResource HeaderedTextBlockTextStyle}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:HeaderedTextBlock">
-                    <StackPanel x:Name="Panel"
-                                Orientation="{TemplateBinding Orientation}">
-                        <ContentPresenter x:Name="HeaderContentPresenter"
-                                          Grid.ColumnSpan="4"
-                                          x:DeferLoadStrategy="Lazy"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          AutomationProperties.Name="Header content"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-                                          IsHitTestVisible="False"
-                                          Visibility="Collapsed" />
-
-                        <TextBlock x:Name="TextContent"
-                                   AutomationProperties.Name="Text content"
-                                   Style="{TemplateBinding TextStyle}"
-                                   Text="{TemplateBinding Text}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="OrientationStates">
-                                <VisualState x:Name="Vertical" />
-                                <VisualState x:Name="Horizontal">
-                                    <VisualState.Setters>
-                                        <Setter Target="TextContent.Margin" Value="10,0,0,0" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </StackPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 6174415e0f3..9b240477475 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -17,7 +17,6 @@
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
         - HeaderedContentControl: Provides a header to content.
         - HeaderedItemsControl: Provides a header to items.
-        - HeaderedTextBlock: Provide a header for read-only text.
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
index 0dd5cea5b9e..8a263d98309 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
@@ -5,7 +5,6 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=headeredtextblock/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=pulltorefreshlistview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
index 66cce5b66ab..d3b003e8b80 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
@@ -213,14 +213,6 @@
     <value>Notification</value>
     <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Close tab</value>
-    <comment>Narrator Resource for TabView Close Button.</comment>
-  </data>
-  <data name="WindowsCommunityToolkit_TabView_CloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Close tab</value>
-    <comment>Tooltip for TabView Close Button.</comment>
-  </data>
   <data name="WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
     <value>Remove</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
deleted file mode 100644
index 893776ff0be..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabClosingEventArgs.cs
+++ /dev/null
@@ -1,36 +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 System.ComponentModel;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Event arguments for <see cref="TabView.TabClosing"/> event.
-    /// </summary>
-    public class TabClosingEventArgs : CancelEventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabClosingEventArgs"/> class.
-        /// </summary>
-        /// <param name="item">Item being closed.</param>
-        /// <param name="tab"><see cref="TabViewItem"/> container being closed.</param>
-        public TabClosingEventArgs(object item, TabViewItem tab)
-        {
-            Item = item;
-            Tab = tab;
-        }
-
-        /// <summary>
-        /// Gets the Item being closed.
-        /// </summary>
-        public object Item { get; private set; }
-
-        /// <summary>
-        /// Gets the Tab being closed.
-        /// </summary>
-        public TabViewItem Tab { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
deleted file mode 100644
index dcf351aab9b..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabDraggedOutsideEventArgs.cs
+++ /dev/null
@@ -1,35 +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;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// A class used by the <see cref="TabView"/> TabDraggedOutside Event
-    /// </summary>
-    public class TabDraggedOutsideEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabDraggedOutsideEventArgs"/> class.
-        /// </summary>
-        /// <param name="item">data context of element dragged</param>
-        /// <param name="tab"><see cref="TabViewItem"/> container being dragged.</param>
-        public TabDraggedOutsideEventArgs(object item, TabViewItem tab)
-        {
-            Item = item;
-            Tab = tab;
-        }
-
-        /// <summary>
-        /// Gets or sets the Item/Data Context of the item being dragged outside of the <see cref="TabView"/>.
-        /// </summary>
-        public object Item { get; set; }
-
-        /// <summary>
-        /// Gets the Tab being dragged outside of the <see cref="TabView"/>.
-        /// </summary>
-        public TabViewItem Tab { get; private set; }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
deleted file mode 100644
index 16885700b35..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.HeaderLayout.cs
+++ /dev/null
@@ -1,221 +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 System.Linq;
-using Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView methods related to calculating the width of the <see cref="TabViewItem"/> Headers.
-    /// </summary>
-    public partial class TabView
-    {
-        // Attached property for storing widths of tabs if set by other means during layout.
-        private static double GetOriginalWidth(TabViewItem obj)
-        {
-            return (double)obj.GetValue(OriginalWidthProperty);
-        }
-
-        private static void SetOriginalWidth(TabViewItem obj, double value)
-        {
-            obj.SetValue(OriginalWidthProperty, value);
-        }
-
-        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
-        private static readonly DependencyProperty OriginalWidthProperty =
-            DependencyProperty.RegisterAttached("OriginalWidth", typeof(double), typeof(TabView), new PropertyMetadata(null));
-
-        private static void OnLayoutEffectingPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            var tabview = sender as TabView;
-            if (tabview != null && tabview._hasLoaded)
-            {
-                tabview.TabView_SizeChanged(tabview, null);
-            }
-        }
-
-        private void TabView_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            // We need to do this calculation here in Size Changed as the
-            // Columns don't have their Actual Size calculated in Measure or Arrange.
-            if (_hasLoaded && _tabViewContainer != null)
-            {
-                // Look for our special columns to calculate size of other 'stuff'
-                var taken = _tabViewContainer.ColumnDefinitions.Sum(cd => GetIgnoreColumn(cd) ? 0 : cd.ActualWidth);
-
-                // Get the column we want to work on for available space
-                var tabc = _tabViewContainer.ColumnDefinitions.FirstOrDefault(cd => GetConstrainColumn(cd));
-                if (tabc != null)
-                {
-                    var available = ActualWidth - taken;
-                    var required = 0.0;
-                    var mintabwidth = double.MaxValue;
-
-                    if (TabWidthBehavior == TabWidthMode.Actual)
-                    {
-                        if (_tabScroller != null)
-                        {
-                            // If we have a scroll container, get its size.
-                            required = _tabScroller.ExtentWidth;
-                        }
-
-                        // Restore original widths
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            if (tab.ReadLocalValue(OriginalWidthProperty) != DependencyProperty.UnsetValue)
-                            {
-                                tab.Width = GetOriginalWidth(tab);
-                            }
-                        }
-                    }
-                    else if (available > 0)
-                    {
-                        // Calculate the width for each tab from the provider and determine how much space they take.
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
-
-                            double width = double.NaN;
-
-                            switch (TabWidthBehavior)
-                            {
-                                case TabWidthMode.Equal:
-                                    width = ProvideEqualWidth(tab, item, available);
-                                    break;
-                                case TabWidthMode.Compact:
-                                    width = ProvideCompactWidth(tab, item, available);
-                                    break;
-                            }
-
-                            if (tab.ReadLocalValue(OriginalWidthProperty) == DependencyProperty.UnsetValue)
-                            {
-                                SetOriginalWidth(tab, tab.Width);
-                            }
-
-                            if (width > double.Epsilon)
-                            {
-                                tab.Width = width;
-                                required += Math.Max(Math.Min(width, tab.MaxWidth), tab.MinWidth);
-                            }
-                            else
-                            {
-                                tab.Width = GetOriginalWidth(tab);
-                                required += tab.ActualWidth;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // Fix negative bounds.
-                        available = 0.0;
-
-                        // Still need to determine a 'minimum' width (if available)
-                        // TODO: Consolidate this logic with above better?
-                        foreach (var item in Items)
-                        {
-                            var tab = ContainerFromItem(item) as TabViewItem;
-                            if (tab == null)
-                            {
-                                continue; // container not generated yet
-                            }
-
-                            mintabwidth = Math.Min(mintabwidth, tab.MinWidth);
-                        }
-                    }
-
-                    if (!(mintabwidth < double.MaxValue))
-                    {
-                        mintabwidth = 0.0; // No Containers, no visual, 0 size.
-                    }
-
-                    if (available > mintabwidth)
-                    {
-                        // Constrain the column based on our required and available space
-                        tabc.MaxWidth = available;
-                    }
-
-                    //// TODO: If it's less, should we move the selected tab to only be the one shown by default?
-
-                    if (available <= mintabwidth || Math.Abs(available - mintabwidth) < double.Epsilon)
-                    {
-                        tabc.Width = new GridLength(mintabwidth);
-                    }
-                    else if (required >= available)
-                    {
-                        // Fix size as we don't have enough space for all the tabs.
-                        tabc.Width = new GridLength(available);
-                    }
-                    else
-                    {
-                        // We haven't filled up our space, so we want to expand to take as much as needed.
-                        tabc.Width = GridLength.Auto;
-                    }
-                }
-            }
-        }
-
-        private double ProvideEqualWidth(TabViewItem tab, object item, double availableWidth)
-        {
-            if (double.IsNaN(SelectedTabWidth))
-            {
-                if (Items.Count <= 1)
-                {
-                    return availableWidth;
-                }
-
-                return Math.Max(tab.MinWidth, availableWidth / Items.Count);
-            }
-            else if (Items.Count() <= 1)
-            {
-                // Default case of a single tab, make it full size.
-                return Math.Min(SelectedTabWidth, availableWidth);
-            }
-            else
-            {
-                var width = (availableWidth - SelectedTabWidth) / (Items.Count - 1);
-
-                // Constrain between Min and Selected (Max)
-                if (width < tab.MinWidth)
-                {
-                    width = tab.MinWidth;
-                }
-                else if (width > SelectedTabWidth)
-                {
-                    width = SelectedTabWidth;
-                }
-
-                // If it's selected make it full size, otherwise whatever the size should be.
-                return tab.IsSelected
-                    ? Math.Min(SelectedTabWidth, availableWidth)
-                    : width;
-            }
-        }
-
-        private double ProvideCompactWidth(TabViewItem tab, object item, double availableWidth)
-        {
-            // If we're selected and have a value for that, then just return that.
-            if (tab.IsSelected && !double.IsNaN(SelectedTabWidth))
-            {
-                return SelectedTabWidth;
-            }
-
-            // Otherwise use min size.
-            return tab.MinWidth;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
deleted file mode 100644
index 61f61623b6f..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.ItemSources.cs
+++ /dev/null
@@ -1,115 +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.Reflection;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls.Primitives;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView methods related to tracking Items and ItemsSource changes.
-    /// </summary>
-    public partial class TabView
-    {
-        // Temporary tracking of previous collections for removing events.
-        private MethodInfo _removeItemsSourceMethod;
-
-        /// <inheritdoc/>
-        protected override void OnItemsChanged(object e)
-        {
-            IVectorChangedEventArgs args = (IVectorChangedEventArgs)e;
-
-            base.OnItemsChanged(e);
-
-            if (args.CollectionChange == CollectionChange.ItemRemoved && SelectedIndex == -1)
-            {
-                // If we remove the selected item we should select the previous item
-                int startIndex = (int)args.Index + 1;
-                if (startIndex > Items.Count)
-                {
-                    startIndex = 0;
-                }
-
-                SelectedIndex = FindNextTabIndex(startIndex, -1);
-            }
-
-            // Update Sizing (in case there are less items now)
-            TabView_SizeChanged(this, null);
-        }
-
-        private void ItemContainerGenerator_ItemsChanged(object sender, ItemsChangedEventArgs e)
-        {
-            var action = (CollectionChange)e.Action;
-            if (action == CollectionChange.Reset)
-            {
-                // Reset collection to reload later.
-                _hasLoaded = false;
-            }
-        }
-
-        private void SetInitialSelection()
-        {
-            if (SelectedItem == null)
-            {
-                // If we have an index, but didn't get the selection, make the selection
-                if (SelectedIndex >= 0 && SelectedIndex < Items.Count)
-                {
-                    SelectedItem = Items[SelectedIndex];
-                }
-
-                // Otherwise, select the first item by default
-                else if (Items.Count >= 1)
-                {
-                    SelectedItem = Items[0];
-                }
-            }
-        }
-
-        // Finds the next visible & enabled tab index.
-        private int FindNextTabIndex(int startIndex, int direction)
-        {
-            int index = startIndex;
-            if (direction != 0)
-            {
-                for (int i = 0; i < Items.Count; i++)
-                {
-                    index += direction;
-
-                    if (index >= Items.Count)
-                    {
-                        index = 0;
-                    }
-                    else if (index < 0)
-                    {
-                        index = Items.Count - 1;
-                    }
-
-                    var tabItem = ContainerFromIndex(index) as TabViewItem;
-                    if (tabItem != null && tabItem.IsEnabled && tabItem.Visibility == Visibility.Visible)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return index;
-        }
-
-        private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
-        {
-            // Use reflection to store a 'Remove' method of any possible collection in ItemsSource
-            // Cache for efficiency later.
-            if (ItemsSource != null)
-            {
-                _removeItemsSourceMethod = ItemsSource.GetType().GetMethod("Remove");
-            }
-            else
-            {
-                _removeItemsSourceMethod = null;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
deleted file mode 100644
index 5d33b33f1cc..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.Properties.cs
+++ /dev/null
@@ -1,245 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView properties.
-    /// </summary>
-    public partial class TabView
-    {
-        /// <summary>
-        /// Gets or sets the content to appear to the left or above the tab strip.
-        /// </summary>
-        public object TabStartHeader
-        {
-            get { return (object)GetValue(TabStartHeaderProperty); }
-            set { SetValue(TabStartHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabStartHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabStartHeaderProperty =
-            DependencyProperty.Register(nameof(TabStartHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabStartHeader"/>.
-        /// </summary>
-        public DataTemplate TabStartHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabStartHeaderTemplateProperty); }
-            set { SetValue(TabStartHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabStartHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabStartHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabStartHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the content to appear next to the tab strip.
-        /// </summary>
-        public object TabActionHeader
-        {
-            get { return (object)GetValue(TabActionHeaderProperty); }
-            set { SetValue(TabActionHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabActionHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabActionHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabActionHeaderProperty =
-            DependencyProperty.Register(nameof(TabActionHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabActionHeader"/>.
-        /// </summary>
-        public DataTemplate TabActionHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabActionHeaderTemplateProperty); }
-            set { SetValue(TabActionHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabActionHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabActionHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabActionHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabActionHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the content to appear to the right or below the tab strip.
-        /// </summary>
-        public object TabEndHeader
-        {
-            get { return (object)GetValue(TabEndHeaderProperty); }
-            set { SetValue(TabEndHeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabEndHeader"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabEndHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty TabEndHeaderProperty =
-            DependencyProperty.Register(nameof(TabEndHeader), typeof(object), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTemplate"/> for the <see cref="TabEndHeader"/>.
-        /// </summary>
-        public DataTemplate TabEndHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(TabEndHeaderTemplateProperty); }
-            set { SetValue(TabEndHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabEndHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabEndHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty TabEndHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(TabEndHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the default <see cref="DataTemplate"/> for the <see cref="TabViewItem.HeaderTemplate"/>.
-        /// </summary>
-        public DataTemplate ItemHeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(ItemHeaderTemplateProperty); }
-            set { SetValue(ItemHeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ItemHeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabStartHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty ItemHeaderTemplateProperty =
-            DependencyProperty.Register(nameof(ItemHeaderTemplate), typeof(DataTemplate), typeof(TabView), new PropertyMetadata(null, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether by default a Tab can be closed or not if no value to <see cref="TabViewItem.IsClosable"/> is provided.
-        /// </summary>
-        public bool CanCloseTabs
-        {
-            get { return (bool)GetValue(CanCloseTabsProperty); }
-            set { SetValue(CanCloseTabsProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="CanCloseTabs"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="CanCloseTabs"/> dependency property.</returns>
-        public static readonly DependencyProperty CanCloseTabsProperty =
-            DependencyProperty.Register(nameof(CanCloseTabs), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether a <see cref="TabViewItem"/> Close Button should be included in layout calculations.
-        /// </summary>
-        public bool IsCloseButtonOverlay
-        {
-            get { return (bool)GetValue(IsCloseButtonOverlayProperty); }
-            set { SetValue(IsCloseButtonOverlayProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IsCloseButtonOverlay"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="IsCloseButtonOverlay"/> dependency property.</returns>
-        public static readonly DependencyProperty IsCloseButtonOverlayProperty =
-            DependencyProperty.Register(nameof(IsCloseButtonOverlay), typeof(bool), typeof(TabView), new PropertyMetadata(false, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets a value indicating the size of the selected tab.  By default this is set to Auto and the selected tab size doesn't change.
-        /// </summary>
-        public double SelectedTabWidth
-        {
-            get { return (double)GetValue(SelectedTabWidthProperty); }
-            set { SetValue(SelectedTabWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="SelectedTabWidth"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="SelectedTabWidth"/> dependency property.</returns>
-        public static readonly DependencyProperty SelectedTabWidthProperty =
-            DependencyProperty.Register(nameof(SelectedTabWidth), typeof(double), typeof(TabView), new PropertyMetadata(double.NaN, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the current <see cref="TabWidthMode"/> which determins how tab headers' width behave.
-        /// </summary>
-        public TabWidthMode TabWidthBehavior
-        {
-            get { return (TabWidthMode)GetValue(TabWidthBehaviorProperty); }
-            set { SetValue(TabWidthBehaviorProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="TabWidthBehavior"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="TabWidthBehavior"/> dependency property.</returns>
-        public static readonly DependencyProperty TabWidthBehaviorProperty =
-            DependencyProperty.Register(nameof(TabWidthBehavior), typeof(TabWidthMode), typeof(TabView), new PropertyMetadata(TabWidthMode.Actual, OnLayoutEffectingPropertyChanged));
-
-        /// <summary>
-        /// Gets the attached property value to indicate if this grid column should be ignored when calculating header sizes.
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <returns>Boolean indicating if this column is ignored by TabViewHeader logic.</returns>
-        public static bool GetIgnoreColumn(ColumnDefinition obj)
-        {
-            return (bool)obj.GetValue(IgnoreColumnProperty);
-        }
-
-        /// <summary>
-        /// Sets the attached property value for <see cref="IgnoreColumnProperty"/>
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <param name="value">Boolean value</param>
-        public static void SetIgnoreColumn(ColumnDefinition obj, bool value)
-        {
-            obj.SetValue(IgnoreColumnProperty, value);
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IgnoreColumnProperty"/> attached property.
-        /// </summary>
-        /// <returns>The identifier for the IgnoreColumn attached property.</returns>
-        public static readonly DependencyProperty IgnoreColumnProperty =
-            DependencyProperty.RegisterAttached("IgnoreColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
-
-        /// <summary>
-        /// Gets the attached value indicating this column should be restricted for the <see cref="TabViewItem"/> headers.
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <returns>True if this column should be constrained.</returns>
-        public static bool GetConstrainColumn(ColumnDefinition obj)
-        {
-            return (bool)obj.GetValue(ConstrainColumnProperty);
-        }
-
-        /// <summary>
-        /// Sets the attached property value for the <see cref="ConstrainColumnProperty"/>
-        /// </summary>
-        /// <param name="obj">Grid Column.</param>
-        /// <param name="value">Boolean value.</param>
-        public static void SetConstrainColumn(ColumnDefinition obj, bool value)
-        {
-            obj.SetValue(ConstrainColumnProperty, value);
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ConstrainColumnProperty"/> attached property.
-        /// </summary>
-        /// <returns>The identifier for the ConstrainColumn attached property.</returns>
-        public static readonly DependencyProperty ConstrainColumnProperty =
-            DependencyProperty.RegisterAttached("ConstrainColumn", typeof(bool), typeof(TabView), new PropertyMetadata(false));
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
deleted file mode 100644
index 0e86ab398f5..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs
+++ /dev/null
@@ -1,320 +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 System.ComponentModel;
-using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// TabView is a control for displaying a set of tabs and their content.
-    /// </summary>
-    [Obsolete("Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui")]
-    [TemplatePart(Name = TabContentPresenterName, Type = typeof(ContentPresenter))]
-    [TemplatePart(Name = TabViewContainerName, Type = typeof(Grid))]
-    [TemplatePart(Name = TabsItemsPresenterName, Type = typeof(ItemsPresenter))]
-    [TemplatePart(Name = TabsScrollViewerName, Type = typeof(ScrollViewer))]
-    [TemplatePart(Name = TabsScrollBackButtonName, Type = typeof(ButtonBase))]
-    [TemplatePart(Name = TabsScrollForwardButtonName, Type = typeof(ButtonBase))]
-    public partial class TabView : ListViewBase
-    {
-        private const int ScrollAmount = 50; // TODO: Should this be based on TabWidthMode
-
-        private const string TabContentPresenterName = "TabContentPresenter";
-        private const string TabViewContainerName = "TabViewContainer";
-        private const string TabsItemsPresenterName = "TabsItemsPresenter";
-        private const string TabsScrollViewerName = "ScrollViewer";
-        private const string TabsScrollBackButtonName = "ScrollBackButton";
-        private const string TabsScrollForwardButtonName = "ScrollForwardButton";
-
-        private ContentPresenter _tabContentPresenter;
-        private Grid _tabViewContainer;
-        private ItemsPresenter _tabItemsPresenter;
-        private ScrollViewer _tabScroller;
-        private ButtonBase _tabScrollBackButton;
-        private ButtonBase _tabScrollForwardButton;
-
-        private bool _hasLoaded;
-        private bool _isDragging;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabView"/> class.
-        /// </summary>
-        public TabView()
-        {
-            DefaultStyleKey = typeof(TabView);
-
-            // Container Generation Hooks
-            RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
-            ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
-
-            // Drag and Layout Hooks
-            DragItemsStarting += TabView_DragItemsStarting;
-            DragItemsCompleted += TabView_DragItemsCompleted;
-            SizeChanged += TabView_SizeChanged;
-
-            // Selection Hook
-            SelectionChanged += TabView_SelectionChanged;
-        }
-
-        /// <summary>
-        /// Occurs when a tab is dragged by the user outside of the <see cref="TabView"/>.  Generally, this paradigm is used to create a new-window with the torn-off tab.
-        /// The creation and handling of the new-window is left to the app's developer.
-        /// </summary>
-        public event EventHandler<TabDraggedOutsideEventArgs> TabDraggedOutside;
-
-        /// <summary>
-        /// Occurs when a tab's Close button is clicked.  Set <see cref="CancelEventArgs.Cancel"/> to true to prevent automatic Tab Closure.
-        /// </summary>
-        public event EventHandler<TabClosingEventArgs> TabClosing;
-
-        /// <inheritdoc/>
-        protected override DependencyObject GetContainerForItemOverride() => new TabViewItem();
-
-        /// <inheritdoc/>
-        protected override bool IsItemItsOwnContainerOverride(object item)
-        {
-            return item is TabViewItem;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            if (_tabItemsPresenter != null)
-            {
-                _tabItemsPresenter.SizeChanged -= TabView_SizeChanged;
-            }
-
-            if (_tabScroller != null)
-            {
-                _tabScroller.Loaded -= ScrollViewer_Loaded;
-            }
-
-            _tabContentPresenter = GetTemplateChild(TabContentPresenterName) as ContentPresenter;
-            _tabViewContainer = GetTemplateChild(TabViewContainerName) as Grid;
-            _tabItemsPresenter = GetTemplateChild(TabsItemsPresenterName) as ItemsPresenter;
-            _tabScroller = GetTemplateChild(TabsScrollViewerName) as ScrollViewer;
-
-            if (_tabItemsPresenter != null)
-            {
-                _tabItemsPresenter.SizeChanged += TabView_SizeChanged;
-            }
-
-            if (_tabScroller != null)
-            {
-                _tabScroller.Loaded += ScrollViewer_Loaded;
-            }
-        }
-
-        private void ScrollViewer_Loaded(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.Loaded -= ScrollViewer_Loaded;
-
-            if (_tabScrollBackButton != null)
-            {
-                _tabScrollBackButton.Click -= ScrollTabBackButton_Click;
-            }
-
-            if (_tabScrollForwardButton != null)
-            {
-                _tabScrollForwardButton.Click -= ScrollTabForwardButton_Click;
-            }
-
-            _tabScrollBackButton = _tabScroller.FindDescendantByName(TabsScrollBackButtonName) as ButtonBase;
-            _tabScrollForwardButton = _tabScroller.FindDescendantByName(TabsScrollForwardButtonName) as ButtonBase;
-
-            if (_tabScrollBackButton != null)
-            {
-                _tabScrollBackButton.Click += ScrollTabBackButton_Click;
-            }
-
-            if (_tabScrollForwardButton != null)
-            {
-                _tabScrollForwardButton.Click += ScrollTabForwardButton_Click;
-            }
-        }
-
-        private void ScrollTabBackButton_Click(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.ChangeView(Math.Max(0, _tabScroller.HorizontalOffset - ScrollAmount), null, null);
-        }
-
-        private void ScrollTabForwardButton_Click(object sender, RoutedEventArgs e)
-        {
-            _tabScroller.ChangeView(Math.Min(_tabScroller.ScrollableWidth, _tabScroller.HorizontalOffset + ScrollAmount), null, null);
-        }
-
-        private void TabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (_isDragging)
-            {
-                // Skip if we're dragging, we'll reset when we're done.
-                return;
-            }
-
-            if (_tabContentPresenter != null)
-            {
-                if (SelectedItem == null)
-                {
-                    _tabContentPresenter.Content = null;
-                    _tabContentPresenter.ContentTemplate = null;
-                }
-                else
-                {
-                    if (ContainerFromItem(SelectedItem) is TabViewItem container)
-                    {
-                        _tabContentPresenter.Content = container.Content;
-                        _tabContentPresenter.ContentTemplate = container.ContentTemplate;
-                    }
-                }
-            }
-
-            // If our width can be effected by the selection, need to run algorithm.
-            if (!double.IsNaN(SelectedTabWidth))
-            {
-                TabView_SizeChanged(sender, null);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
-        {
-            base.PrepareContainerForItemOverride(element, item);
-
-            var tabitem = element as TabViewItem;
-
-            tabitem.Loaded -= TabViewItem_Loaded;
-            tabitem.Closing -= TabViewItem_Closing;
-            tabitem.Loaded += TabViewItem_Loaded;
-            tabitem.Closing += TabViewItem_Closing;
-
-            if (tabitem.Header == null)
-            {
-                tabitem.Header = item;
-            }
-
-            if (tabitem.HeaderTemplate == null)
-            {
-                var headertemplatebinding = new Binding()
-                {
-                    Source = this,
-                    Path = new PropertyPath(nameof(ItemHeaderTemplate)),
-                    Mode = BindingMode.OneWay
-                };
-                tabitem.SetBinding(TabViewItem.HeaderTemplateProperty, headertemplatebinding);
-            }
-
-            if (tabitem.IsClosable != true && tabitem.ReadLocalValue(TabViewItem.IsClosableProperty) == DependencyProperty.UnsetValue)
-            {
-                var iscloseablebinding = new Binding()
-                {
-                    Source = this,
-                    Path = new PropertyPath(nameof(CanCloseTabs)),
-                    Mode = BindingMode.OneWay,
-                };
-                tabitem.SetBinding(TabViewItem.IsClosableProperty, iscloseablebinding);
-            }
-        }
-
-        private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
-        {
-            var tabitem = sender as TabViewItem;
-
-            tabitem.Loaded -= TabViewItem_Loaded;
-
-            // Only need to do this once.
-            if (!_hasLoaded)
-            {
-                _hasLoaded = true;
-
-                // Need to set a tab's selection on load, otherwise ListView resets to null.
-                SetInitialSelection();
-
-                // Need to make sure ContentPresenter is set to content based on selection.
-                TabView_SelectionChanged(this, null);
-
-                // Need to make sure we've registered our removal method.
-                ItemsSource_PropertyChanged(this, null);
-
-                // Make sure we complete layout now.
-                TabView_SizeChanged(this, null);
-            }
-        }
-
-        private void TabViewItem_Closing(object sender, TabClosingEventArgs e)
-        {
-            var item = ItemFromContainer(e.Tab);
-
-            var args = new TabClosingEventArgs(item, e.Tab);
-            TabClosing?.Invoke(this, args);
-
-            if (!args.Cancel)
-            {
-                if (ItemsSource != null)
-                {
-                    _removeItemsSourceMethod?.Invoke(ItemsSource, new object[] { item });
-                }
-                else
-                {
-                    Items.Remove(item);
-                }
-            }
-        }
-
-        private void TabView_DragItemsStarting(object sender, DragItemsStartingEventArgs e)
-        {
-            // Keep track of drag so we don't modify content until done.
-            _isDragging = true;
-        }
-
-        private void TabView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            _isDragging = false;
-
-            // args.DropResult == None when outside of area (e.g. create new window)
-            if (args.DropResult == DataPackageOperation.None)
-            {
-                var item = args.Items.FirstOrDefault();
-                var tab = ContainerFromItem(item) as TabViewItem;
-
-                if (tab == null && item is FrameworkElement fe)
-                {
-                    tab = fe.FindParent<TabViewItem>();
-                }
-
-                if (tab == null)
-                {
-                    // We still don't have a TabViewItem, most likely is a static TabViewItem in the template being dragged and not selected.
-                    // This is a fallback scenario for static tabs.
-                    // Note: This can be wrong if two TabViewItems share the exact same Content (i.e. a string), this should be unlikely in any practical scenario.
-                    for (int i = 0; i < Items.Count; i++)
-                    {
-                        var tabItem = ContainerFromIndex(i) as TabViewItem;
-                        if (ReferenceEquals(tabItem.Content, item))
-                        {
-                            tab = tabItem;
-                            break;
-                        }
-                    }
-                }
-
-                TabDraggedOutside?.Invoke(this, new TabDraggedOutsideEventArgs(item, tab));
-            }
-            else
-            {
-                // If dragging the active tab, there's an issue with the CP blanking.
-                TabView_SelectionChanged(this, null);
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
deleted file mode 100644
index d3310aadf06..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml
+++ /dev/null
@@ -1,736 +0,0 @@
-<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:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{StaticResource SystemChromeLowColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="TabViewBackground"
-                             Color="{ThemeResource SystemChromeLowColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed"
-                             Color="{ThemeResource SystemColorHighlightColor}" />
-            <StaticResource x:Key="TabViewItemHeaderBackground"
-                            ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="TabViewSelectionIndicatorForeground"
-                            ResourceKey="SystemControlForegroundAccentBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForeground"
-                            ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPressed"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundSelected"
-                            ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver"
-                            ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <StaticResource x:Key="TabViewItemHeaderForegroundDisabled"
-                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-            <StaticResource x:Key="TabViewItemHeaderRevealBorderBrush"
-                            ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
-    <Thickness x:Key="TabViewItemHeaderMargin">0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderIconMargin">0,0,8,0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderCloseMargin">8,0,-8,0</Thickness>
-    <Thickness x:Key="TabViewItemHeaderBorderThickness">0,1,1,0</Thickness>
-    <x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMinWidth">48</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMinHeight">40</x:Double>
-    <x:Double x:Key="TabViewItemHeaderMaxWidth">NaN</x:Double>
-    <x:Double x:Key="TabViewItemHeaderCloseWidth">32</x:Double>
-
-    <converters:EmptyObjectToObjectConverter x:Key="NullVisibilityConverter"
-                                             EmptyValue="Collapsed"
-                                             NotEmptyValue="Visible" />
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-    <!--  65 is the size of both scroll buttons + 1 for layout rounding.  -->
-    <converters:DoubleToVisibilityConverter x:Key="GreaterThanToleranceVisibilityConverter"
-                                            GreaterThan="65.0" />
-
-    <converters:BoolToObjectConverter x:Key="CloseCollapsingSizeConverter"
-                                      FalseValue="{StaticResource TabViewItemHeaderCloseWidth}"
-                                      TrueValue="NaN" />
-
-    <!--  Default style for compatibility with WPF migrators.  -->
-    <Style TargetType="local:TabView">
-        <Setter Property="Background" Value="{ThemeResource TabViewBackground}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="IsSwipeEnabled" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
-        <Setter Property="ScrollViewer.IsHorizontalRailEnabled" Value="False" />
-        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
-        <Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="False" />
-        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True" />
-        <!--  Need UseLayoutRounding as Width being dynamically changed in same cases to fill up an entire space, otherwise gap.  -->
-        <Setter Property="UseLayoutRounding" Value="False" />
-        <Setter Property="ItemContainerTransitions">
-            <Setter.Value>
-                <TransitionCollection>
-                    <AddDeleteThemeTransition />
-                    <ContentThemeTransition />
-                    <ReorderThemeTransition />
-                    <EntranceThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <!--  Note: We have to use StackPanel here due to other issues using ItemsStackPanel or VirtualizingStackPanel  -->
-                    <StackPanel Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template" Value="{StaticResource TabViewTemplate}" />
-    </Style>
-
-    <ControlTemplate x:Key="TabViewTemplate"
-                     TargetType="local:TabView">
-        <Grid x:Name="TabViewContainer">
-            <Grid.RowDefinitions>
-                <!--  0 Header  -->
-                <RowDefinition Height="Auto" />
-                <!--  1 Tabs  -->
-                <RowDefinition Height="Auto" />
-                <!--  2 Content  -->
-                <RowDefinition Height="*" />
-                <!--  3 Footer  -->
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <!--  0 TabStartHeader  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  1 Tabs  -->
-                <ColumnDefinition Width="Auto"
-                                  local:TabView.ConstrainColumn="True"
-                                  local:TabView.IgnoreColumn="True" />
-                <!--  2 Reserved: Overflow Drop-down  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  3 Auto Add Button  -->
-                <ColumnDefinition Width="Auto" />
-                <!--  4 Padding  -->
-                <ColumnDefinition Width="*"
-                                  local:TabView.IgnoreColumn="True" />
-                <!--  5 TabEndHeader  -->
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <ContentPresenter Grid.Row="0"
-                              Grid.ColumnSpan="6"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}" />
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="0"
-                              Content="{TemplateBinding TabStartHeader}"
-                              ContentTemplate="{TemplateBinding TabStartHeaderTemplate}" />
-
-            <ScrollViewer x:Name="ScrollViewer"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          AutomationProperties.AccessibilityView="Raw"
-                          BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
-                          HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                          HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                          IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                          IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                          IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}"
-                          IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                          IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}"
-                          Style="{StaticResource TabViewScrollViewer}"
-                          TabNavigation="{TemplateBinding TabNavigation}"
-                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                          VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                          ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
-                <ItemsPresenter x:Name="TabsItemsPresenter"
-                                Padding="{TemplateBinding Padding}" />
-            </ScrollViewer>
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="3"
-                              HorizontalAlignment="Left"
-                              Content="{TemplateBinding TabActionHeader}"
-                              ContentTemplate="{TemplateBinding TabActionHeaderTemplate}" />
-
-            <ContentPresenter Grid.Row="1"
-                              Grid.Column="5"
-                              Content="{TemplateBinding TabEndHeader}"
-                              ContentTemplate="{TemplateBinding TabEndHeaderTemplate}" />
-
-            <ContentPresenter x:Name="TabContentPresenter"
-                              Grid.Row="2"
-                              Grid.ColumnSpan="6"
-                              Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              BorderThickness="{TemplateBinding BorderThickness}" />
-
-            <ContentPresenter Grid.Row="3"
-                              Grid.ColumnSpan="6"
-                              Content="{TemplateBinding Footer}"
-                              ContentTemplate="{TemplateBinding FooterTemplate}" />
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Based on Style for ListViewItemExpanded Template - https://msdn.microsoft.com/en-us/library/windows/apps/mt299136.aspx  -->
-    <ControlTemplate x:Key="TabViewItemHeaderTemplate"
-                     TargetType="local:TabViewItem">
-        <Grid x:Name="LayoutRoot"
-              ex:FrameworkElementExtensions.AncestorType="local:TabView"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Control.IsTemplateFocusTarget="True"
-              FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-              RenderTransformOrigin="0.5,0.5">
-            <Grid.RenderTransform>
-                <ScaleTransform x:Name="LayoutRootScale" />
-            </Grid.RenderTransform>
-            <Rectangle x:Name="SelectionIndicator"
-                       Height="2"
-                       Margin="0,-1"
-                       VerticalAlignment="Top"
-                       Fill="{ThemeResource TabViewSelectionIndicatorForeground}"
-                       Opacity="0" />
-
-            <Grid Padding="{TemplateBinding Padding}">
-                <Grid x:Name="ContentPresenterGrid">
-                    <Grid.RenderTransform>
-                        <TranslateTransform x:Name="ContentPresenterTranslateTransform" />
-                    </Grid.RenderTransform>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <!--  Modifications of default ListViewItem Template for our Tab Here  -->
-                    <Viewbox x:Name="IconBox"
-                             MaxWidth="{ThemeResource TabViewItemHeaderIconSize}"
-                             MaxHeight="{ThemeResource TabViewItemHeaderIconSize}"
-                             Margin="{ThemeResource TabViewItemHeaderIconMargin}"
-                             Visibility="{Binding Icon, Converter={StaticResource NullVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-                        <ContentPresenter x:Name="Icon"
-                                          Content="{TemplateBinding Icon}"
-                                          Foreground="{TemplateBinding Foreground}" />
-                    </Viewbox>
-                    <ContentPresenter x:Name="ContentPresenter"
-                                      Grid.Column="1"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      Content="{TemplateBinding Header}"
-                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                      ContentTransitions="{TemplateBinding ContentTransitions}"
-                                      FontWeight="{TemplateBinding FontWeight}"
-                                      OpticalMarginAlignment="TrimSideBearings" />
-                    <!--  Use grid to toggle visibility based on IsClosable property and inner border for hover animations.  -->
-                    <Border x:Name="CloseButtonContainer"
-                            Grid.Column="2"
-                            Width="{Binding (ex:FrameworkElementExtensions.Ancestor).IsCloseButtonOverlay, Converter={StaticResource CloseCollapsingSizeConverter}, ElementName=LayoutRoot}"
-                            HorizontalAlignment="Right"
-                            Visibility="{Binding IsClosable, Converter={StaticResource BoolToVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border x:Name="CloseButtonBorder"
-                                Width="{StaticResource TabViewItemHeaderCloseWidth}"
-                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
-                                Background="{TemplateBinding Background}"
-                                Visibility="Collapsed">
-                            <Button x:Name="CloseButton"
-                                    x:Uid="/Microsoft.Toolkit.Uwp.UI.Controls/Resources/WindowsCommunityToolkit_TabView_CloseButton"
-                                    Style="{StaticResource TabViewItemCloseButtonStyle}">
-                                &#xE711;
-                            </Button>
-                        </Border>
-                    </Border>
-                </Grid>
-            </Grid>
-
-            <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-
-                    <VisualState x:Name="PointerOver">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="Pressed">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPressed}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="SelectionIndicator.Opacity" Value="0.4" />
-                        </VisualState.Setters>
-                    </VisualState>
-
-                    <VisualState x:Name="Selected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundSelected}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="PointerOverSelected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="PressedSelected">
-                        <VisualState.Setters>
-                            <Setter Target="LayoutRoot.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPressed}" />
-                        </VisualState.Setters>
-
-                        <Storyboard>
-                            <!--  Selected Bar  -->
-                            <DoubleAnimation Storyboard.TargetName="SelectionIndicator"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="1"
-                                             Duration="0" />
-
-                            <!--  Close Button  -->
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Background">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CloseButtonBorder"
-                                                           Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </VisualState>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DisabledStates">
-                    <VisualState x:Name="Enabled" />
-
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Target="Icon.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
-                            <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DataVirtualizationStates">
-                    <VisualState x:Name="DataAvailable" />
-
-                    <VisualState x:Name="DataPlaceholder" />
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="ReorderHintStates">
-                    <VisualState x:Name="NoReorderHint" />
-
-                    <VisualState x:Name="BottomReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Bottom"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="TopReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Top"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="RightReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Right"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="LeftReorderHint">
-                        <Storyboard>
-                            <DragOverThemeAnimation Direction="Left"
-                                                    ToOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-                                                    TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualStateGroup.Transitions>
-                        <VisualTransition GeneratedDuration="0:0:0.2"
-                                          To="NoReorderHint" />
-                    </VisualStateGroup.Transitions>
-                </VisualStateGroup>
-
-                <VisualStateGroup x:Name="DragStates">
-                    <VisualState x:Name="NotDragging" />
-
-                    <VisualState x:Name="Dragging">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemDragThemeOpacity}"
-                                             Duration="0" />
-                            <DragItemThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="DraggingTarget" />
-
-                    <VisualState x:Name="MultipleDraggingPrimary" />
-
-                    <VisualState x:Name="MultipleDraggingSecondary" />
-
-                    <VisualState x:Name="DraggedPlaceholder" />
-
-                    <VisualState x:Name="Reordering">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemReorderThemeOpacity}"
-                                             Duration="0:0:0.240" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="ReorderingTarget">
-                        <Storyboard>
-                            <DoubleAnimation Storyboard.TargetName="LayoutRoot"
-                                             Storyboard.TargetProperty="Opacity"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
-                                             Duration="0:0:0.240" />
-                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
-                                             Storyboard.TargetProperty="ScaleX"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
-                                             Duration="0:0:0.240" />
-                            <DoubleAnimation Storyboard.TargetName="LayoutRootScale"
-                                             Storyboard.TargetProperty="ScaleY"
-                                             To="{ThemeResource ListViewItemReorderTargetThemeScale}"
-                                             Duration="0:0:0.240" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="MultipleReorderingPrimary" />
-
-                    <VisualState x:Name="ReorderedPlaceholder">
-                        <Storyboard>
-                            <FadeOutThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualState x:Name="DragOver">
-                        <Storyboard>
-                            <DropTargetItemThemeAnimation TargetName="LayoutRoot" />
-                        </Storyboard>
-                    </VisualState>
-
-                    <VisualStateGroup.Transitions>
-                        <VisualTransition GeneratedDuration="0:0:0.2"
-                                          To="NotDragging" />
-                    </VisualStateGroup.Transitions>
-                </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Based on Style for Windows.UI.Xaml.Controls.ListViewItem  -->
-    <Style TargetType="local:TabViewItem">
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource TabViewItemHeaderBorderThickness}" />
-        <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource TabViewItemHeaderForeground}" />
-        <Setter Property="Margin" Value="{ThemeResource TabViewItemHeaderMargin}" />
-        <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="IsHoldingEnabled" Value="True" />
-        <Setter Property="Padding" Value="14,0" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="MinWidth" Value="{ThemeResource TabViewItemHeaderMinWidth}" />
-        <Setter Property="MinHeight" Value="{ThemeResource TabViewItemHeaderMinHeight}" />
-        <Setter Property="MaxWidth" Value="{ThemeResource TabViewItemHeaderMaxWidth}" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="FocusVisualMargin" Value="0" />
-        <Setter Property="IsClosable" Value="False" />
-        <Setter Property="Template" Value="{StaticResource TabViewItemHeaderTemplate}" />
-    </Style>
-
-    <Style x:Key="TabViewItemCloseButtonStyle"
-           TargetType="Button">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumHighBrush}" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Margin" Value="6,0,6,0" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid x:Name="RootGrid"
-                          Background="{TemplateBinding Background}">
-                        <ContentPresenter x:Name="ContentPresenter"
-                                          Padding="{TemplateBinding Padding}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          BorderBrush="{TemplateBinding BorderBrush}"
-                                          BorderThickness="{TemplateBinding BorderThickness}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal">
-                                    <Storyboard>
-                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ButtonPointerOverForegroundThemeBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                   Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>-->
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledTransparentBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="TabViewScrollViewer"
-           TargetType="ScrollViewer">
-        <Setter Property="HorizontalScrollMode" Value="Auto" />
-        <Setter Property="VerticalScrollMode" Value="Auto" />
-        <Setter Property="IsHorizontalRailEnabled" Value="True" />
-        <Setter Property="IsVerticalRailEnabled" Value="True" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="ZoomMode" Value="Disabled" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Visible" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="1,0,0,0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderRevealBorderBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollViewer">
-                    <Border x:Name="Root"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <RepeatButton x:Name="ScrollBackButton"
-                                          VerticalAlignment="Stretch"
-                                          Background="Transparent"
-                                          BorderThickness="1"
-                                          Delay="50"
-                                          FontFamily="Segoe MDL2 Assets"
-                                          Interval="100"
-                                          Style="{StaticResource RepeatButtonRevealStyle}"
-                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                                &#xE76B;
-                            </RepeatButton>
-
-                            <ScrollContentPresenter x:Name="ScrollContentPresenter"
-                                                    Grid.Column="1"
-                                                    TabFocusNavigation="Once"
-                                                    Margin="{TemplateBinding Padding}" />
-
-                            <RepeatButton x:Name="ScrollForwardButton"
-                                          Grid.Column="2"
-                                          VerticalAlignment="Stretch"
-                                          Background="Transparent"
-                                          BorderThickness="1"
-                                          Delay="50"
-                                          FontFamily="Segoe MDL2 Assets"
-                                          Interval="100"
-                                          Style="{StaticResource RepeatButtonRevealStyle}"
-                                          Visibility="{Binding ScrollableWidth, Converter={StaticResource GreaterThanToleranceVisibilityConverter}, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                                &#xE76C;
-                            </RepeatButton>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
deleted file mode 100644
index 3ce0f3e5483..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.Properties.cs
+++ /dev/null
@@ -1,79 +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 Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Item Container for a <see cref="TabView"/>.
-    /// </summary>
-    public partial class TabViewItem
-    {
-        /// <summary>
-        /// Gets or sets the header content for the tab.
-        /// </summary>
-        public object Header
-        {
-            get { return (object)GetValue(HeaderProperty); }
-            set { SetValue(HeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Header"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="Header"/> dependency property.</returns>
-        public static readonly DependencyProperty HeaderProperty =
-            DependencyProperty.Register(nameof(Header), typeof(object), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets the icon to appear in the tab header.
-        /// </summary>
-        public IconElement Icon
-        {
-            get { return (IconElement)GetValue(IconProperty); }
-            set { SetValue(IconProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Icon"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="Icon"/> dependency property.</returns>
-        public static readonly DependencyProperty IconProperty =
-            DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets the template to override for the tab header.
-        /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-            set { SetValue(HeaderTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="HeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty HeaderTemplateProperty =
-            DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(TabViewItem), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the tab can be closed by the user with the close button.
-        /// </summary>
-        public bool IsClosable
-        {
-            get { return (bool)GetValue(IsClosableProperty); }
-            set { SetValue(IsClosableProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="IsClosable"/> dependency property.
-        /// </summary>
-        /// <returns>The identifier for the <see cref="IsClosable"/> dependency property.</returns>
-        public static readonly DependencyProperty IsClosableProperty =
-            DependencyProperty.Register(nameof(IsClosable), typeof(bool), typeof(TabViewItem), new PropertyMetadata(null));
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
deleted file mode 100644
index 69a968fd839..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabViewItem.cs
+++ /dev/null
@@ -1,116 +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 Windows.Devices.Input;
-using Windows.System;
-using Windows.UI.Core;
-using Windows.UI.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Item Container for a <see cref="TabView"/>.
-    /// </summary>
-    [TemplatePart(Name = TabCloseButtonName, Type = typeof(ButtonBase))]
-    public partial class TabViewItem : ListViewItem
-    {
-        private const string TabCloseButtonName = "CloseButton";
-
-        private ButtonBase _tabCloseButton;
-
-        private bool _isMiddleClick;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TabViewItem"/> class.
-        /// </summary>
-        public TabViewItem()
-        {
-            DefaultStyleKey = typeof(TabViewItem);
-        }
-
-        /// <summary>
-        /// Fired when the Tab's close button is clicked.
-        /// </summary>
-        public event EventHandler<TabClosingEventArgs> Closing;
-
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            if (_tabCloseButton != null)
-            {
-                _tabCloseButton.Click -= TabCloseButton_Click;
-            }
-
-            _tabCloseButton = GetTemplateChild(TabCloseButtonName) as ButtonBase;
-
-            if (_tabCloseButton != null)
-            {
-                _tabCloseButton.Click += TabCloseButton_Click;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerRoutedEventArgs e)
-        {
-            _isMiddleClick = false;
-
-            if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
-            {
-                PointerPoint pointerPoint = e.GetCurrentPoint(this);
-
-                // Record if middle button is pressed
-                if (pointerPoint.Properties.IsMiddleButtonPressed)
-                {
-                    _isMiddleClick = true;
-                }
-
-                // Disable unwanted behaviour inherited by ListViewItem:
-                // Disable "Ctrl + Left click" to deselect tab
-                // Or variant like "Ctrl + Shift + Left click"
-                // Or "Ctrl + Alt + Left click"
-                if (pointerPoint.Properties.IsLeftButtonPressed)
-                {
-                    var ctrl = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control);
-                    if (ctrl.HasFlag(CoreVirtualKeyStates.Down))
-                    {
-                        // return here so the event won't be picked up by the base class
-                        // but keep this event unhandled so it can be picked up further
-                        return;
-                    }
-                }
-            }
-
-            base.OnPointerPressed(e);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPointerReleased(PointerRoutedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-
-            // Close on Middle-Click
-            if (_isMiddleClick)
-            {
-                TabCloseButton_Click(this, null);
-            }
-
-            _isMiddleClick = false;
-        }
-
-        private void TabCloseButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (IsClosable)
-            {
-                Closing?.Invoke(this, new TabClosingEventArgs(Content, this));
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
deleted file mode 100644
index 65b1ce03844..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabWidthMode.cs
+++ /dev/null
@@ -1,36 +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 Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Possible modes for how to layout a <see cref="TabViewItem"/> Header's Width in the <see cref="TabView"/>.
-    /// </summary>
-    public enum TabWidthMode
-    {
-        /// <summary>
-        /// Each tab header takes up as much space as it needs.  This is similar to how WPF and Visual Studio Code behave.
-        /// Suggest to keep <see cref="TabView.IsCloseButtonOverlay"/> set to false.
-        /// <see cref="TabView.SelectedTabWidth"/> is ignored.
-        /// In this scenario, tab width behavior is effectively turned off.  This can be useful when using custom styling or a custom panel for layout of <see cref="TabViewItem"/> as well.
-        /// </summary>
-        Actual,
-
-        /// <summary>
-        /// Each tab header will use the minimal space set by <see cref="FrameworkElement.MinWidth"/> on the <see cref="TabViewItem"/>.
-        /// Suggest to set the <see cref="TabView.SelectedTabWidth"/> to show more content for the selected item.
-        /// </summary>
-        Compact,
-
-        /// <summary>
-        /// Each tab header will fill to fit the available space.  If <see cref="TabView.SelectedTabWidth"/> is set, that will be used as a Maximum Width.
-        /// This is similar to how Microsoft Edge behaves when used with the <see cref="TabView.SelectedTabWidth"/>.
-        /// Suggest to set <see cref="TabView.IsCloseButtonOverlay"/> to true.
-        /// Suggest to set <see cref="TabView.SelectedTabWidth"/> to 200 and the TabViewItemHeaderMinWidth Resource to 90.
-        /// </summary>
-        Equal,
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 592fbb45626..9c17a3717bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -9,7 +9,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
@@ -27,7 +26,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
index 6799439d67a..cdc4af642c5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
@@ -181,13 +181,6 @@ public class TileControl : ContentControl
         /// </summary>
         public event EventHandler ImageLoaded;
 
-        /// <summary>
-        /// Gets a value indicating whether the platform supports Composition.
-        /// </summary>
-        [Obsolete("This property is now obsolete and will be removed in a future version of the Toolkit.")]
-        public static bool IsCompositionSupported => !DesignTimeHelpers.IsRunningInLegacyDesignerMode &&
-                                                     ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
-
         /// <summary>
         /// Initializes a new instance of the <see cref="TileControl"/> class.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index e2bc71350ef..27fe2b2f0bc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -13,7 +13,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
@@ -33,8 +32,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabView" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabViewItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
index 5e81855f128..a39030a11a4 100644
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/StringExtensions.cs
@@ -86,14 +86,6 @@ public static bool IsDecimal(this string str)
         /// <returns><c>true</c> if the string contains only letters; otherwise, <c>false</c>.</returns>
         public static bool IsCharacterString(this string str) => Regex.IsMatch(str, CharactersRegex);
 
-        /// <summary>
-        /// Returns a string representation of an object.
-        /// </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) => value?.ToString();
-
         /// <summary>
         /// Returns a string with HTML comments, scripts, styles, and tags removed.
         /// </summary>

From 24c2da528f9f4823cdd7897d6e501cd2608263b8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 20 Aug 2020 14:08:18 -0700
Subject: [PATCH 410/595] Removed RSS parsers.

---
 .../Microsoft.Toolkit.Parsers.csproj          |   4 +-
 Microsoft.Toolkit.Parsers/Rss/AtomParser.cs   | 136 ------
 .../Rss/BaseRssParser.cs                      |  59 ---
 .../Rss/Enums/RssType.cs                      |  27 -
 Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs   | 214 --------
 Microsoft.Toolkit.Parsers/Rss/RssHelper.cs    | 460 ------------------
 Microsoft.Toolkit.Parsers/Rss/RssParser.cs    |  43 --
 Microsoft.Toolkit.Parsers/Rss/RssSchema.cs    |  65 ---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   7 -
 .../SamplePages/RssParser/RssParserPage.xaml  |  46 --
 .../RssParser/RssParserPage.xaml.cs           |  70 ---
 .../SamplePages/samples.json                  |   8 -
 readme.md                                     |   2 +-
 13 files changed, 2 insertions(+), 1139 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/RssParser.cs
 delete mode 100644 Microsoft.Toolkit.Parsers/Rss/RssSchema.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml.cs

diff --git a/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj b/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
index 49d99bd104f..a141b75c84b 100644
--- a/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
+++ b/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
@@ -8,10 +8,8 @@
 
       Markdown: Allows you to parse a Markdown String into a Markdown Document, and then Render it with a Markdown Renderer.
 
-      RSS: Allows you to parse an RSS content String into an RSS Schema.
-
     </Description>
-    <PackageTags>UWP Toolkit Windows Parsers Parsing Markdown RSS</PackageTags>
+    <PackageTags>UWP Toolkit Windows Parsers Parsing Markdown</PackageTags>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs b/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
deleted file mode 100644
index 65c2a56a6b7..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/AtomParser.cs
+++ /dev/null
@@ -1,136 +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.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Xml.Linq;
-using Microsoft.Toolkit.Extensions;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// Parser for Atom endpoints.
-    /// </summary>
-    internal class AtomParser : BaseRssParser
-    {
-        /// <summary>
-        /// Atom reader implementation to parse Atom content.
-        /// </summary>
-        /// <param name="doc">XDocument to parse.</param>
-        /// <returns>Strong typed response.</returns>
-        public override IEnumerable<RssSchema> LoadFeed(XDocument doc)
-        {
-            Collection<RssSchema> feed = new Collection<RssSchema>();
-
-            if (doc.Root == null)
-            {
-                return feed;
-            }
-
-            var items = doc.Root.Elements(doc.Root.GetDefaultNamespace() + "entry").Select(item => GetRssSchema(item)).ToList<RssSchema>();
-
-            feed = new Collection<RssSchema>(items);
-
-            return feed;
-        }
-
-        /// <summary>
-        /// Retrieves strong type for passed item.
-        /// </summary>
-        /// <param name="item">XElement to parse.</param>
-        /// <returns>Strong typed object.</returns>
-        private static RssSchema GetRssSchema(XElement item)
-        {
-            RssSchema rssItem = new RssSchema
-            {
-                Author = GetItemAuthor(item),
-                Title = item.GetSafeElementString("title").Trim().DecodeHtml(),
-                ImageUrl = GetItemImage(item),
-                PublishDate = item.GetSafeElementDate("published"),
-                FeedUrl = item.GetLink("alternate"),
-            };
-
-            var content = GetItemContent(item);
-
-            // Removes scripts from html
-            if (!string.IsNullOrEmpty(content))
-            {
-                rssItem.Summary = ProcessHtmlSummary(content);
-                rssItem.Content = ProcessHtmlContent(content);
-            }
-
-            string id = item.GetSafeElementString("guid").Trim();
-            if (string.IsNullOrEmpty(id))
-            {
-                id = item.GetSafeElementString("id").Trim();
-                if (string.IsNullOrEmpty(id))
-                {
-                    id = rssItem.FeedUrl;
-                }
-            }
-
-            rssItem.InternalID = id;
-            return rssItem;
-        }
-
-        /// <summary>
-        /// Retrieves item author from XElement.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>String of Item Author.</returns>
-        private static string GetItemAuthor(XElement item)
-        {
-            var content = string.Empty;
-
-            if (item != null && item.Element(item.GetDefaultNamespace() + "author") != null)
-            {
-                content = item.Element(item.GetDefaultNamespace() + "author").GetSafeElementString("name");
-            }
-
-            if (string.IsNullOrEmpty(content))
-            {
-                content = item.GetSafeElementString("author");
-            }
-
-            return content;
-        }
-
-        /// <summary>
-        /// Returns item image from XElement item.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>String pointing to item image.</returns>
-        private static string GetItemImage(XElement item)
-        {
-            if (!string.IsNullOrEmpty(item.GetSafeElementString("image")))
-            {
-                return item.GetSafeElementString("image");
-            }
-
-            return item.GetImage();
-        }
-
-        /// <summary>
-        /// Returns item content from XElement item.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>String of item content.</returns>
-        private static string GetItemContent(XElement item)
-        {
-            var content = item.GetSafeElementString("description");
-            if (string.IsNullOrEmpty(content))
-            {
-                content = item.GetSafeElementString("content");
-            }
-
-            if (string.IsNullOrEmpty(content))
-            {
-                content = item.GetSafeElementString("summary");
-            }
-
-            return content;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs b/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
deleted file mode 100644
index d268cf5d10c..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs
+++ /dev/null
@@ -1,59 +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.Collections.Generic;
-using System.Xml.Linq;
-using Microsoft.Toolkit.Extensions;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// Base class for Rss Parser(s).
-    /// </summary>
-    internal abstract class BaseRssParser
-    {
-        /// <summary>
-        /// Retrieve feed type from XDocument.
-        /// </summary>
-        /// <param name="doc">XDocument doc.</param>
-        /// <returns>Return feed type.</returns>
-        public static RssType GetFeedType(XDocument doc)
-        {
-            if (doc.Root == null)
-            {
-                return RssType.Unknown;
-            }
-
-            XNamespace defaultNamespace = doc.Root.GetDefaultNamespace();
-            return defaultNamespace.NamespaceName.EndsWith("Atom") ? RssType.Atom : RssType.Rss;
-        }
-
-        /// <summary>
-        /// Abstract method to be override by specific implementations of the reader.
-        /// </summary>
-        /// <param name="doc">XDocument doc.</param>
-        /// <returns>Returns list of strongly typed results.</returns>
-        public abstract IEnumerable<RssSchema> LoadFeed(XDocument doc);
-
-        /// <summary>
-        /// Fix up the HTML content.
-        /// </summary>
-        /// <param name="htmlContent">Content to be fixed up.</param>
-        /// <returns>Fixed up content.</returns>
-        protected internal static string ProcessHtmlContent(string htmlContent)
-        {
-            return htmlContent.FixHtml().SanitizeString();
-        }
-
-        /// <summary>
-        /// Create a summary of the HTML content.
-        /// </summary>
-        /// <param name="htmlContent">Content to be processed.</param>
-        /// <returns>Summary of the content.</returns>
-        protected internal static string ProcessHtmlSummary(string htmlContent)
-        {
-            return htmlContent.DecodeHtml().Trim().Truncate(500).SanitizeString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs b/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
deleted file mode 100644
index 99ae9570887..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs
+++ /dev/null
@@ -1,27 +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.Parsers.Rss
-{
-    /// <summary>
-    /// Type of Rss.
-    /// </summary>
-    internal enum RssType
-    {
-        /// <summary>
-        /// Atom
-        /// </summary>
-        Atom,
-
-        /// <summary>
-        /// RSS
-        /// </summary>
-        Rss,
-
-        /// <summary>
-        /// Unknown
-        /// </summary>
-        Unknown
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs b/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
deleted file mode 100644
index e693f0994ac..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs
+++ /dev/null
@@ -1,214 +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.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Xml.Linq;
-using Microsoft.Toolkit.Extensions;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// Rss reader implementation to parse Rss content.
-    /// </summary>
-    internal class Rss2Parser : BaseRssParser
-    {
-        /// <summary>
-        /// RDF Namespace Uri.
-        /// </summary>
-        private static readonly XNamespace NsRdfNamespaceUri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-
-        /// <summary>
-        /// RDF Elements Namespace Uri.
-        /// </summary>
-        private static readonly XNamespace NsRdfElementsNamespaceUri = "http://purl.org/dc/elements/1.1/";
-
-        /// <summary>
-        /// RDF Content Namespace Uri.
-        /// </summary>
-        private static readonly XNamespace NsRdfContentNamespaceUri = "http://purl.org/rss/1.0/modules/content/";
-
-        /// <summary>
-        /// This override load and parses the document and return a list of RssSchema values.
-        /// </summary>
-        /// <param name="doc">XDocument to be loaded.</param>
-        /// <returns>Strongly typed list of feeds.</returns>
-        public override IEnumerable<RssSchema> LoadFeed(XDocument doc)
-        {
-            bool isRDF = false;
-            var feed = new Collection<RssSchema>();
-            XNamespace defaultNamespace = string.Empty;
-
-            if (doc.Root != null)
-            {
-                isRDF = doc.Root.Name == (NsRdfNamespaceUri + "RDF");
-                defaultNamespace = doc.Root.GetDefaultNamespace();
-            }
-
-            foreach (var item in doc.Descendants(defaultNamespace + "item"))
-            {
-                var rssItem = isRDF ? ParseRDFItem(item) : ParseRssItem(item);
-                feed.Add(rssItem);
-            }
-
-            return feed;
-        }
-
-        /// <summary>
-        /// Parses XElement item into strong typed object.
-        /// </summary>
-        /// <param name="item">XElement item to parse.</param>
-        /// <returns>Strong typed object.</returns>
-        private static RssSchema ParseItem(XElement item)
-        {
-            var rssItem = new RssSchema();
-            rssItem.Title = item.GetSafeElementString("title").Trim().DecodeHtml();
-            rssItem.FeedUrl = item.GetSafeElementString("link");
-
-            rssItem.Author = GetItemAuthor(item);
-
-            string content = item.GetSafeElementString("encoded", NsRdfContentNamespaceUri);
-            if (string.IsNullOrEmpty(content))
-            {
-                content = item.GetSafeElementString("description");
-                if (string.IsNullOrEmpty(content))
-                {
-                    content = item.GetSafeElementString("content");
-                }
-            }
-
-            var summary = item.GetSafeElementString("description");
-            if (string.IsNullOrEmpty(summary))
-            {
-                summary = item.GetSafeElementString("encoded", NsRdfContentNamespaceUri);
-            }
-
-            // Removes scripts from html
-            if (!string.IsNullOrEmpty(summary))
-            {
-                rssItem.Summary = ProcessHtmlSummary(summary);
-            }
-
-            if (!string.IsNullOrEmpty(content))
-            {
-                rssItem.Content = ProcessHtmlContent(content);
-            }
-
-            string id = item.GetSafeElementString("guid").Trim();
-            if (string.IsNullOrEmpty(id))
-            {
-                id = item.GetSafeElementString("id").Trim();
-                if (string.IsNullOrEmpty(id))
-                {
-                    id = rssItem.FeedUrl;
-                }
-            }
-
-            rssItem.InternalID = id;
-
-            return rssItem;
-        }
-
-        /// <summary>
-        /// Parses RSS version 1.0 objects.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>Strong typed object.</returns>
-        private static RssSchema ParseRDFItem(XElement item)
-        {
-            XNamespace ns = "http://search.yahoo.com/mrss/";
-            var rssItem = ParseItem(item);
-
-            rssItem.PublishDate = item.GetSafeElementDate("date", NsRdfElementsNamespaceUri);
-
-            string image = item.GetSafeElementString("image");
-            if (string.IsNullOrEmpty(image) && item.Elements(ns + "thumbnail").LastOrDefault() != null)
-            {
-                var element = item.Elements(ns + "thumbnail").Last();
-                image = element.Attribute("url").Value;
-            }
-
-            if (string.IsNullOrEmpty(image) && item.ToString().Contains("thumbnail"))
-            {
-                image = item.GetSafeElementString("thumbnail");
-            }
-
-            if (string.IsNullOrEmpty(image))
-            {
-                image = item.GetImage();
-            }
-
-            rssItem.ImageUrl = image;
-
-            return rssItem;
-        }
-
-        /// <summary>
-        /// Parses RSS version 2.0 objects.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>Strong typed object.</returns>
-        private static RssSchema ParseRssItem(XElement item)
-        {
-            XNamespace ns = "http://search.yahoo.com/mrss/";
-            var rssItem = ParseItem(item);
-
-            rssItem.PublishDate = item.GetSafeElementDate("pubDate");
-
-            string image = item.GetSafeElementString("image");
-            if (string.IsNullOrEmpty(image))
-            {
-                image = item.GetImageFromEnclosure();
-            }
-
-            if (string.IsNullOrEmpty(image) && item.Elements(ns + "content").LastOrDefault() != null)
-            {
-                var element = item.Elements(ns + "content").Last();
-                if (element.Attribute("type") != null && element.Attribute("type").Value.Contains("image/"))
-                {
-                    image = element.Attribute("url").Value;
-                }
-            }
-
-            if (string.IsNullOrEmpty(image) && item.Elements(ns + "thumbnail").LastOrDefault() != null)
-            {
-                var element = item.Elements(ns + "thumbnail").Last();
-                image = element.Attribute("url").Value;
-            }
-
-            if (string.IsNullOrEmpty(image) && item.ToString().Contains("thumbnail"))
-            {
-                image = item.GetSafeElementString("thumbnail");
-            }
-
-            if (string.IsNullOrEmpty(image))
-            {
-                image = item.GetImage();
-            }
-
-            rssItem.Categories = item.GetSafeElementsString("category");
-
-            rssItem.ImageUrl = image;
-
-            return rssItem;
-        }
-
-        /// <summary>
-        /// Retrieve item author from item.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>String of item author.</returns>
-        private static string GetItemAuthor(XElement item)
-        {
-            var content = item.GetSafeElementString("creator", NsRdfElementsNamespaceUri).Trim();
-            if (string.IsNullOrEmpty(content))
-            {
-                content = item.GetSafeElementString("author");
-            }
-
-            return content;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs b/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
deleted file mode 100644
index 5b4b19d5af3..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/RssHelper.cs
+++ /dev/null
@@ -1,460 +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 System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Xml.Linq;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// Class with utilities for Rss related works.
-    /// </summary>
-    internal static class RssHelper
-    {
-        /// <summary>
-        /// String for regular expression for image pattern.
-        /// </summary>
-        private const string ImagePattern = @"<img.*?src=[\""'](.+?)[\""'].*?>";
-
-        /// <summary>
-        /// String for regular expression for hyperlink pattern.
-        /// </summary>
-        private const string HyperlinkPattern = @"<a\s+(?:[^>]*?\s+)?href=""([^ ""]*)""";
-
-        /// <summary>
-        /// String for regular expression for height pattern.
-        /// </summary>
-        private const string HeightPattern = @"height=(?:(['""])(?<height>(?:(?!\1).)*)\1|(?<height>\S+))";
-
-        /// <summary>
-        /// String for regular expression for width pattern.
-        /// </summary>
-        private const string WidthPattern = @"width=(?:(['""])(?<width>(?:(?!\1).)*)\1|(?<width>\S+))";
-
-        /// <summary>
-        /// Regular expression for image pattern.
-        /// </summary>
-        private static readonly Regex RegexImages = new Regex(ImagePattern, RegexOptions.IgnoreCase);
-
-        /// <summary>
-        /// Regular expression for hyperlink pattern.
-        /// </summary>
-        private static readonly Regex RegexLinks = new Regex(HyperlinkPattern, RegexOptions.IgnoreCase);
-
-        /// <summary>
-        /// Regular expression for height pattern.
-        /// </summary>
-        private static readonly Regex RegexHeight = new Regex(HeightPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
-
-        /// <summary>
-        /// Regular expression for width pattern.
-        /// </summary>
-        private static readonly Regex RegexWidth = new Regex(WidthPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
-
-        /// <summary>
-        /// Removes \t characters in the string and trim additional space and carriage returns.
-        /// </summary>
-        /// <param name="text">Text string.</param>
-        /// <returns>Sanitized string.</returns>
-        public static string SanitizeString(this string text)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                return string.Empty;
-            }
-
-            var textArray = text.Split(new[] { "\t" }, StringSplitOptions.RemoveEmptyEntries);
-            string sanitizedText = string.Empty;
-            foreach (var item in textArray.ToList())
-            {
-                sanitizedText += item.Trim();
-            }
-
-            sanitizedText = string.Join(" ", Regex.Split(sanitizedText, @"(?:\r\n|\n|\r)"));
-
-            return sanitizedText;
-        }
-
-        /// <summary>
-        /// Get item date from <see cref="XElement"/> and element name.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of element.</param>
-        /// <returns>Item date.</returns>
-        public static DateTime GetSafeElementDate(this XElement item, string elementName)
-        {
-            return GetSafeElementDate(item, elementName, item.GetDefaultNamespace());
-        }
-
-        /// <summary>
-        /// Get item date from <see cref="XElement"/>, element name and <see cref="XNamespace"/>.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of element.</param>
-        /// <param name="xNamespace">XNamespace namespace.</param>
-        /// <returns>Item date.</returns>
-        public static DateTime GetSafeElementDate(this XElement item, string elementName, XNamespace xNamespace)
-        {
-            DateTime date;
-            XElement element = item.Element(xNamespace + elementName);
-            if (element == null)
-            {
-                return DateTime.Now;
-            }
-
-            if (TryParseDateTime(element.Value, out date))
-            {
-                return date;
-            }
-
-            return DateTime.Now;
-        }
-
-        /// <summary>
-        /// Get item string value for <see cref="XElement"/> and element name.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of element.</param>
-        /// <returns>Safe string.</returns>
-        public static string GetSafeElementString(this XElement item, string elementName)
-        {
-            if (item == null)
-            {
-                return string.Empty;
-            }
-
-            return GetSafeElementString(item, elementName, item.GetDefaultNamespace());
-        }
-
-        /// <summary>
-        /// Get item string values for <see cref="XElement"/> and element name.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of the element.</param>
-        /// <returns>Safe list of string values.</returns>
-        public static IEnumerable<string> GetSafeElementsString(this XElement item, string elementName)
-        {
-            return GetSafeElementsString(item, elementName, item.GetDefaultNamespace());
-        }
-
-        /// <summary>
-        /// Get item string values for <see cref="XElement"/>, element name and namespace.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of element.</param>
-        /// <param name="xNamespace">XNamespace namespace.</param>
-        /// <returns>Safe list of string values.</returns>
-        public static IEnumerable<string> GetSafeElementsString(this XElement item, string elementName, XNamespace xNamespace)
-        {
-            if (item != null)
-            {
-                IEnumerable<XElement> values = item.Elements(xNamespace + elementName);
-                return values.Where(f => !string.IsNullOrEmpty(f.Value))
-                    .Select(f => f.Value);
-            }
-
-            return Enumerable.Empty<string>();
-        }
-
-        /// <summary>
-        /// Get item string value for <see cref="XElement"/>, element name and namespace.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="elementName">Name of element.</param>
-        /// <param name="xNamespace">XNamespace namespace.</param>
-        /// <returns>Safe string.</returns>
-        public static string GetSafeElementString(this XElement item, string elementName, XNamespace xNamespace)
-        {
-            if (item == null)
-            {
-                return string.Empty;
-            }
-
-            XElement value = item.Element(xNamespace + elementName);
-            if (value != null)
-            {
-                return value.Value;
-            }
-
-            return string.Empty;
-        }
-
-        /// <summary>
-        /// Get feed url to see full original information.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <param name="rel">rel attribute value.</param>
-        /// <returns>String link.</returns>
-        public static string GetLink(this XElement item, string rel)
-        {
-            IEnumerable<XElement> links = item.Elements(item.GetDefaultNamespace() + "link");
-            var xElements = links as XElement[] ?? links.ToArray();
-            IEnumerable<string> link = from l in xElements
-                                       let xAttribute = l.Attribute("rel")
-                                       where xAttribute != null && xAttribute.Value == rel
-                                       let attribute = l.Attribute("href")
-                                       where attribute != null
-                                       select attribute.Value;
-            var enumerable = link as string[] ?? link.ToArray();
-            if (!enumerable.Any() && xElements.Any())
-            {
-                return xElements.FirstOrDefault().Attributes().First().Value;
-            }
-
-            return enumerable.FirstOrDefault();
-        }
-
-        /// <summary>
-        /// Get feed image.
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>Feed data image.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "The general catch is intended to avoid breaking the Data Provider by a Html decode exception")]
-        public static string GetImage(this XElement item)
-        {
-            string feedDataImage = null;
-            try
-            {
-                feedDataImage = GetImagesInHTMLString(item.Value).FirstOrDefault();
-                if (!string.IsNullOrEmpty(feedDataImage) && feedDataImage.EndsWith("'"))
-                {
-                    feedDataImage = feedDataImage.Remove(feedDataImage.Length - 1);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex);
-            }
-
-            return feedDataImage;
-        }
-
-        /// <summary>
-        /// Get the item image from the enclosure element http://www.w3schools.com/rss/rss_tag_enclosure.asp
-        /// </summary>
-        /// <param name="item">XElement item.</param>
-        /// <returns>Feed data image.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "The general catch is intended to avoid breaking the Data Provider by a Html decode exception")]
-        public static string GetImageFromEnclosure(this XElement item)
-        {
-            string feedDataImage = null;
-            try
-            {
-                XElement element = item.Element(item.GetDefaultNamespace() + "enclosure");
-                if (element == null)
-                {
-                    return string.Empty;
-                }
-
-                var typeAttribute = element.Attribute("type");
-                if (!string.IsNullOrEmpty(typeAttribute?.Value) && typeAttribute.Value.StartsWith("image"))
-                {
-                    var urlAttribute = element.Attribute("url");
-                    feedDataImage = (!string.IsNullOrEmpty(urlAttribute?.Value)) ?
-                        urlAttribute.Value : string.Empty;
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex);
-            }
-
-            return feedDataImage;
-        }
-
-        /// <summary>
-        /// Tries to parse the original string to a datetime format.
-        /// </summary>
-        /// <param name="s">Input string.</param>
-        /// <param name="result">Parsed datetime.</param>
-        /// <returns>True if success</returns>
-        public static bool TryParseDateTime(string s, out DateTime result)
-        {
-            if (DateTime.TryParse(s, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AllowWhiteSpaces, out result))
-            {
-                return true;
-            }
-
-            int tzIndex = s.LastIndexOf(" ");
-            if (tzIndex >= 0)
-            {
-                string tz = s.Substring(tzIndex, s.Length - tzIndex);
-                string offset = TimeZoneToOffset(tz);
-                if (offset != null)
-                {
-                    string offsetDate = string.Format("{0} {1}", s.Substring(0, tzIndex), offset);
-                    return TryParseDateTime(offsetDate, out result);
-                }
-            }
-
-            result = default(DateTime);
-            return false;
-        }
-
-        /// <summary>
-        /// Calculate and return timezone.
-        /// </summary>
-        /// <param name="tz">Input string.</param>
-        /// <returns>Parsed timezone.</returns>
-        public static string TimeZoneToOffset(string tz)
-        {
-            if (tz == null)
-            {
-                return null;
-            }
-
-            tz = tz.ToUpper().Trim();
-
-            if (TimeZones.ContainsKey(tz))
-            {
-                return TimeZones[tz].First();
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Retrieve images from HTML string.
-        /// </summary>
-        /// <param name="htmlString">String of HTML.</param>
-        /// <returns>List of images.</returns>
-        private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
-        {
-            var images = new List<string>();
-            foreach (Match match in RegexImages.Matches(htmlString))
-            {
-                bool include = true;
-                string tag = match.Value;
-
-                // Ignores images with low size
-                var matchHeight = RegexHeight.Match(tag);
-                if (matchHeight.Success)
-                {
-                    var heightValue = matchHeight.Groups["height"].Value;
-                    if (int.TryParse(heightValue, out var heightIntValue) && heightIntValue < 10)
-                    {
-                        include = false;
-                    }
-                }
-
-                var matchWidth = RegexWidth.Match(tag);
-                if (matchWidth.Success)
-                {
-                    var widthValue = matchWidth.Groups["width"].Value;
-                    if (int.TryParse(widthValue, out var widthIntValue) && widthIntValue < 10)
-                    {
-                        include = false;
-                    }
-                }
-
-                if (include)
-                {
-                    images.Add(match.Groups[1].Value);
-                }
-            }
-
-            foreach (Match match in RegexLinks.Matches(htmlString))
-            {
-                var value = match.Groups[1].Value;
-                if (value.Contains(".jpg") || value.Contains(".png"))
-                {
-                    images.Add(value);
-                }
-            }
-
-            return images;
-        }
-
-        /// <summary>
-        /// Dictionary of timezones.
-        /// </summary>
-        private static readonly Dictionary<string, string[]> TimeZones = new Dictionary<string, string[]>
-        {
-            { "ACDT", new[] { "-1030", "Australian Central Daylight" } },
-            { "ACST", new[] { "-0930", "Australian Central Standard" } },
-            { "ADT", new[] { "+0300", "(US) Atlantic Daylight" } },
-            { "AEDT", new[] { "-1100", "Australian East Daylight" } },
-            { "AEST", new[] { "-1000", "Australian East Standard" } },
-            { "AHDT", new[] { "+0900", string.Empty } },
-            { "AHST", new[] { "+1000", string.Empty } },
-            { "AST", new[] { "+0400", "(US) Atlantic Standard" } },
-            { "AT", new[] { "+0200", "Azores" } },
-            { "AWDT", new[] { "-0900", "Australian West Daylight" } },
-            { "AWST", new[] { "-0800", "Australian West Standard" } },
-            { "BAT", new[] { "-0300", "Baghdad" } },
-            { "BDST", new[] { "-0200", "British Double Summer" } },
-            { "BET", new[] { "+1100", "Bering Standard" } },
-            { "BST", new[] { "+0300", "Brazil Standard" } },
-            { "BT", new[] { "-0300", "Baghdad" } },
-            { "BZT2", new[] { "+0300", "Brazil Zone 2" } },
-            { "CADT", new[] { "-1030", "Central Australian Daylight" } },
-            { "CAST", new[] { "-0930", "Central Australian Standard" } },
-            { "CAT", new[] { "+1000", "Central Alaska" } },
-            { "CCT", new[] { "-0800", "China Coast" } },
-            { "CDT", new[] { "+0500", "(US) Central Daylight" } },
-            { "CED", new[] { "-0200", "Central European Daylight" } },
-            { "CET", new[] { "-0100", "Central European" } },
-            { "CST", new[] { "+0600", "(US) Central Standard" } },
-            { "EAST", new[] { "-1000", "Eastern Australian Standard" } },
-            { "EDT", new[] { "+0400", "(US) Eastern Daylight" } },
-            { "EED", new[] { "-0300", "Eastern European Daylight" } },
-            { "EET", new[] { "-0200", "Eastern Europe" } },
-            { "EEST", new[] { "-0300", "Eastern Europe Summer" } },
-            { "EST", new[] { "+0500", "(US) Eastern Standard" } },
-            { "FST", new[] { "-0200", "French Summer" } },
-            { "FWT", new[] { "-0100", "French Winter" } },
-            { "GMT", new[] { "+0000", "Greenwich Mean" } },
-            { "GST", new[] { "-1000", "Guam Standard" } },
-            { "HDT", new[] { "+0900", "Hawaii Daylight" } },
-            { "HST", new[] { "+1000", "Hawaii Standard" } },
-            { "IDLE", new[] { "-1200", "International Date Line East" } },
-            { "IDLW", new[] { "+1200", "International Date Line West" } },
-            { "IST", new[] { "-0530", "Indian Standard" } },
-            { "IT", new[] { "-0330", "Iran" } },
-            { "JST", new[] { "-0900", "Japan Standard" } },
-            { "JT", new[] { "-0700", "Java" } },
-            { "MDT", new[] { "+0600", "(US) Mountain Daylight" } },
-            { "MED", new[] { "-0200", "Middle European Daylight" } },
-            { "MET", new[] { "-0100", "Middle European" } },
-            { "MEST", new[] { "-0200", "Middle European Summer" } },
-            { "MEWT", new[] { "-0100", "Middle European Winter" } },
-            { "MST", new[] { "+0700", "(US) Mountain Standard" } },
-            { "MT", new[] { "-0800", "Moluccas" } },
-            { "NDT", new[] { "+0230", "Newfoundland Daylight" } },
-            { "NFT", new[] { "+0330", "Newfoundland" } },
-            { "NT", new[] { "+1100", "Nome" } },
-            { "NST", new[] { "-0630", "North Sumatra" } },
-            { "NZ", new[] { "-1100", "New Zealand " } },
-            { "NZST", new[] { "-1200", "New Zealand Standard" } },
-            { "NZDT", new[] { "-1300", "New Zealand Daylight" } },
-            { "NZT", new[] { "-1200", "New Zealand" } },
-            { "PDT", new[] { "+0700", "(US) Pacific Daylight" } },
-            { "PST", new[] { "+0800", "(US) Pacific Standard" } },
-            { "ROK", new[] { "-0900", "Republic of Korea" } },
-            { "SAD", new[] { "-1000", "South Australia Daylight" } },
-            { "SAST", new[] { "-0900", "South Australia Standard" } },
-            { "SAT", new[] { "-0900", "South Australia Standard" } },
-            { "SDT", new[] { "-1000", "South Australia Daylight" } },
-            { "SST", new[] { "-0200", "Swedish Summer" } },
-            { "SWT", new[] { "-0100", "Swedish Winter" } },
-            { "USZ3", new[] { "-0400", "Volga Time (Russia)" } },
-            { "USZ4", new[] { "-0500", "Ural Time (Russia)" } },
-            { "USZ5", new[] { "-0600", "West-Siberian Time (Russia) " } },
-            { "USZ6", new[] { "-0700", "Yenisei Time (Russia)" } },
-            { "UT", new[] { "+0000", "Universal Coordinated" } },
-            { "UTC", new[] { "+0000", "Universal Coordinated" } },
-            { "UZ10", new[] { "-1100", "Okhotsk Time (Russia)" } },
-            { "WAT", new[] { "+0100", "West Africa" } },
-            { "WET", new[] { "+0000", "West European" } },
-            { "WST", new[] { "-0800", "West Australian Standard" } },
-            { "YDT", new[] { "+0800", "Yukon Daylight" } },
-            { "YST", new[] { "+0900", "Yukon Standard" } }
-        };
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/RssParser.cs b/Microsoft.Toolkit.Parsers/Rss/RssParser.cs
deleted file mode 100644
index e3f1952523c..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/RssParser.cs
+++ /dev/null
@@ -1,43 +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.Collections.Generic;
-using System.Xml.Linq;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// The RSS Parser allows you to parse an RSS content String into RSS Schema.
-    /// </summary>
-    public class RssParser : IParser<RssSchema>
-    {
-        /// <summary>
-        /// Parse an RSS content string into RSS Schema.
-        /// </summary>
-        /// <param name="data">Input string.</param>
-        /// <returns>Strong type.</returns>
-        public IEnumerable<RssSchema> Parse(string data)
-        {
-            if (string.IsNullOrEmpty(data))
-            {
-                return null;
-            }
-
-            var doc = XDocument.Parse(data);
-            var type = BaseRssParser.GetFeedType(doc);
-
-            BaseRssParser rssParser;
-            if (type == RssType.Rss)
-            {
-                rssParser = new Rss2Parser();
-            }
-            else
-            {
-                rssParser = new AtomParser();
-            }
-
-            return rssParser.LoadFeed(doc);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Rss/RssSchema.cs b/Microsoft.Toolkit.Parsers/Rss/RssSchema.cs
deleted file mode 100644
index 3ea8b7453ee..00000000000
--- a/Microsoft.Toolkit.Parsers/Rss/RssSchema.cs
+++ /dev/null
@@ -1,65 +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 System.Collections.Generic;
-
-namespace Microsoft.Toolkit.Parsers.Rss
-{
-    /// <summary>
-    /// Implementation of the RssSchema class.
-    /// </summary>
-    public class RssSchema : SchemaBase
-    {
-        /// <summary>
-        /// Gets or sets title.
-        /// </summary>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets summary.
-        /// </summary>
-        public string Summary { get; set; }
-
-        /// <summary>
-        /// Gets or sets content.
-        /// </summary>
-        public string Content { get; set; }
-
-        /// <summary>
-        /// Gets or sets image Url.
-        /// </summary>
-        public string ImageUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets extra Image Url.
-        /// </summary>
-        public string ExtraImageUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets media Url.
-        /// </summary>
-        public string MediaUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets feed Url.
-        /// </summary>
-        public string FeedUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets author.
-        /// </summary>
-        public string Author { get; set; }
-
-        /// <summary>
-        /// Gets or sets publish Date.
-        /// </summary>
-        public DateTime PublishDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets item's categories.
-        /// </summary>
-        public IEnumerable<string> Categories { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 5476e2d5c12..5d4e14a81fb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -762,9 +762,6 @@
     <Compile Include="SamplePages\RemoteDevicePicker\RemoteDevicePickerControlPage.xaml.cs">
       <DependentUpon>RemoteDevicePickerControlPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\RssParser\RssParserPage.xaml.cs">
-      <DependentUpon>RssParserPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\RadialGradientBrush\RadialGradientBrushPage.xaml.cs">
       <DependentUpon>RadialGradientBrushPage.xaml</DependentUpon>
     </Compile>
@@ -1226,10 +1223,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\RssParser\RssParserPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SamplePages\ScrollViewerExtensions\ScrollViewerExtensionsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml
deleted file mode 100644
index e844fc9773d..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Page
-    x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.RssParserPage"
-    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:rss="using:Microsoft.Toolkit.Parsers.Rss"
-    mc:Ignorable="d">
-
-    <Grid Padding="12">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <StackPanel>
-            <TextBox x:Name="UrlBox"
-                 Header="Url"
-                 Text="{x:Bind Url, Mode=TwoWay}" />
-
-            <Button
-                Content="Load"
-                Margin="0,10,0,0"
-                Click="{x:Bind ParseRSS}" />
-
-            <TextBlock Text="Feed" Margin="0,10,0,0" />
-        </StackPanel>
-
-        <ListView
-            x:Name="RSSList"
-            Grid.Row="1"
-            ItemsSource="{x:Bind RSSFeed}"
-            SelectionChanged="RSSList_SelectionChanged">
-            <ListView.ItemTemplate>
-                <DataTemplate x:DataType="rss:RssSchema">
-                    <StackPanel Padding="10">
-                        <TextBlock
-                            Text="{x:Bind Title}"
-                            FontSize="18"
-                            FontWeight="Bold" />
-                        <TextBlock Text="{x:Bind Summary}" />
-                    </StackPanel>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml.cs
deleted file mode 100644
index 9cdf4e0d8c2..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RssParser/RssParserPage.xaml.cs
+++ /dev/null
@@ -1,70 +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 System.Collections.ObjectModel;
-using System.Net.Http;
-using Microsoft.Toolkit.Parsers.Rss;
-using Windows.System;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class RssParserPage : Page
-    {
-        public ObservableCollection<RssSchema> RSSFeed { get; } = new ObservableCollection<RssSchema>();
-
-        public RssParserPage()
-        {
-            this.InitializeComponent();
-            ParseRSS();
-        }
-
-        public string Url { get; set; } = "https://visualstudiomagazine.com/rss-feeds/news.aspx";
-
-        public async void ParseRSS()
-        {
-            string feed = null;
-            RSSFeed.Clear();
-
-            using (var client = new HttpClient())
-            {
-                try
-                {
-                    feed = await client.GetStringAsync(Url);
-                }
-                catch
-                {
-                }
-            }
-
-            if (feed != null)
-            {
-                var parser = new RssParser();
-                var rss = parser.Parse(feed);
-
-                foreach (var element in rss)
-                {
-                    RSSFeed.Add(element);
-                }
-            }
-        }
-
-        private async void RSSList_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (RSSList.SelectedItem is RssSchema rssItem)
-            {
-                try
-                {
-                    await Launcher.LaunchUriAsync(new Uri(rssItem.FeedUrl));
-                }
-                catch
-                {
-                }
-            }
-
-            RSSList.SelectedItem = null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 2b8f564b7bb..955dd1f451d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -855,14 +855,6 @@
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/MarkdownParser.md"
       },
-      {
-        "Name": "RSS Parser",
-        "Type": "RssParserPage",
-        "Subcategory": "Parser",
-        "About": "The RSS Parser allows you to parse an RSS content String into RSS Schema.",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/RssParser.md"
-      },
       {
         "Name": "LiveTile",
         "Type": "LiveTilePage",
diff --git a/readme.md b/readme.md
index aef7bc42f2b..dbfd2321508 100644
--- a/readme.md
+++ b/readme.md
@@ -35,7 +35,7 @@ Once you do a search, you should see a list similar to the one below (versions m
 | --- | --- |
 | Microsoft.Toolkit | .NET Standard NuGet package containing common code |
 | Microsoft.Toolkit.HighPerformance | .NET Standard and .NET Core NuGet package with performance oriented helpers, extensions, etc. |
-| Microsoft.Toolkit.Parsers | .NET Standard NuGet package containing cross-platform parsers, such as Markdown and RSS |
+| Microsoft.Toolkit.Parsers | .NET Standard NuGet package containing cross-platform parsers, such as Markdown |
 | Microsoft.Toolkit.Services | .NET Standard NuGet package containing cross-platform services helpers, such as LinkedIn, Microsoft Graph, Twitter and more |
 | Microsoft.Toolkit.Uwp | Main NuGet package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. |
 | Microsoft.Toolkit.Uwp.Notifications | Notifications Package - Generate tile, toast, and badge notifications for Windows 10 via code.  Includes intellisense support to avoid having to use the XML syntax |

From 95be0990894371ead376d3ce96c13fa5bf84b2cd Mon Sep 17 00:00:00 2001
From: Herrick Spencer <herricks@microsoft.com>
Date: Thu, 20 Aug 2020 16:02:22 -0700
Subject: [PATCH 411/595] Revert spelling 'fix' in
 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs

the word uncancelable is ok (though all spelling checkers flag it)

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 .../CollectionViews/CollectionView.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
index 87fe287020b..0f55b7b1fdc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
@@ -1258,7 +1258,7 @@ private enum CollectionViewFlags
         internal const string IsCurrentBeforeFirstPropertyName = "IsCurrentBeforeFirst";
         internal const string IsCurrentAfterLastPropertyName = "IsCurrentAfterLast";
 
-        // since there's nothing in the uncancel-able event args that is mutable,
+        // since there's nothing in the uncancelable event args that is mutable,
         // just create one instance to be used universally.
         private static readonly CurrentChangingEventArgs UncancelableCurrentChangingEventArgs = new CurrentChangingEventArgs(false);
         private static readonly string IEnumerableT = typeof(IEnumerable<>).Name;

From c9f82103eb9a404ea844cdbeb645b8851ed9ef5c Mon Sep 17 00:00:00 2001
From: Herrick Spencer <herricks@microsoft.com>
Date: Thu, 20 Aug 2020 16:05:01 -0700
Subject: [PATCH 412/595] Fix minor spacing issue in
 Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs

add a space for clarity in comment

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
index 527bc406e39..d2859be2a94 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
@@ -184,7 +184,7 @@ protected override Size MeasureOverride(Size availableSize)
             }
 
             // update value with the last line
-            // if the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
+            // if the last loop is (parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
             // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
             // for the last condition it is zeros so adding it will make no difference
             // this way is faster than an if condition in every loop for checking the last item
@@ -257,4 +257,4 @@ void Arrange(UIElement child, bool isLast = false)
             return finalSize;
         }
     }
-}
\ No newline at end of file
+}

From ea41c89ece2ba97fe0c0652439e76bc4ae67473b Mon Sep 17 00:00:00 2001
From: Herrick Spencer <herricks@microsoft.com>
Date: Thu, 20 Aug 2020 16:10:56 -0700
Subject: [PATCH 413/595] Apply suggestions from code review

Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 .../Extensions/TextBoxMask/TextBoxMask.cs                     | 4 ++--
 Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index 7a27722de68..b898498d37f 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -340,7 +340,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
 
             if (!isDeleteOrBackspace)
             {
-                // Case change happened due to user input
+                // In case the change happened due to user input
                 var selectedChar = textbox.SelectionStart > 0 ?
                                     textbox.Text[textbox.SelectionStart - 1] :
                                     placeHolder;
@@ -429,4 +429,4 @@ private static int GetSelectionStart(string mask, List<int> escapedChars, int se
             return selectionIndex;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs b/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
index 39fc89aeca2..188e8b6d4c5 100644
--- a/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp/Deferred/DeferredCancelEventArgs.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Toolkit.Uwp.Deferred
 {
     /// <summary>
-    /// <see cref="DeferredEventArgs"/> which can also be Canceled.
+    /// <see cref="DeferredEventArgs"/> which can also be canceled.
     /// </summary>
     public class DeferredCancelEventArgs : DeferredEventArgs
     {

From 0b57e6643afe45200a017b5f9a72a57917f65b97 Mon Sep 17 00:00:00 2001
From: Herrick Spencer <herricks@microsoft.com>
Date: Thu, 20 Aug 2020 16:14:18 -0700
Subject: [PATCH 414/595] Update per review comment

---
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index b898498d37f..e3463d79e1e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -45,7 +45,7 @@ private static void Textbox_Loaded(object sender, RoutedEventArgs e)
         {
             var textbox = (TextBox)sender;
 
-            // in case no value is provided us it as normal textbox
+            // in case no value is provided, use it as normal textbox
             var mask = textbox.GetValue(MaskProperty) as string;
             if (string.IsNullOrWhiteSpace(mask))
             {

From 2a73240dcd50b67941d559b1904545e70f050e8c Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 20 Aug 2020 17:19:30 -0700
Subject: [PATCH 415/595] Update Microsoft.Toolkit.Uwp.SampleApp/readme.md

---
 Microsoft.Toolkit.Uwp.SampleApp/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/readme.md b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
index a314fad44a3..846f1f665ef 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/readme.md
+++ b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
@@ -188,7 +188,7 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 > NOTE: When building and running the app in release mode, the branch will automatically be changed to **master** before loading. 
 
-> NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on gitHub, the sample app will use the packaged version
+> NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on GitHub, the sample app will use the packaged version
 
 > NOTE: To test your documentation in the sample app while running in debug mode, the docs repository will need to be cloned in the same folder as this repository and named **WindowsCommunityToolkitDocs**. For example, this folder structure works best:
 > ```

From 5e3e31ac92123b974944aa8db6696192fa558d97 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 20 Aug 2020 17:20:20 -0700
Subject: [PATCH 416/595] Update
 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs

---
 .../CollectionViews/CollectionView.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
index 0f55b7b1fdc..9b24e6032f0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/CollectionView.cs
@@ -772,7 +772,7 @@ protected bool OKToChangeCurrent()
         }
 
         /// <summary>
-        /// Raise a CurrentChanging event that is not cancel-able.
+        /// Raise a CurrentChanging event that is not cancelable.
         /// Internally, CurrentPosition is set to -1.
         /// This is called by CollectionChanges (Remove and Refresh) that affect the CurrentItem.
         /// </summary>

From 06cc52062cf2b7e7555da43dd83c96f5a3dbadca Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 22 Aug 2020 00:45:31 +0200
Subject: [PATCH 417/595] Added cancelation support for async commands

---
 .../Input/AsyncRelayCommand.cs                | 65 ++++++++++++++++++-
 .../Input/AsyncRelayCommand{T}.cs             | 65 ++++++++++++++++++-
 .../Input/Interfaces/IAsyncRelayCommand.cs    | 19 ++++++
 3 files changed, 145 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index b2c74b300db..c46a3c174bd 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
@@ -20,13 +21,25 @@ public sealed class AsyncRelayCommand : ObservableObject, IAsyncRelayCommand
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute"/> is used.
         /// </summary>
-        private readonly Func<Task> execute;
+        private readonly Func<Task>? execute;
+
+        /// <summary>
+        /// The cancelable <see cref="Func{T,TResult}"/> to invoke when <see cref="Execute"/> is used.
+        /// </summary>
+        /// <remarks>Only one between this and <see cref="execute"/> is not <see langword="null"/>.</remarks>
+        private readonly Func<CancellationToken, Task>? cancellableExecute;
 
         /// <summary>
         /// The optional action to invoke when <see cref="CanExecute"/> is used.
         /// </summary>
         private readonly Func<bool>? canExecute;
 
+        /// <summary>
+        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancellableExecute"/>.
+        /// </summary>
+        /// <remarks>This is only used when <see cref="cancellableExecute"/> is not <see langword="null"/>.</remarks>
+        private CancellationTokenSource? cancellationTokenSource;
+
         /// <inheritdoc/>
         public event EventHandler? CanExecuteChanged;
 
@@ -42,6 +55,15 @@ public AsyncRelayCommand(Func<Task> execute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class that can always execute.
         /// </summary>
+        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        public AsyncRelayCommand(Func<CancellationToken, Task> cancellableExecute)
+        {
+            this.cancellableExecute = cancellableExecute;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
+        /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
         public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
@@ -50,6 +72,17 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
             this.canExecute = canExecute;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
+        /// </summary>
+        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        public AsyncRelayCommand(Func<CancellationToken, Task> cancellableExecute, Func<bool> canExecute)
+        {
+            this.cancellableExecute = cancellableExecute;
+            this.canExecute = canExecute;
+        }
+
         private Task? executionTask;
 
         /// <inheritdoc/>
@@ -65,6 +98,12 @@ private set
             }
         }
 
+        /// <inheritdoc/>
+        public bool CanBeCanceled => !(this.cancellableExecute is null);
+
+        /// <inheritdoc/>
+        public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
+
         /// <inheritdoc/>
         public bool IsRunning => ExecutionTask?.IsCompleted == false;
 
@@ -92,10 +131,32 @@ public Task ExecuteAsync(object? parameter)
         {
             if (CanExecute(parameter))
             {
-                return ExecutionTask = this.execute();
+                // Non cancelable command delegate
+                if (!(this.execute is null))
+                {
+                    return ExecutionTask = this.execute();
+                }
+
+                // Cancel the previous operation, if one is pending
+                this.cancellationTokenSource?.Cancel();
+
+                var cancellationTokenSource = this.cancellationTokenSource = new CancellationTokenSource();
+
+                OnPropertyChanged(nameof(IsCancellationRequested));
+
+                // Invoke the cancelable command delegate with a new linked token
+                return ExecutionTask = this.cancellableExecute!(cancellationTokenSource.Token);
             }
 
             return Task.CompletedTask;
         }
+
+        /// <inheritdoc/>
+        public void Cancel()
+        {
+            this.cancellationTokenSource?.Cancel();
+
+            OnPropertyChanged(nameof(IsCancellationRequested));
+        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 3d8d733ddcd..cd2162ca46b 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
@@ -18,13 +19,23 @@ public sealed class AsyncRelayCommand<T> : ObservableObject, IAsyncRelayCommand<
         /// <summary>
         /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
         /// </summary>
-        private readonly Func<T, Task> execute;
+        private readonly Func<T, Task>? execute;
+
+        /// <summary>
+        /// The cancelable <see cref="Func{T1,T2,TResult}"/> to invoke when <see cref="Execute(object?)"/> is used.
+        /// </summary>
+        private readonly Func<T, CancellationToken, Task>? cancellableExecute;
 
         /// <summary>
         /// The optional action to invoke when <see cref="CanExecute(T)"/> is used.
         /// </summary>
         private readonly Func<T, bool>? canExecute;
 
+        /// <summary>
+        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancellableExecute"/>.
+        /// </summary>
+        private CancellationTokenSource? cancellationTokenSource;
+
         /// <inheritdoc/>
         public event EventHandler? CanExecuteChanged;
 
@@ -41,6 +52,16 @@ public AsyncRelayCommand(Func<T, Task> execute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class that can always execute.
         /// </summary>
+        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
+        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancellableExecute)
+        {
+            this.cancellableExecute = cancellableExecute;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class.
+        /// </summary>
         /// <param name="execute">The execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
         /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
@@ -50,6 +71,18 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
             this.canExecute = canExecute;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class.
+        /// </summary>
+        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <param name="canExecute">The execution status logic.</param>
+        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
+        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancellableExecute, Func<T, bool> canExecute)
+        {
+            this.cancellableExecute = cancellableExecute;
+            this.canExecute = canExecute;
+        }
+
         private Task? executionTask;
 
         /// <inheritdoc/>
@@ -65,6 +98,12 @@ private set
             }
         }
 
+        /// <inheritdoc/>
+        public bool CanBeCanceled => !(this.cancellableExecute is null);
+
+        /// <inheritdoc/>
+        public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
+
         /// <inheritdoc/>
         public bool IsRunning => ExecutionTask?.IsCompleted == false;
 
@@ -113,7 +152,21 @@ public Task ExecuteAsync(T parameter)
         {
             if (CanExecute(parameter))
             {
-                return ExecutionTask = this.execute(parameter);
+                // Non cancelable command delegate
+                if (!(this.execute is null))
+                {
+                    return ExecutionTask = this.execute(parameter);
+                }
+
+                // Cancel the previous operation, if one is pending
+                this.cancellationTokenSource?.Cancel();
+
+                var cancellationTokenSource = this.cancellationTokenSource = new CancellationTokenSource();
+
+                OnPropertyChanged(nameof(IsCancellationRequested));
+
+                // Invoke the cancelable command delegate with a new linked token
+                return ExecutionTask = this.cancellableExecute!(parameter, cancellationTokenSource.Token);
             }
 
             return Task.CompletedTask;
@@ -124,5 +177,13 @@ public Task ExecuteAsync(object? parameter)
         {
             return ExecuteAsync((T)parameter!);
         }
+
+        /// <inheritdoc/>
+        public void Cancel()
+        {
+            this.cancellationTokenSource?.Cancel();
+
+            OnPropertyChanged(nameof(IsCancellationRequested));
+        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
index ea56dfae4e3..39d979ec303 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -18,6 +18,16 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         /// </summary>
         Task? ExecutionTask { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether running operations for this command can be canceled.
+        /// </summary>
+        public bool CanBeCanceled { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether a cancelation request has been issued for the current operation.
+        /// </summary>
+        public bool IsCancellationRequested { get; }
+
         /// <summary>
         /// Gets a value indicating whether the command currently has a pending operation being executed.
         /// </summary>
@@ -30,5 +40,14 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         /// <param name="parameter">The input parameter.</param>
         /// <returns>The <see cref="Task"/> representing the async operation being executed.</returns>
         Task ExecuteAsync(object? parameter);
+
+        /// <summary>
+        /// Communicates a request for cancelation.
+        /// </summary>
+        /// <remarks>
+        /// If the underlying command is not running, or if it does not support cancelation, this method will perform no action.
+        /// Note that even with a successful cancelation, the completion of the current operation might not be immediate.
+        /// </remarks>
+        void Cancel();
     }
 }

From 06ca18615ce7b693fac63974bf3c9f63bcc26991 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 22 Aug 2020 00:57:46 +0200
Subject: [PATCH 418/595] Fixed spelling to follow conventions

---
 .../Input/AsyncRelayCommand.cs                | 22 +++++++++----------
 .../Input/AsyncRelayCommand{T}.cs             | 20 ++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index c46a3c174bd..f9b41df775d 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -27,7 +27,7 @@ public sealed class AsyncRelayCommand : ObservableObject, IAsyncRelayCommand
         /// The cancelable <see cref="Func{T,TResult}"/> to invoke when <see cref="Execute"/> is used.
         /// </summary>
         /// <remarks>Only one between this and <see cref="execute"/> is not <see langword="null"/>.</remarks>
-        private readonly Func<CancellationToken, Task>? cancellableExecute;
+        private readonly Func<CancellationToken, Task>? cancelableExecute;
 
         /// <summary>
         /// The optional action to invoke when <see cref="CanExecute"/> is used.
@@ -35,9 +35,9 @@ public sealed class AsyncRelayCommand : ObservableObject, IAsyncRelayCommand
         private readonly Func<bool>? canExecute;
 
         /// <summary>
-        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancellableExecute"/>.
+        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancelableExecute"/>.
         /// </summary>
-        /// <remarks>This is only used when <see cref="cancellableExecute"/> is not <see langword="null"/>.</remarks>
+        /// <remarks>This is only used when <see cref="cancelableExecute"/> is not <see langword="null"/>.</remarks>
         private CancellationTokenSource? cancellationTokenSource;
 
         /// <inheritdoc/>
@@ -55,10 +55,10 @@ public AsyncRelayCommand(Func<Task> execute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class that can always execute.
         /// </summary>
-        /// <param name="cancellableExecute">The cancelable execution logic.</param>
-        public AsyncRelayCommand(Func<CancellationToken, Task> cancellableExecute)
+        /// <param name="cancelableExecute">The cancelable execution logic.</param>
+        public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute)
         {
-            this.cancellableExecute = cancellableExecute;
+            this.cancelableExecute = cancelableExecute;
         }
 
         /// <summary>
@@ -75,11 +75,11 @@ public AsyncRelayCommand(Func<Task> execute, Func<bool> canExecute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
         /// </summary>
-        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <param name="cancelableExecute">The cancelable execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
-        public AsyncRelayCommand(Func<CancellationToken, Task> cancellableExecute, Func<bool> canExecute)
+        public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute, Func<bool> canExecute)
         {
-            this.cancellableExecute = cancellableExecute;
+            this.cancelableExecute = cancelableExecute;
             this.canExecute = canExecute;
         }
 
@@ -99,7 +99,7 @@ private set
         }
 
         /// <inheritdoc/>
-        public bool CanBeCanceled => !(this.cancellableExecute is null);
+        public bool CanBeCanceled => !(this.cancelableExecute is null);
 
         /// <inheritdoc/>
         public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
@@ -145,7 +145,7 @@ public Task ExecuteAsync(object? parameter)
                 OnPropertyChanged(nameof(IsCancellationRequested));
 
                 // Invoke the cancelable command delegate with a new linked token
-                return ExecutionTask = this.cancellableExecute!(cancellationTokenSource.Token);
+                return ExecutionTask = this.cancelableExecute!(cancellationTokenSource.Token);
             }
 
             return Task.CompletedTask;
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index cd2162ca46b..83d25155cf6 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -24,7 +24,7 @@ public sealed class AsyncRelayCommand<T> : ObservableObject, IAsyncRelayCommand<
         /// <summary>
         /// The cancelable <see cref="Func{T1,T2,TResult}"/> to invoke when <see cref="Execute(object?)"/> is used.
         /// </summary>
-        private readonly Func<T, CancellationToken, Task>? cancellableExecute;
+        private readonly Func<T, CancellationToken, Task>? cancelableExecute;
 
         /// <summary>
         /// The optional action to invoke when <see cref="CanExecute(T)"/> is used.
@@ -32,7 +32,7 @@ public sealed class AsyncRelayCommand<T> : ObservableObject, IAsyncRelayCommand<
         private readonly Func<T, bool>? canExecute;
 
         /// <summary>
-        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancellableExecute"/>.
+        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancelableExecute"/>.
         /// </summary>
         private CancellationTokenSource? cancellationTokenSource;
 
@@ -52,11 +52,11 @@ public AsyncRelayCommand(Func<T, Task> execute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class that can always execute.
         /// </summary>
-        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <param name="cancelableExecute">The cancelable execution logic.</param>
         /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
-        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancellableExecute)
+        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancelableExecute)
         {
-            this.cancellableExecute = cancellableExecute;
+            this.cancelableExecute = cancelableExecute;
         }
 
         /// <summary>
@@ -74,12 +74,12 @@ public AsyncRelayCommand(Func<T, Task> execute, Func<T, bool> canExecute)
         /// <summary>
         /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class.
         /// </summary>
-        /// <param name="cancellableExecute">The cancelable execution logic.</param>
+        /// <param name="cancelableExecute">The cancelable execution logic.</param>
         /// <param name="canExecute">The execution status logic.</param>
         /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
-        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancellableExecute, Func<T, bool> canExecute)
+        public AsyncRelayCommand(Func<T, CancellationToken, Task> cancelableExecute, Func<T, bool> canExecute)
         {
-            this.cancellableExecute = cancellableExecute;
+            this.cancelableExecute = cancelableExecute;
             this.canExecute = canExecute;
         }
 
@@ -99,7 +99,7 @@ private set
         }
 
         /// <inheritdoc/>
-        public bool CanBeCanceled => !(this.cancellableExecute is null);
+        public bool CanBeCanceled => !(this.cancelableExecute is null);
 
         /// <inheritdoc/>
         public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
@@ -166,7 +166,7 @@ public Task ExecuteAsync(T parameter)
                 OnPropertyChanged(nameof(IsCancellationRequested));
 
                 // Invoke the cancelable command delegate with a new linked token
-                return ExecutionTask = this.cancellableExecute!(parameter, cancellationTokenSource.Token);
+                return ExecutionTask = this.cancelableExecute!(parameter, cancellationTokenSource.Token);
             }
 
             return Task.CompletedTask;

From b8610abd5d281e91680aeaf838abf858ded49d60 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 22 Aug 2020 01:16:29 +0200
Subject: [PATCH 419/595] Added unit tests for cancelable async commands

---
 .../Mvvm/Test_AsyncRelayCommand.cs            | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
index 4a10690c6b2..09ff1d35a90 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
@@ -28,6 +28,9 @@ public async Task Test_AsyncRelayCommand_AlwaysEnabled()
             Assert.IsTrue(command.CanExecute(null));
             Assert.IsTrue(command.CanExecute(new object()));
 
+            Assert.IsFalse(command.CanBeCanceled);
+            Assert.IsFalse(command.IsCancellationRequested);
+
             (object, EventArgs) args = default;
 
             command.CanExecuteChanged += (s, e) => args = (s, e);
@@ -75,6 +78,9 @@ public void Test_AsyncRelayCommand_WithCanExecuteFunctionTrue()
             Assert.IsTrue(command.CanExecute(null));
             Assert.IsTrue(command.CanExecute(new object()));
 
+            Assert.IsFalse(command.CanBeCanceled);
+            Assert.IsFalse(command.IsCancellationRequested);
+
             command.Execute(null);
 
             Assert.AreEqual(ticks, 1);
@@ -100,6 +106,9 @@ public void Test_AsyncRelayCommand_WithCanExecuteFunctionFalse()
             Assert.IsFalse(command.CanExecute(null));
             Assert.IsFalse(command.CanExecute(new object()));
 
+            Assert.IsFalse(command.CanBeCanceled);
+            Assert.IsFalse(command.IsCancellationRequested);
+
             command.Execute(null);
 
             Assert.AreEqual(ticks, 0);
@@ -108,5 +117,34 @@ public void Test_AsyncRelayCommand_WithCanExecuteFunctionFalse()
 
             Assert.AreEqual(ticks, 0);
         }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_AsyncRelayCommand_WithCancellation()
+        {
+            TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
+
+            var command = new AsyncRelayCommand(token => tcs.Task);
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute(new object()));
+
+            Assert.IsTrue(command.CanBeCanceled);
+            Assert.IsFalse(command.IsCancellationRequested);
+
+            command.Execute(null);
+
+            Assert.IsFalse(command.IsCancellationRequested);
+
+            command.Cancel();
+
+            Assert.IsTrue(command.IsCancellationRequested);
+
+            tcs.SetResult(null);
+
+            await command.ExecutionTask!;
+
+            Assert.IsTrue(command.IsCancellationRequested);
+        }
     }
 }

From 38680eaab223e2680fa5de1325a63e09970cce50 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 23 Aug 2020 11:50:33 +0200
Subject: [PATCH 420/595] Removed unnecessary visibility modifiers

---
 Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
index 39d979ec303..c3f663feb20 100644
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
@@ -21,12 +21,12 @@ public interface IAsyncRelayCommand : IRelayCommand, INotifyPropertyChanged
         /// <summary>
         /// Gets a value indicating whether running operations for this command can be canceled.
         /// </summary>
-        public bool CanBeCanceled { get; }
+        bool CanBeCanceled { get; }
 
         /// <summary>
         /// Gets a value indicating whether a cancelation request has been issued for the current operation.
         /// </summary>
-        public bool IsCancellationRequested { get; }
+        bool IsCancellationRequested { get; }
 
         /// <summary>
         /// Gets a value indicating whether the command currently has a pending operation being executed.

From b39fbc0475f68a3682e68321e034957d487bebe7 Mon Sep 17 00:00:00 2001
From: Riza Marhaban <rizamarhaban@users.noreply.github.com>
Date: Mon, 24 Aug 2020 07:56:00 +0800
Subject: [PATCH 421/595] Update
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs

Removing extra line

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index 37a1b005215..ee1c044876e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -296,7 +296,6 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
                         deleteBackspaceIndex++;
                     }
                 }
-
             }
 
             // case adding data at the end of the textbox
@@ -432,4 +431,4 @@ private static int GetSelectionStart(string mask, List<int> escapedChars, int se
             return selectionIndex;
         }
     }
-}
\ No newline at end of file
+}

From 6e609eae91bece422362b18403f219b68df1efc7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 24 Aug 2020 18:23:37 +0200
Subject: [PATCH 422/595] Fixed missing uppercase

---
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index e3463d79e1e..2a897b2fdea 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -45,7 +45,7 @@ private static void Textbox_Loaded(object sender, RoutedEventArgs e)
         {
             var textbox = (TextBox)sender;
 
-            // in case no value is provided, use it as normal textbox
+            // In case no value is provided, use it as normal textbox
             var mask = textbox.GetValue(MaskProperty) as string;
             if (string.IsNullOrWhiteSpace(mask))
             {

From e514869295465859e56ca720ecc94ee353b9911c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 25 Aug 2020 12:13:37 +0200
Subject: [PATCH 423/595] Added missing contravariant type argument modifier

---
 Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index e046d056c07..f008ba14a5a 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <typeparam name="TMessage">The type of message to receive.</typeparam>
     /// <param name="recipient">The recipient that is receiving the message.</param>
     /// <param name="message">The message being received.</param>
-    public delegate void MessageHandler<TMessage>(object recipient, TMessage message);
+    public delegate void MessageHandler<in TMessage>(object recipient, TMessage message);
 
     /// <summary>
     /// An interface for a type providing the ability to exchange messages between different objects.

From 91fdad0c3cc9859e29939063ad780eb07241964a Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 26 Aug 2020 11:23:00 +0200
Subject: [PATCH 424/595] fix show/hide/show sequence not working

---
 .../InAppNotification/InAppNotification.Events.cs         | 8 ++++++++
 .../InAppNotification/InAppNotification.cs                | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
index 9f4451fc4a1..7b1c4baa3fd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
@@ -43,6 +43,14 @@ private void DismissTimer_Tick(object sender, object e)
             Dismiss(InAppNotificationDismissKind.Timeout);
         }
 
+        private void OnCurrentStateChanging(object sender, VisualStateChangedEventArgs e)
+        {
+            if (e.NewState.Name == StateContentVisible)
+            {
+                Visibility = Visibility.Visible;
+            }
+        }
+
         private void OnCurrentStateChanged(object sender, VisualStateChangedEventArgs e)
         {
             switch (e.NewState.Name)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index fb987188fa2..708886b45dd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -51,6 +51,7 @@ protected override void OnApplyTemplate()
 
             if (_visualStateGroup != null)
             {
+                _visualStateGroup.CurrentStateChanging -= OnCurrentStateChanging;
                 _visualStateGroup.CurrentStateChanged -= OnCurrentStateChanged;
             }
 
@@ -67,7 +68,8 @@ protected override void OnApplyTemplate()
 
             if (_visualStateGroup != null)
             {
-                _visualStateGroup.CurrentStateChanged += OnCurrentStateChanged;
+                _visualStateGroup.CurrentStateChanging += OnCurrentStateChanging;
+                _visualStateGroup.CurrentStateChanged += OnCurrentStateChanged;                
             }
 
             var firstNotification = _stackedNotificationOptions.FirstOrDefault();

From bd981f6eb62c00c210f1ff8ce457e069e2932f5e Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <chohfi@outlook.com>
Date: Wed, 26 Aug 2020 12:05:57 -0700
Subject: [PATCH 425/595] Update
 Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs

---
 .../InAppNotification/InAppNotification.cs                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 708886b45dd..38ddced4e5e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -69,7 +69,7 @@ protected override void OnApplyTemplate()
             if (_visualStateGroup != null)
             {
                 _visualStateGroup.CurrentStateChanging += OnCurrentStateChanging;
-                _visualStateGroup.CurrentStateChanged += OnCurrentStateChanged;                
+                _visualStateGroup.CurrentStateChanged += OnCurrentStateChanged;
             }
 
             var firstNotification = _stackedNotificationOptions.FirstOrDefault();

From 31b443b9380384861f0f22b17f0735966409eb88 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 27 Aug 2020 18:21:03 -0700
Subject: [PATCH 426/595] Created UITest using WinUI's shared infrastructure.

---
 UITests/UITests.App/App.xaml                  |   7 +
 UITests/UITests.App/App.xaml.cs               |  85 ++++++++
 .../Assets/LockScreenLogo.scale-200.png       | Bin 0 -> 1430 bytes
 .../Assets/SplashScreen.scale-200.png         | Bin 0 -> 7700 bytes
 .../Assets/Square150x150Logo.scale-200.png    | Bin 0 -> 2937 bytes
 .../Assets/Square44x44Logo.scale-200.png      | Bin 0 -> 1647 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes
 UITests/UITests.App/Assets/StoreLogo.png      | Bin 0 -> 1451 bytes
 .../Assets/Wide310x150Logo.scale-200.png      | Bin 0 -> 3204 bytes
 UITests/UITests.App/MainPage.xaml             |  19 ++
 UITests/UITests.App/MainPage.xaml.cs          |  15 ++
 UITests/UITests.App/Package.appxmanifest      |  49 +++++
 .../UITests.App/Properties/AssemblyInfo.cs    |  26 +++
 UITests/UITests.App/Properties/Default.rd.xml |  31 +++
 UITests/UITests.App/UITests.App.csproj        | 184 ++++++++++++++++++
 .../UITests.App/UITests.App_TemporaryKey.pfx  | Bin 0 -> 2528 bytes
 UITests/UITests.Tests.MSTest/MSTestInterop.cs | 152 +++++++++++++++
 .../UITests.Tests.MSTest.csproj               |  29 +++
 UITests/UITests.Tests.Shared/TestAssembly.cs  |  29 +++
 UITests/UITests.Tests.Shared/Tests.cs         |  90 +++++++++
 .../UITests.Tests.Shared.projitems            |  15 ++
 .../UITests.Tests.Shared.shproj               |  13 ++
 .../UITests.Tests.TAEF.csproj                 |  49 +++++
 Windows Community Toolkit.sln                 | 127 +++++++++++-
 24 files changed, 916 insertions(+), 4 deletions(-)
 create mode 100644 UITests/UITests.App/App.xaml
 create mode 100644 UITests/UITests.App/App.xaml.cs
 create mode 100644 UITests/UITests.App/Assets/LockScreenLogo.scale-200.png
 create mode 100644 UITests/UITests.App/Assets/SplashScreen.scale-200.png
 create mode 100644 UITests/UITests.App/Assets/Square150x150Logo.scale-200.png
 create mode 100644 UITests/UITests.App/Assets/Square44x44Logo.scale-200.png
 create mode 100644 UITests/UITests.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 create mode 100644 UITests/UITests.App/Assets/StoreLogo.png
 create mode 100644 UITests/UITests.App/Assets/Wide310x150Logo.scale-200.png
 create mode 100644 UITests/UITests.App/MainPage.xaml
 create mode 100644 UITests/UITests.App/MainPage.xaml.cs
 create mode 100644 UITests/UITests.App/Package.appxmanifest
 create mode 100644 UITests/UITests.App/Properties/AssemblyInfo.cs
 create mode 100644 UITests/UITests.App/Properties/Default.rd.xml
 create mode 100644 UITests/UITests.App/UITests.App.csproj
 create mode 100644 UITests/UITests.App/UITests.App_TemporaryKey.pfx
 create mode 100644 UITests/UITests.Tests.MSTest/MSTestInterop.cs
 create mode 100644 UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
 create mode 100644 UITests/UITests.Tests.Shared/TestAssembly.cs
 create mode 100644 UITests/UITests.Tests.Shared/Tests.cs
 create mode 100644 UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
 create mode 100644 UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj
 create mode 100644 UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj

diff --git a/UITests/UITests.App/App.xaml b/UITests/UITests.App/App.xaml
new file mode 100644
index 00000000000..74e9cd2df91
--- /dev/null
+++ b/UITests/UITests.App/App.xaml
@@ -0,0 +1,7 @@
+<Application
+    x:Class="UITests.App.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:UITests.App">
+
+</Application>
diff --git a/UITests/UITests.App/App.xaml.cs b/UITests/UITests.App/App.xaml.cs
new file mode 100644
index 00000000000..122c982d299
--- /dev/null
+++ b/UITests/UITests.App/App.xaml.cs
@@ -0,0 +1,85 @@
+using System;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace UITests.App
+{
+    public sealed partial class App
+    {
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// Invoked when the application is launched normally by the end user.  Other entry points
+        /// will be used such as when the application is launched to open a specific file.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        {
+            Frame rootFrame = Window.Current.Content as Frame;
+
+            // Do not repeat app initialization when the Window already has content,
+            // just ensure that the window is active
+            if (rootFrame == null)
+            {
+                // Create a Frame to act as the navigation context and navigate to the first page
+                rootFrame = new Frame();
+
+                rootFrame.NavigationFailed += OnNavigationFailed;
+
+                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+                {
+                    // TODO: Load state from previously suspended application
+                }
+
+                // Place the frame in the current Window
+                Window.Current.Content = rootFrame;
+            }
+
+            if (e.PrelaunchActivated == false)
+            {
+                if (rootFrame.Content == null)
+                {
+                    // When the navigation stack isn't restored navigate to the first page,
+                    // configuring the new page by passing required information as a navigation
+                    // parameter
+                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
+                }
+
+                // Ensure the current window is active
+                Window.Current.Activate();
+            }
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// Invoked when application execution is being suspended.  Application state is saved
+        /// without knowing whether the application will be terminated or resumed with the contents
+        /// of memory still intact.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+
+            // TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}
diff --git a/UITests/UITests.App/Assets/LockScreenLogo.scale-200.png b/UITests/UITests.App/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3
GIT binary patch
literal 1430
zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@!
zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT
z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o
zH-bvQi|wt~L7q<c#Bs@6tJZpsaDp5#@^Kxb76?JKPM4Rjg?OPEsE7|VN<kaCGX4#U
zNTLm`F?$G4$N`$9k`4t_b(DF9j%I-s(fmV5p2k4~0ig1T7HA2EIn9Qy+vVUsevG5Y
zx{BItLpMm(dMXfytN_Gpv|s{3(g?#ENwbAvnU@d>$~a-gDFP!{&TQfc3fX*6=uHv*
zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M
zIf%q9@;<puwV{ydMhJnB$FpTP7~V`2Oc}26A)GW4cpwmuYh636R)YU&Y^xpiwub;-
z3Bq!lBEWk1a}r>fyT?0<D?&D0xgx=$@GVYRXbXU#>UP>tcw-bLkz;s2LlKl2qeP0w
zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ
ztnxttBz#NI_a@f<SS;sI0I$l5SC(56T~N^^t8%zW4j~T5dexEVYowqkN5Z-BGHpcd
z1d8+q5Q`K!fUM`4leXai7{C&K6Nxc?hQWB61{h0|4Cb>k7SU`WtrpsfZsNs9^0(2a
z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2L<e7iLm
zP}mwR5QOujz`+rgnOi!Y{({?C=+*8leK`I4)q-bwZ~S$=`Qx8za!;_&ojSySG^`y-
zUwxr;y18tmHR*DH-R#Zfn@dafJ#VG;#JXCA1?Fhi?=z+K#EYHSuZ6R;t9!2P-`Czg
zntSi!KX=pneo0;EVH+kX{Tbnm^ke?~Z}v~j1(%4Y2eEUe-ebObqI@uC5e<?ngPC8q
zexSeKJ6Lye>flg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7
zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ
zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH
z&(f2wz_Y0??Tf|g;?|1Znw6}6U43<uVfr(7fnD33UXp<u^(nDoL&FaIfW9||8X7Y8
zWBR>Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV
yGvCsSX<sgWK5pRdjuceaUA*+*;fQZyG$}(jP`_}c_gGYm|0&(BGUuqhq31shAo>*m

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/SplashScreen.scale-200.png b/UITests/UITests.App/Assets/SplashScreen.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9
GIT binary patch
literal 7700
zcmeHLYj~4Yw%(;oxoEH#Kxq-eR|+VkP17b#Vk;?4QwkI+A{L04G+#<<(x#Un<sy7o
zz=T6NjRGwK((y9#Jd~ai1v`ouo~bn2s(1znq3XoSC<rJj6s6#tcYP_&{P3B7XJ&rL
zpR%&|yVkodd#|-Wcj4ST$?*8$j4?_6O#OVu2A^SUP|?sR{L*%M$qV>1#+h5>eArRq
zTw$)ZvTWW_Y?bDho0nPVTh08+s`sp!j74rJTTtXIDww0SILedFv?sZ?yb@@}GN;#8
znk_b~Q(A0YR#uV4ef!osoV1M3;vQ8N$O|fStfgf$S5;ddUNv`tWtGjM;koG#N;7M<
zP*84lnx(bn_KF&9Z5Ai$)#Cs3a|$OFw>WKCT$of*L7_CqQEinflT|W{JT+aKp-E0v
zsxmYg)1(T>DROm+LN1eQw8}KCTp=C!$H7`PU!t9_Hw@T<l*N@got4^@locyhB(F$I
zc2qA*N!4gHDRM=MLLtKrS<T7{r@2;EQImLEgWg(WsV=K@mN_b<q|sdLSnkZ?z%=Ya
zd1XPtFN!N_1_FhUrPP`$Q&N-VDdpwlm$<veIp6ws8o#=`X2HrzYs!3UjbnMW1^FmR
zybVU|{<$IA2sYYz)n!PE*{*k3mX}*Aoca1J4lBug8L!PSmt-j93Z+cJE6g&LCEYC3
zlqh&vsv@;mk!n#Z<?4*vdVUqJ$<ED5P1hUbik#Hc+;oj<1|n$4QOr=xNY7SjZe#N+
zYMkZ@i}kkcGO``U=KNEvHmBNZb~>sTI2`udRZv*!a5`#A9hK6Y95L(CDUX&_@QxKV
z_feX{UhA#ZWlvgpL$#w^D#lq`_A4AzDqd|Zv6y9PX&DNcN|l}_D^{q@GG&H^Pg583
z8FI6N8^H7b5WjGp;urW)d7F+_lcp%KsLX0viCmE(OHH+=%ZfD_=`voUuoUxFO^L;-
z;!;2{g-YiiO6m4bs89OuF9!p{FGtH-f%8<2gY!h9s)4ciN%{Kh1+`}{^}M~+TDH9N
z^Z5PlgVXMC&2&k*Hw^Lb9gny#ro$MOIxIt{+r)E<yd9ZacunW}hg*fgGjvbPop<m;
zYwHgOuP^=ft5tjRZge{KY~ObE&zikQp6c%#Mu%Gc)%e}?mwgzA3xhGK&J>A10$VR3
zanN8D{TUkl+v0CQ_>ZoHP<<Rb(R26XYd#;!HmvCjF5Aj<8G{noOSKmVv)xzRSlzYP
zH3&ZF1Rr%p7J*g#8$8rbf1;&r5%}{jT0BxUh}C|+F1i1LbzRkP;jN=9gC8aLPkxn|
zmV?!is~4=(k6wDF@m5g7T5t4O-&qqIV4>M-x#8@8ZiT#$Kh`(uRaX1g$Bg|qy$<#7
zSSAi{Nb8Y=lvNVeio+UGLCAtoLBfL`iOv`)yoJMDJBN>4IH@(l7YRF;61@>qq1iM9
zr@b#OC~SAxSle?5Pp8Z78{VO0YFr1x7kZU64Z23eLf2T2#6J_t;-E}DkB?NufZ0Ug
zi?J&byXeaB-uTNVhuiM!UVQw}bZrJ3GtAETYp->!{q#zfN7D3AS9@Q7*V^85jGx#R
z(QxYV<o=JJ^G8*7z17~g>(wW#F0XF9^<gl=KhqQ`eQkP{+s*>^s>>H8pPlVJ>)3Oz
z&_X8Sf@~?cH_O*cgi$U#`v`RRfv#y3m(ZpKk^5uLup+lVs$~}FZU$r_+}#hl%?g5m
z-u-}-666ssp<z#Z6st!qv>-xWQak~>PPy$mRc|~?pVSs1_@mBEXpPVfLF6(Ktf1S*
zPPh@QZ=tFMs?LM2(5P3L2;l_6XX6s&cYsP1ip#eg0`ZEP0HGYh{UmS@o`MihLLvkU
zgyAG0G`<J9gcG|!tPY_!P4`I7=faouh-T#$f7I)g#}MUVE+4rVj+q95+HQDx2-M`m
zkdzO>b1|qjxxh1(ODKFE%AP}Dq=3vK$P7TXP4GrM1kQ72!GUVMDl`rDC&2;TA}*nF
z8$nQD&6ys_nc1*E7$*1S@R8$ymy(sQV}imGSedB@{!QR5P&N_H=-^o!?LsWs+2|mH
z-e=)T^SvI)=_JIm7}j4;@*Z17=(#}m=~YF~z~CLI+vdAGlJDcdF$TM?CVI1%LhUrN
zaa6DJ=Yh$)$k&Oz{-~8yw^G<RF7+O}30+0o;O`gFL6ZoX1IR&_T|OS>M^8prYxSxo
zvI4k#ibryMa%%*8oI-5m61Koa_A_xg=(fwp0aBX{;X4Q;NXUhtaoJDo1>TqhWtn=_
zd5~chq#&6~c%8JZK#t_&J(9EVUU&upYeIovLt1>vaHe}UUq>#RGQj!EN#5+0@T`(@
z^g~>*c`VGRiSt;!$_4+0hk^I!@O3``5=sZ8IwlxWW7km1B&_t&E*u0_9UBa#VqwY*
zz>nxv?FAsVnRaD(Bui=6i==BFUw0k4n$>`umU`F2l?7CYTD^)c2X+d9X&ddS9|gj?
zM?knGkGCX&W8offw8aLC2$D{PjC3nVZwd4k?eZH8*mZ)U@3Qk8RDFOz_#WUA#vnzy
zyP>KrCfKwSXea7}jgJjBc}PGY+4#6%lbZyjhy`5sZd_Vy6Wz;ixa?czkN}J9It1K6
zY!eu>|AwF^fwZlLAYyQI*lM@^>O>Iu6Vf6i>Q$?v!SeUS<{>UYMwz$*%Aq?w^`j{h
z!$GZbhu=^D{&ET8;))LL%ZBDZkQqRd2;u~!d9bHGmLRhLDctNgYyjsuvoSZ#iVdoB
z2!f--UUA#U;<{je#?cYt^{PIyKa%hW>}uepWMyAI{{<cWnJ6pvL|pL41}J-(oRPWg
zM-qX*50rINxt_BGkpWVg&o6n7c9E3>Zo7?2>?$c9;whJae%oN|I-kpTQSx_C$Z&;f
zi2i)qmEn=y4U0uvk)$m;zKfjPK@oc?I`}1Jzl$Q~aoKBd3kt7L#7gyt|A_qgz6ai<
z=X%D1i!d2h?rHR^R8SUj&<fA>G||dkC?DT>{o#Yau<@uqVT{Xef&XG}5*E4aPk{}~
zplx&XhaV)&1EfI3Em;Bw#O5SV^c;{twb-1Rw)+=0!e_BLb<g4VQ<$kav69K&?YK$U
zSn>d7tYmXCH0wrlOSS+~`7He8Iqx0{CN+DVit9;*6<q@@O!Qu+g^^Tdi`@3>L~JAN
zD&cyT)2?h}xnYmL?^)<7YyzZ3$FHU^Eg;DLqAV{#wv#Wj7S`Jdl1pX&{3(uZ?!uh}
zDc$ZTNV*7le_W6}Hju~GMTxZQ1aWCeUc%!jv3MHAzt>Y-n<EkAQ1Ft6Qh6R%AFFko
z7F9XP-y`W^gq9FXcO{8bB57D}O$hU<BcUQe8D2pu*f$9>QK%zfT*3ebDQA5b?iGn;
zBjv3B+GhLTexd_(CzZDP4|#n5^~scvB6#Pk%Ho!kQ>yYw((Dv{6=$g3jT1!u6gORW
zx5#`7Wy-ZHRa~IxGHdrp(bm%lf>2%J660nj$fCqN(epv@y!l9s7@k6EvxS{AMP>WY
zX4$@F8^kayphIx-RGO$+LYl9YdoI5d|4#q9##`_F5Xnx`&GPzp2fB{-{P@ATw=X@~
z_|&^UMWAKD;jjBKTK(~o?cUFRK8EX=6>cXpfzg4ZpMB>*w_^8GSiT-Jp|xBOnzM+j
z*09-@-~qJ(eqWq5@R4i^u4^{McCP(!3}C|v_WsTR*bIUxN(Nx`u##3B4{sE`Z`v8w
zAwIG`?1~PkID~W{uDzmqH98Pew_1(;x2%8r^vY{)_&J2K)cN{W+h5+g)ZcjP&Ci#O
zgy|8K@4kyMfwilHd&6TDlhb%++Pk!>9HRld6HT7gwyZGrxS$}CsD6`>6!!2K1@Mjf
z(P0WYB7V_OFZyeWrbOFb>O54BNXf~K&?}3=^v;v_wT{DKr?jN<g%9FICA!H3yBRj^
z6wALWHoRiNN}JanUP`BO-v9mpD3O+4yfm;Rq81HMd>^DtN&DXwX%u?s*c6`%8>WFz
z7}YW^tp0b<fuXMNSxPLOTYggOW0Mhpkz{I-+jgCzC?0h~?^z65Oh+$*hWhp=F<Y@{
z+O^YV`--9@E^KTcP4U}J3+QH6TA+)@cd6r$SC3HD5w()u#rHy&k0A1?RR@w$D<--s
z(dSNYg5tJ1aOpM}ZL?7~wc-`VwO+#n#y+8|`nBl5jaVd-26tSWHVf4ujr79DZkvUw
z>p^NriE)AB6M<Pn3JgiD^##!OV*>2l<7rn7fzePtR*omOevpfm9n?}2V*+0iW;S)C
zhg`NAjL?D=W#k*$aR{>pGf~lD-rVtD;5jW1_*Jn1j1=es@Kcx4ySM_bwcQCT=d+DV
z>Sz~L=Hj@(X%31nK$mWI@7d>}ORB`K(p=+`UD)+99YUGQc7y^bHZ<HF=>1F(8|tL0
zdK*DT0kSXG_{BKTpP2*2PecdKV9;dq$^ZZDP;Nyq1kp-<Z~QVOz;_ZcZys4yKNOIr
z9f<5UY3oBz!{i)t|HTd^dNLqHe?z-L0{U{YqMmJhX%ay;0kV5S>&GI5eAyZsK!e3V
zK@rPy*{(`KIfo+lc878mDKk^V#`VT05}64kBtk%DgwLrOvLMj5-;*GNKv6c6pzMuL
z6EP%ob|_0IW}lLRXCP2!9wWhEw3LA7iF#1O1mIZ@Z=6&bz41F;@S_GvYAG-#CW3z{
zP3+6vHhvP&A3$##Vo9$dT^#MoGg^|MDm=Bt1d2RRwSZ<;ZHICpLBv5Xs!D?BH^(9_
z7`H=N&^v|Z-%mP}wNzG{aiFCsRgwzwq!<DB=Ns!f2{M!*F#&p+u%U>N6obW9+7(R;
z(SZ=23`|`>qil!LMGG{_Heq!BD>(Y-zV9wD)}hz25JA37YR%39;kI4y9pgtcUass6
zP24}ZY$vvYeI`zy&)A_X#nY3017ap*0&jx|mVwyGhg3;!keU53a}Uhm3BZI$N$6Se
zLWlAmy1S0xKJm4G_U@sN_Tm=`$xWJSEwKU98rZ&)1R^*$$1vA3oG#&*%SMxY_~oGP
zP&PFJatFLM-Ps%84IV-+Ow)T{C7cqUAva<JG?uf`802)*d*ja~c_Vz(2hQgh>uy4C
z(FRz&?6$Rypj{xO!`y=*J5o4@U8Q-(y5(*=YoKeZ+-1YdljXxkA#B)zo=FeQH#?Le
zycNUmEEHWO9a=X^pb#&cOq7-`7UA87#|S22)<7RUtZo|(zibX=w;K3qur9vy#`MNV
z6UUcf9ZwEnKCCp+OoBnF@OdbvH)ANXO0o~Pi9l8=x3))}L<#vO0-~O4!~--Ket?d}
zJaqsj<@CD1%S2cTW%rOP{Vto%0sGW~1RMa<ND|1IehBF#7$EdOSU>_j^)5nil0Yw-
z0EE#bP+l4#P^%PQ+N*ox<x}AeHJ=ck7u|T@3UddmSad+3M4ku2gn6!kDxe;*Y{7fN
zi*qVI^B-~BbWcK6I<D3>u1Zq05xZ!bXfYTg>9c{(Iw*lnjR^>kz%lAN^zFce7rppy
zY8zA~3GD=A6d*hze&l4D_wA~+O!56)BZTe_rEu}Ezi<4!kG|W#amBZ5{&XS2@6R~H
z{9o^y*BkH4$~yX9U&@CgbOzX1bn9xqF|zh$Dh0Y5y*E0e90*$!ObrHY3Ok0`2=O~r
zCuke6KrP9KOf?V(YDsM<6pX2nVoN%M$LT^q#FmtaF?1^27F*IcNX~XRB(|hCFvdcc
zc)$=S-)acdk$g4?_>jRqxpI6M3vHZk?0c^3=byamYDNf;uB{3NlKW5IhnOS3DNkMV
z?tK8?kJ}pmvp%&&eTVOVjHP`q34hN1@!aK}H(K!vI`~gf|Gv+FNEQD5Yd<~yX7k_l
h&G-K)@HZb3BABY{)U1?^%I#E6`MGoTtustd{~yM6srvu`

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/Square150x150Logo.scale-200.png b/UITests/UITests.App/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186
GIT binary patch
literal 2937
zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|v<nH?kn$sict<-=F3H8Dn4cyWK{$0G
z>rsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH
zd%ySjdB6L9=gX^A6)VzH7p2l@v~<HW`f3`DE+D@tKZ3~mmphx_=W(J0C7yFN5Y3ne
zr)jOOdYo%;U~BMd9J8)}>3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx
z+<JVC-C4xDcIaIm*KRH1t&*3E%iTKMW`CyDgFn|=QDbRsw5YATr=Q{$wrGIBffE?F
z#j)1u)wC4xC|(VW$*_pWrBaB-B3|4ST3*G~xjZ;mE>s{Eu|&pIs)Z7{La9~?xKfyl
z#43?gjEL15d4WbO<t9EnQ1e(DG}Zdjgci(-cs7D?Yeb^v=4N4YfzahyBa*1qYLQqf
zl1dTCK)man1lEE$y-Sh|dfaRA*xiKP<>Zo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka
z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y
zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R
zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw
z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7
zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R><F7PUns
zRU-{zsS=S$a2ZmsR>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ
z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP
zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE
z6U~O1k8c<ZzzjlnCH%YX${yj@w{F?w{KJ!{PrtD+n4J^Wef8w^z&DXM|I)oM*xQ}t
zqR_xap$(h*SARL3_1<;-iIZ2CUh3V{ee#^@p^2$U<fEG}t?l7&pC57=kLI1tJv**)
z7B+QNY#cw<SLwN=HTrAkqoV<H1}ihx`w7}Vc;d&%o@FM4IHxn_Z62RC&*+RDM=oy|
zdH>}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^<j%|=Vw
zSqR&-(oBXQO^W@GFy-O3w77>4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQY<q5Tz#
zTo^FW{!Ya*7>w+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6
z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR
zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D
zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d
z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT
zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk
zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da
zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$
zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F
zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es
z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@
z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o
zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO
zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y
zQ+LUkBafN<rj@ac(SyTfdB2``SXPM|j*cxVzL1j7uG_MM8_u?sK&kAyM?l|iVxrMN
zPX;~ne&HLH5scrZ4K0p-_|3Zq_OuTByUzD!c!vkFj<LeMfBwzHp^h8@YIq|jvgP2?
z9k=KkqJax5V4ng#<K(krcNgr>J#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD
zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x
bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/Square44x44Logo.scale-200.png b/UITests/UITests.App/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b
GIT binary patch
literal 1647
zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8#
zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l
z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a
zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa>
zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=<X3cr?&}4M-g7u~pdJ8jlv6wyS~Pez6=w
zr&XkKEjB~Sl$($0L>EAnG8N7fqynWG8L3p!4801a;8{+n<rIMvj7FKJAt-eA!Js#n
zV9^*^!>liO(qd(j<j~0F)z#Iq>NJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK
zt3$GicGPc?GmDjy7K2P@La;e<bDtQtyJr&xQzrLt4ml|!<Tjf>u4!$zWCZ`ym{Z$b
zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHq<g$XD8cUCL&)7`%}QRzX8^7Mda`
zB~A$xhpTu6hcgyRz)6ZUQzWle5^6eNXD&RvRx$>XG7yxWB=w55RGOM)$xMb(>kSNR
z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u
z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r
z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF
z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq
zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^k<V?z``Q$(M}8`~@@9hcMtV<h
zde8Z&v6Hrv<iw6I|G5|6*`Tto7~DG5&b%0P`j40kroR1u$KAb_`tXQR)OGjNojrR;
zIr-Y;P|DPbNw=@$Rycaxb?Mm6+R_Q{<BFxhwGA1uSqc5x`>LVdlGV6LpK$KIrlJqc
zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N
z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP
zL{N<u_jdY@dYL+=<!7fm_;+?`-S_i4gNveMFA&McQ;PFSBL$~-w71=dIg=3{-96A2
z)LEa=cxwOqsS%!tyGy#;Z?M)!eaC#SI+BCVqg{P%kr~@ZAAA*5NZpCOdvZgJcet)L
z>80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b!
ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U
zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz
z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z
xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/UITests/UITests.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd
GIT binary patch
literal 1255
zcmaJ>TWs4@7*5+{G#S+<G69{CW?TuiXeYkMv1xisQWlzol0`IV5A4`JZcXaTY?q{w
z&?qX=E<%VR9^fg07bdg|(uRb1SP@065)#_u(4;|M;B82}FnECDG%0(iX30M1Kj;7c
z|NCz~KVN!rD0Va!3WbL9C$eR{J{`P+2k`fodipQC4EwpNf6~_dI&@KJTC){I<W0DU
z$_Q$!XSUIJC^WEcRH}ZpSddlQOu#@V(J&p14u!@i8xB-!$R`xEXjp0T{x>&C!qC#>
zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U
zyQHecc_L%Gh!7G<pwbLah*E+PlA<IYCs-^~bc$kWKufZ~$uvuJ9};_WHC--eXS=?z
zlqQ#a-;pV*Uau$WT*7u2DMpecie@R61y}=ktCkNN!16|V7P81wUBmGW+adysP_bA1
zG>Mt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+
z<J>*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX
zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w
z&bSErwp+37<z5%eFWJ8BE!hr{$#kktj4l|KX4k#3piH|_XOU~XiL_bQHi=H2Wn&)>
zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o#
zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=&
zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E
zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx
zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q
z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS
zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s
Mu9UqpbNZeC0BbUo^Z)<=

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/StoreLogo.png b/UITests/UITests.App/Assets/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826
GIT binary patch
literal 1451
zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv
z5nzWi(<Qp0OO$NM7W~Q_8E#Xi$ik*$nyFjFERiL|C5FvR_m#Nm-UE*L2eC=}zR&wU
zzvuZqU+t~gP??tUObUV^Y2GTg53Y3lH73JvZdvRkT$bsc2E9%R=n+8$h(l8R0QCli
zCg1~t)c*1XP>LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j
zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#x<D+(L#x4){@nZr*
zXH@hSJ2p$Ip}GcjDJnoMW-Bg|6oayynX*_}jx9oIC=;ZOph=wMcuO%)(&*fSL2s%Q
z;C=3jIbTq+W6ioA<_RJaiI^kBW<_lxD30R@k|t;xhZ?xn9@2#<9@17OEVzLts&ZJD
zl@J=YDEO7_x*dZ|XF~{vtE=Y?hqSpw!ITkEAxuzak_ZOlam{FJx)1zMV?k}LzC8>G
zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w
zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q
zX}S;+LBh8Tea~TSkHzvX6$rYb)+<VDq6=!86<yJql`!gZ%~TyN*er)6C88C^%QPFc
z8>n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?w<Zrf5
z;R%c*oS?(o7?BfgG=~RBn#Cy!Fu0#%8C>FM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U
zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e
z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S
zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ
zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8
zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v
zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-*
zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V
z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36
zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640
bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/Assets/Wide310x150Logo.scale-200.png b/UITests/UITests.App/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5
GIT binary patch
literal 3204
zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0
z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uA<Q6EV}q=%Yn)L!+JX33Xw?F0H>rExJ73~P
zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*<kSZ*_h<*XM9U}yK*J0HOE<8Y-l
z{IuU0Zl!|^R_^fI7`)m`H!*b#?P%Zm9#e*4d3)XU*09y`gwF2wme9ziq|F-uZwxEj
z*cPDe9wv<2m?pPRFTFE%N{YK3dg&IGg|GySjLW^LBgj16QB!a4@YuBu>BbFsS(^?B
zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$
zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv
zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF
z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7<nBN^0x%-&<|%3?+mq@KM*nmHM%E*ZfFYK
zZ1US%yo@hgZPH8OO^L(p(5Y#snj}b-jC7E+jIt|fnbt`<WC~JYBNcXyiqNQep1J(B
zL}`UmVIs@~X;dgGl^Uv&Fe-_P%5t@tB$Va6Z?!KJrhRsXkL`xooUhS5udmJ+WazLz
zSnu~Y^HWgk@`wE)mp_0TjcnKPbz9s%hrc!S6VxUyYZDW6?_wP0px=wLb=JA(&_GcR
z4db-aveHsDDWfQ5smw-dXqifFca&;u4mClO(u}_&tA5;^!VcsS;N|GFrKHnN(HfbP
zAk{L3f>FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@
zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H
ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@J<S_$cf|D94yk9hZ%-)
zFd>Cu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt
z<N2wJ<KvxcBaPkVBMsQM%C~b*tXLJx<x}BR&0-Yq>sy5Pyu=()`7HRMG3IB7F1@`_
z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM
z<q@$5PepVaVw8D_rzt7u5}mv0KHS=W;IrX-W9RM1x;y^xqUh$1Enj@to+?V~K7Rk)
z#o^>1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn
zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~<p
zveB`L7p!^tk|;G%oUI~CWujZ+F$jp%fC`Yzs@PQMeXHLx03o9*y;a;3rz{5mr>MY-
zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQB<l$++?20OeO#?_IUn16|Kkg|@qc@SSChoZs
zkP37TQUJ+V28<r8oMzzYSvvD_UYQ4mmzOEon#o!g_#O}WJ#6I2X)ZL#V@2myu>uUA
za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR
zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s
z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi
z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C
ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3
z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3
z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94
zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE<e^1ftk%tIKfd0mBI+0I&Ou06TNp=
z&yb^U6AChy>#Na|%OY0$uO>!&hP+1ywfD<vV+COOggX6NynIPb$}ph#m+RK<pMDh`
z^)v|YYUu8FrednD%E_IFUw-JqL)%t;@abOB&5n_Oe)PKaXhXbZc``?#rMpjDSrb$3
zsG5vzMujXygM=py@lFo>_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V
zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N
z$SQMX^AK6(fA<E@x_xIU;hp|B2Xub6jx3JId*2kD#-zPd&sU`0wV?k6)s;1-;}wlv
F{{^ZoKyCm4

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/MainPage.xaml b/UITests/UITests.App/MainPage.xaml
new file mode 100644
index 00000000000..d38db07e3e3
--- /dev/null
+++ b/UITests/UITests.App/MainPage.xaml
@@ -0,0 +1,19 @@
+<Page
+    x:Class="UITests.App.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:testhelpers="using:AppTestAutomationHelpers"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <testhelpers:TestAutomationHelpersPanel />
+
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Button Content="Click Me" Click="Button_Click"/>
+            <TextBlock x:Name="textBlock"/>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
new file mode 100644
index 00000000000..6fdbe7037a1
--- /dev/null
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -0,0 +1,15 @@
+namespace UITests.App
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            textBlock.Text = "Clicked";
+        }
+    }
+}
diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest
new file mode 100644
index 00000000000..a17d7b8e653
--- /dev/null
+++ b/UITests/UITests.App/Package.appxmanifest
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity
+    Name="3568ebdf-5b6b-4ddd-bb17-462d614ba50f"
+    Publisher="CN=alzollin"
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="3568ebdf-5b6b-4ddd-bb17-462d614ba50f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>UITests.App</DisplayName>
+    <PublisherDisplayName>alzollin</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="UITests.App.App">
+      <uap:VisualElements
+        DisplayName="UITests.App"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="UITests.App"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/UITests/UITests.App/Properties/AssemblyInfo.cs b/UITests/UITests.App/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..bce71eb399d
--- /dev/null
+++ b/UITests/UITests.App/Properties/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("UITests.App")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UITests.App")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/UITests/UITests.App/Properties/Default.rd.xml b/UITests/UITests.App/Properties/Default.rd.xml
new file mode 100644
index 00000000000..af00722cdf9
--- /dev/null
+++ b/UITests/UITests.App/Properties/Default.rd.xml
@@ -0,0 +1,31 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    
+    
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
\ No newline at end of file
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
new file mode 100644
index 00000000000..1951642019f
--- /dev/null
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UITests.App</RootNamespace>
+    <AssemblyName>UITests.App</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Never</AppxBundle>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>78851A63D7F5E9D97F416A5CE3FFAE6D1C38744F</PackageCertificateThumbprint>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\Default.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="MUXAppTestHelpers">
+      <Version>0.0.2</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="UITests.App_TemporaryKey.pfx" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/UITests/UITests.App/UITests.App_TemporaryKey.pfx b/UITests/UITests.App/UITests.App_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..072b549c7eda08fe04c626fd3e41672db307e7d4
GIT binary patch
literal 2528
zcmZXUcU05a632fDNhlhH7^FxItRf{O6ax`N1f-Y+1Z*g*fB`fRkP@Xs5TvRsAT81a
z1Sy8zqd-7dnuJJ^q6cIZq!^SMST=gz+dc2RbI;tF`OJLpz5m?7Pz5K!AU+ILFdZhS
z9Bmf80SEDea;bu`5UOAl4@Y3A(Cz;zLBBw#&`&%(%d_{eeg9GI7XpEEsgS=gRLC|)
z3MTYl%sc!5L_pJtlcv<txBv$8zkyI8V~nUZxQ|k>`*c!ZHS<FIQ+)ClAN$X-Jx9a3
zmiv!Ry)fG8(3IO?Eu-!a)|YU`TlbQsdIFzKE4NT{u3an~@8{kL_c*?=XGv~+;*+#5
zHmpFr5XCp^Hq*N;*!_+1S@IjZxF?t#FN91R*?S<Ge?CR|o~C1bTX@J6OD^9=NxyJD
z#Jw`MfP3s50$zJ<Zcs8n+T32Y&p2yhYoizVGda`6e6uVgNo)UZyJ*2C98mW!>sCDF
zka!D)^!}x0llZ#B;%QJ(sVLt4QfDq*V@pu_;yIy?3;T3`x1Ustef@Zv5P#Y8%5clp
z&8j-I=<Mj*>}{j;x#Mtinih8mNhylqTe{WGZinynjt11Z?alkVlGV?Pt$U+Uiepif
zpKTV~9No~8Z9|$`8$+D(L&Rqz#c%AWVWLd$ckcPmu8J)=Vorw^GM-t>uZF|WT~*fV
zj0(w<oZqWI9VJ8*VJ;R4lvpENX45N_S~c$G7kPFEuSa&*d&T5H^nE)n&~(xI3Dx*r
zCV@>aPb+hZj1DO;SA9DP_$%BdQT|FpKP+g4w^;c0anp_N;Fx|_;|^qst!wx_xZib2
zo?Ws1;)CQd_Ck4^dedpC^{&Z#bRx%Gp;<e%TqA~wof60**9on@&qI?<-YK>hi8VeA
z$e5_eVu}@=u@o+NV_&fNZee1>c-*sAnpJkly-lt+L9M0xmsB$c&lFYf-pva4c}W$+
z0sX99dm7U!+qQKpTbk%8z=*gbU(?wz9ikaM78I5~CLqkjwIq1UiE5U&c~m67G<9~1
zf#-9$;_Vbe^Mh~?lZtAI(;eF0{TtJIsqzi)oxP8;HY`8>{$vxWH+eWPGW~hVnoN|&
zO0kQ;r>4j9RsOyKZFx0W?<qZt>FQ>GE+{Q3qQd5*`c^sGZws|)FMXctoPE8b*;5Ga
z&o@EqWMR(aJ2nqQm9S%n2HwrxwKDpyD}moTFmEbRW%pf@B-H%gP`p^B@<f`rpP@jW
zp~qKLqa8K$@m^3dcwUj2*UBZh5_?F?91DepCt#Tw?ysWL*8Px|%LrR(*WGYRz(UTo
z$R))*uMg{uzfJUE?HX>d_0^hRSYD3UC7VWYCpb)fBZb83RVpX^xxqu0e4NC&<0f5;
znTDlbhKyCrw(-shDbrp}cGvHqi8XIZ*P9Ix({z{X3FVh-9VO$%ZCcoUaQopL`$6qQ
z#JjwU%-pgg2ho!Wu|XL4{^KRghyv0s`Qqez=?i)@K@B6R^AzQSASi-hwv{Y_&RxmG
zN<K_?$w7FFBwmm99HLt<u8o?~?E;rm1ECUTA<$y^N8t95(9pY2tBKmKGd8ULL!pbK
z;Pb`%4x0<w<Q;5s0AhmJABTj;Lm=N*4LTZ|O)$)@(dvy?F6M-9JF;TlH#aDg^@WGN
z61r<;YJD+BCZwwO70@kq<g=snW204&aeu8#WzD6Yg&IJ$YRyPx^`UDx_^|rN7NVdo
zVsH4iv)+ivy|>!^J2D8sQ73)HujJd(%k?xnt;0-?$ua*mV)*+0lxDeY%IiLlu1PsU
za%+rqUTIIhZM(0{TI+d+OcqVl39aMm4uhL$nSh;o4u^kl&J}oKytGIs->sRkxRPOT
zNv{y-Ci@`*W)uUjZMckl!AA6B4*fGO1x2wi2m}NG0Or!a5Q(*rF#}ux4FC&h^L7m2
z1h@if0FD=F^OhQ*1)TUv)p!+MUZ>7arpb$)d7U_(*WyK5JUs^E025S!fgm6%P6ULt
zmaznW1#a>rK7beC%QIKN50C?FdHWAS2Hbd=5ibq^ym`!vm;3N8@dn&~s^kFcpM4Zw
zb^{;+J{T%r*gr4lhvicFym`n23<7wL_-_UD|0CakrL?}RH!1jI<cCxFbcDtA)fE&d
zgQ<FM$+;7)pU$?jNF+b6qR6KXsp4h6r`Ao%P<$HCUi<InWLSyNAjp!gY&$I9D+w<h
z=@SYSY8ij9GNpc-y);spEp{3CM4cA#e1%_%k1Jb-7`$poiihJ}U+nN7wy>|dU#i>6
zkf^_Y_A712DU1C~`s|rwkJU2i()j|8#1LB%+K1{j0@ll`H$Kjiq&VfM1ZT$!cdG?|
z+e#jL?$C?l${B>v!yjUm-WA23v~OFW1{)s=9?Lmxb4$aDhR!;7W|8@e&23i~NH`-#
zk$@1k;?q9$vN`@H0Y*t`*pUMhZ-jxN*=u_A8WUYq9ZLEH?NW1__{@|p5QQx?d#glN
zK0f`(_7Bv4r?4&SUC$TS&{9)=A`=t#YQo8~AJ2gh#?^MNRCJ7K**Vfdxd$UMvz~2T
z(xd{-xCT7rs&Ge(%;%_;;1BAI#hukpd@%ks7R8p6cti_iKJ0ndDnq^L-fo!I)XJPl
zvgXdtNQSd>Yn7v*eyvBHETd0mKS_gearJ!7hbIGj4^0Y-=a6w<Xrw}<NsVVww-q?M
z(&@T~ioeacxPKe1NL6P0m>pcgEU8BcyUC7Q9?BRsNV|m}@^h~r%r+k*c9umD(;B&z
z<=M8?<I(elLBrE~`lCLz_+=(P9@mva4%oDr$VW|8;Ve%jC2V^>vS5<Y{Lx>XwhkmJ
zFQu~Ya(30Cf~hGU_$0BZQ4R3$AD}Kvt+lV2BJ1MC(BOiHhIG#IVdzc0w>sJ?cJ+3l
zpM#19Qa4>{<VWX7E?QUbnF@!C2I$7Bx+Y~!(bQ8??>{PMY&$Xul}<zWiul{Qs=EVj
zO^r+raZ5S!h$bO#WuVv^me=YF;>X{SuFOq-u%McMg?1IuR-xkdK@k^x<5imjIaM^d
zi_c&D)iE)`^*lEe?#{FNY!4{yHmV!uvoN{Bd3DMmjL9Cz4SNI@SSrbp>6C8@(q`&6
zN6r`Jvvgwoa!$ca8XEMMzGnttl^&!NZb{BcEpjm2I&+Sre_9qQu~X>tc(}tATD?)S
z7o+p})yKYc7|K&D@Qmg=>=@nm%o|qN7I|3p+eoKm#USP+Mi#>lgQ^_h14}}X7L{+f
t<BGS3C7@gpi9kd|=gIkU2(lC>WcJBoke0BJJ-L_<hV{Bt5`KKVzX9@Cf|>vT

literal 0
HcmV?d00001

diff --git a/UITests/UITests.Tests.MSTest/MSTestInterop.cs b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
new file mode 100644
index 00000000000..d09124f8478
--- /dev/null
+++ b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
@@ -0,0 +1,152 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
+
+namespace UITests.Tests
+{
+    // TAEF has a different terms for the same concepts as compared with MSTest.
+    // In order to allow both to use the same test files, we'll define these helper classes
+    // to translate TAEF into MSTest.
+    public static class Log
+    {
+        public static void Comment(string format, params object[] args)
+        {
+            LogMessage(format, args);
+        }
+
+        public static void Warning(string format, params object[] args)
+        {
+            LogMessage(format, args);
+        }
+
+        public static void Error(string format, params object[] args)
+        {
+            LogMessage(format, args);
+        }
+
+        private static void LogMessage(string format, object[] args)
+        {
+            // string.Format() complains if we pass it something with braces, even if we have no arguments.
+            // To account for that, we'll escape braces if we have no arguments.
+            if (args.Length == 0)
+            {
+                format = format.Replace("{", "{{").Replace("}", "}}");
+            }
+
+            Logger.LogMessage(format, args);
+        }
+    }
+
+    public static class LogController
+    {
+        public static void InitializeLogging()
+        {
+            // TODO: implement
+        }
+    }
+
+    public static class Verify
+    {
+        // TODO: implement
+        // NOTE: At the time of this comment, MUXControlsTestApp is hitting a code path where
+        //       running tests locally will set this flag to true. Hence an implementation of this flag
+        //       will only log errors and not fail the tests.
+        public static bool DisableVerifyFailureExceptions
+        {
+            get;
+            set;
+        }
+
+        public static void AreEqual(object expected, object actual, string message = null)
+        {
+            Assert.AreEqual(expected, actual, message);
+        }
+
+        public static void AreEqual<T>(T expected, T actual, string message = null)
+        {
+            Assert.AreEqual(expected, actual, message);
+        }
+
+        public static void AreNotEqual(object notExpected, object actual, string message = null)
+        {
+            Assert.AreNotEqual(notExpected, actual, message);
+        }
+
+        public static void AreNotEqual<T>(T notExpected, T actual, string message = null)
+        {
+            Assert.AreNotEqual(notExpected, actual, message);
+        }
+
+        public static void AreSame(object expected, object actual, string message = null)
+        {
+            Assert.AreSame(expected, actual, message);
+        }
+
+        public static void AreNotSame(object notExpected, object actual, string message = null)
+        {
+            Assert.AreNotSame(notExpected, actual, message);
+        }
+
+        public static void IsLessThan(IComparable expectedLess, IComparable expectedGreater, string message = null)
+        {
+            Assert.IsTrue(expectedLess.CompareTo(expectedGreater) < 0, message);
+        }
+
+        public static void IsLessThanOrEqual(IComparable expectedLess, IComparable expectedGreater, string message = null)
+        {
+            Assert.IsTrue(expectedLess.CompareTo(expectedGreater) <= 0, message);
+        }
+
+        public static void IsGreaterThan(IComparable expectedGreater, IComparable expectedLess, string message = null)
+        {
+            Assert.IsTrue(expectedGreater.CompareTo(expectedLess) > 0, message);
+        }
+
+        public static void IsGreaterThanOrEqual(IComparable expectedGreater, IComparable expectedLess, string message = null)
+        {
+            Assert.IsTrue(expectedGreater.CompareTo(expectedLess) >= 0, message);
+        }
+
+        public static void IsNull(object value, string message = null)
+        {
+            Assert.IsNull(value, message);
+        }
+
+        public static void IsNotNull(object value, string message = null)
+        {
+            Assert.IsNotNull(value, message);
+        }
+
+        public static void IsTrue(bool condition, string message = null)
+        {
+            Assert.IsTrue(condition, message);
+        }
+
+        public static void IsFalse(bool condition, string message = null)
+        {
+            Assert.IsFalse(condition, message);
+        }
+
+        public static void Fail()
+        {
+            Assert.Fail();
+        }
+
+        public static void Fail(string message, params object[] args)
+        {
+            Assert.Fail(message, args);
+        }
+
+        public static void Throws<T>(Action action, string message)
+            where T : Exception
+        {
+            Assert.ThrowsException<T>(action, message);
+        }
+
+        public static void Throws<T>(Action action)
+            where T : Exception
+        {
+            Assert.ThrowsException<T>(action);
+        }
+    }
+}
\ No newline at end of file
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
new file mode 100644
index 00000000000..c26ed1a8861
--- /dev/null
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
+    <LangVersion>8.0</LangVersion>
+
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+    <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
+  </ItemGroup>
+
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+</Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
new file mode 100644
index 00000000000..472e1f5e9ae
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -0,0 +1,29 @@
+#if USING_TAEF
+using WEX.TestExecution.Markup;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
+namespace UITests.Tests
+{
+    // This is marked as a test class to make sure our AssemblyInitialize and AssemblyCleanup
+    // fixtures get executed.  It won't actually host any tests.
+    [TestClass]
+    public class TestAssembly
+    {
+        [AssemblyInitialize]
+        [TestProperty("CoreClrProfile", ".NETCoreApp2.1")]
+        [TestProperty("RunFixtureAs:Assembly", "ElevatedUserOrSystem")]
+        public static void AssemblyInitialize(TestContext testContext)
+        {
+            TestEnvironment.AssemblyInitialize(testContext);
+        }
+
+        [AssemblyCleanup]
+        public static void AssemblyCleanup()
+        {
+            TestEnvironment.AssemblyCleanup();
+        }
+    }
+}
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
new file mode 100644
index 00000000000..76cc1aa4073
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -0,0 +1,90 @@
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
+#if USING_TAEF
+using WEX.Logging.Interop;
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
+
+namespace UITests.Tests
+{
+    [TestClass]
+    public class Tests
+    {
+        public static TestApplicationInfo WinUICsUWPSampleApp
+        {
+            get
+            {
+                var arch = RuntimeInformation.ProcessArchitecture.ToString();
+
+                string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.FullName, "UITests.App");
+
+                return new TestApplicationInfo(
+                    "3568ebdf-5b6b-4ddd-bb17-462d614ba50f",
+                    "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
+                    "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
+                    "UITests.App",
+                    "UITests.App.exe",
+                    "UITests.App_1.0.0.0_" + arch + "_Debug",
+                    "78851a63d7f5e9d97f416a5ce3ffae6d1c38744f",
+                    baseDirectory);
+            }
+        }
+
+        public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
+        {
+            get
+            {
+                return new TestSetupHelper.TestSetupHelperOptions
+                {
+                    AutomationIdOfSafeItemToClick = string.Empty
+                };
+            }
+        }
+
+        [ClassInitialize]
+        [TestProperty("RunAs", "User")]
+        [TestProperty("Classification", "ScenarioTestSuite")]
+        [TestProperty("Platform", "Any")]
+        public static void ClassInitialize(TestContext testContext)
+        {
+            TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TestEnvironment.AssemblyCleanupWorker(WinUICsUWPSampleApp);
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+        }
+
+        [TestMethod]
+        public void SimpleLaunchTest()
+        {
+            var button = new Button(FindElement.ByName("Click Me"));
+            var textBlock = new TextBlock(FindElement.ById("textBlock"));
+
+            Verify.IsNotNull(button);
+
+            Verify.AreEqual(string.Empty, textBlock.GetText());
+
+            button.Click();
+
+            Wait.ForIdle();
+
+            Verify.AreEqual("Clicked", textBlock.GetText());
+        }
+    }
+}
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
new file mode 100644
index 00000000000..d4e528749ac
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>1d8b0260-5c17-41da-9c38-1e37441b3925</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>UITests.Tests.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tests.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj
new file mode 100644
index 00000000000..e489cb2eed0
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>1d8b0260-5c17-41da-9c38-1e37441b3925</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="UITests.Tests.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
new file mode 100644
index 00000000000..4010bc8ae85
--- /dev/null
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+
+    <TaefRootDirectory>$(PkgTAEF_Redist_Wlk)\build\Binaries\x86\CoreClr\</TaefRootDirectory>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="TE.Managed">
+      <HintPath>$(TaefRootDirectory)TE.Managed.dll</HintPath>
+      <Private>true</Private>
+    </Reference>
+    <Reference Include="TE.ManagedTestMode">
+      <HintPath>$(TaefRootDirectory)TE.ManagedTestMode.dll</HintPath>
+      <Private>true</Private>
+    </Reference>
+    <Reference Include="Wex.Common.Managed">
+      <HintPath>$(TaefRootDirectory)Wex.Common.Managed.dll</HintPath>
+      <Private>true</Private>
+    </Reference>
+    <Reference Include="Wex.Logger.Interop">
+      <HintPath>$(TaefRootDirectory)Wex.Logger.Interop.dll</HintPath>
+      <Private>true</Private>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.2" />
+    <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
+    <PackageReference Include="runtime.win-x86.microsoft.netcore.app" Version="2.1.0" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(Pkgruntime_win-x86_microsoft_netcore_app)\runtimes\win-x86\lib\netcoreapp2.1\*" Link=".NETCoreApp2.1\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(Pkgruntime_win-x86_microsoft_netcore_app)\runtimes\win-x86\native\*" Link=".NETCoreApp2.1\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+
+    <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+</Project>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e5f4ccbee..cc6b4f22660 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -90,7 +90,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Media", "Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnitTests.Shared", "UnitTests\UnitTests.Shared\UnitTests.Shared.shproj", "{4E9466D1-D5AA-46AC-801B-C8FDAB79F0D4}"
 EndProject
@@ -125,15 +125,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
 		ThirdPartyNotices.txt = ThirdPartyNotices.txt
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITests.App", "UITests\UITests.App\UITests.App.csproj", "{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UITests", "UITests", "{6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.MSTest", "UITests\UITests.Tests.MSTest\UITests.Tests.MSTest.csproj", "{5F720475-E263-4A5A-8C88-2B805B45B5BC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITests\UITests.Tests.TAEF\UITests.Tests.TAEF.csproj", "{C8182EF0-77FB-4B43-A588-C71748A309C7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{1d8b0260-5c17-41da-9c38-1e37441b3925}*SharedItemsImports = 13
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
-		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{efa96b3c-857e-4659-b942-6bef7719f4ca}*SharedItemsImports = 4
@@ -1085,6 +1098,107 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x64.ActiveCfg = Debug|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x64.Build.0 = Debug|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x64.Deploy.0 = Debug|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.ActiveCfg = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.Build.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.Deploy.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.ActiveCfg = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.Build.0 = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.Deploy.0 = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.ActiveCfg = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.Build.0 = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.Deploy.0 = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.ActiveCfg = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.Build.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.Deploy.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.ActiveCfg = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.Build.0 = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.Deploy.0 = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM64.Build.0 = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM64.Deploy.0 = Release|ARM64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x64.ActiveCfg = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x64.Build.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x64.Deploy.0 = Release|x64
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x86.ActiveCfg = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x86.Build.0 = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|x86.Deploy.0 = Release|x86
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.ActiveCfg = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.Build.0 = Debug|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM.Build.0 = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM64.Build.0 = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|x64.Build.0 = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|x86.Build.0 = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.ActiveCfg = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.Build.0 = Debug|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM.Build.0 = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM64.Build.0 = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1120,6 +1234,11 @@ Global
 		{C79029AF-2E9B-4466-BAC4-1A41B281EAE6} = {B30036C4-D514-4E5B-A323-587A061772CE}
 		{804D0681-52F6-4E61-864A-699F0AB44B20} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{88C6FFBE-322D-4CEA-842B-B2CB281D357D} = {CFA75BE0-5A44-45DE-8114-426A605B062B}
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+		{6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} = {B30036C4-D514-4E5B-A323-587A061772CE}
+		{5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+		{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 80e447c41369fd1d949246391d1e35fd3c95442a Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 27 Aug 2020 18:36:16 -0700
Subject: [PATCH 427/595] Added MUX-Dependencies to nuget.config.

---
 nuget.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nuget.config b/nuget.config
index 0718edaf0b1..e7c966d12cc 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,5 +3,6 @@
 	<packageSources>
 		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 		<add key="MyGet" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" protocolVersion="3" />
-	</packageSources>
+    <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
+  </packageSources>
 </configuration>
\ No newline at end of file

From 79c8916560123fe92298be002346cff4fb80aaf3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 28 Aug 2020 19:19:50 +0200
Subject: [PATCH 428/595] Added generic ThrowHelper APIs

---
 .../Diagnostics/ThrowHelper.Generic.cs        | 811 ++++++++++++++++++
 1 file changed, 811 insertions(+)
 create mode 100644 Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs
new file mode 100644
index 00000000000..9a1ed504fa6
--- /dev/null
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs
@@ -0,0 +1,811 @@
+// 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.Diagnostics.CodeAnalysis;
+using System.IO;
+#if !NETSTANDARD1_4
+using System.Runtime.InteropServices;
+#endif
+using System.Threading;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Diagnostics
+{
+    /// <summary>
+    /// Helper methods to efficiently throw exceptions.
+    /// </summary>
+    public static partial class ThrowHelper
+    {
+        /// <summary>
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArrayTypeMismatchException<T>(string message)
+        {
+            throw new ArrayTypeMismatchException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArrayTypeMismatchException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArrayTypeMismatchException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArrayTypeMismatchException<T>(string message, Exception innerException)
+        {
+            throw new ArrayTypeMismatchException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentException<T>(string message)
+        {
+            throw new ArgumentException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentException<T>(string message, Exception innerException)
+        {
+            throw new ArgumentException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentException<T>(string name, string message)
+        {
+            throw new ArgumentException(message, name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentException<T>(string name, string message, Exception innerException)
+        {
+            throw new ArgumentException(message, name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentNullException<T>(string name)
+        {
+            throw new ArgumentNullException(name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentNullException<T>(string name, Exception innerException)
+        {
+            throw new ArgumentNullException(name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentNullException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentNullException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentNullException<T>(string name, string message)
+        {
+            throw new ArgumentNullException(name, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentOutOfRangeException<T>(string name)
+        {
+            throw new ArgumentOutOfRangeException(name);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentOutOfRangeException<T>(string name, Exception innerException)
+        {
+            throw new ArgumentOutOfRangeException(name, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentOutOfRangeException<T>(string name, string message)
+        {
+            throw new ArgumentOutOfRangeException(name, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ArgumentOutOfRangeException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="name">The argument name.</param>
+        /// <param name="value">The current argument value.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowArgumentOutOfRangeException<T>(string name, object value, string message)
+        {
+            throw new ArgumentOutOfRangeException(name, value, message);
+        }
+
+#if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowExternalException<T>(string message)
+        {
+            throw new ExternalException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowExternalException<T>(string message, Exception innerException)
+        {
+            throw new ExternalException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ExternalException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The argument name.</param>
+        /// <param name="error">The HRESULT of the errror to include.</param>
+        /// <exception cref="ExternalException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowExternalException<T>(string message, int error)
+        {
+            throw new ExternalException(message, error);
+        }
+#endif
+
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowFormatException<T>(string message)
+        {
+            throw new FormatException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="FormatException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="FormatException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowFormatException<T>(string message, Exception innerException)
+        {
+            throw new FormatException(message, innerException);
+        }
+
+#if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInsufficientMemoryException<T>(string message)
+        {
+            throw new InsufficientMemoryException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InsufficientMemoryException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InsufficientMemoryException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInsufficientMemoryException<T>(string message, Exception innerException)
+        {
+            throw new InsufficientMemoryException(message, innerException);
+        }
+#endif
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInvalidDataException<T>(string message)
+        {
+            throw new InvalidDataException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidDataException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidDataException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInvalidDataException<T>(string message, Exception innerException)
+        {
+            throw new InvalidDataException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInvalidOperationException<T>(string message)
+        {
+            throw new InvalidOperationException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="InvalidOperationException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowInvalidOperationException<T>(string message, Exception innerException)
+        {
+            throw new InvalidOperationException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowLockRecursionException<T>(string message)
+        {
+            throw new LockRecursionException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="LockRecursionException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="LockRecursionException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowLockRecursionException<T>(string message, Exception innerException)
+        {
+            throw new LockRecursionException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingFieldException<T>(string message)
+        {
+            throw new MissingFieldException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingFieldException<T>(string message, Exception innerException)
+        {
+            throw new MissingFieldException(message, innerException);
+        }
+
+#if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="MissingFieldException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="fieldName">The target field being retrieved.</param>
+        /// <exception cref="MissingFieldException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingFieldException<T>(string className, string fieldName)
+        {
+            throw new MissingFieldException(className, fieldName);
+        }
+#endif
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMemberException<T>(string message)
+        {
+            throw new MissingMemberException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMemberException<T>(string message, Exception innerException)
+        {
+            throw new MissingMemberException(message, innerException);
+        }
+
+#if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="MissingMemberException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="memberName">The target member being retrieved.</param>
+        /// <exception cref="MissingMemberException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMemberException<T>(string className, string memberName)
+        {
+            throw new MissingMemberException(className, memberName);
+        }
+#endif
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMethodException<T>(string message)
+        {
+            throw new MissingMethodException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMethodException<T>(string message, Exception innerException)
+        {
+            throw new MissingMethodException(message, innerException);
+        }
+
+#if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="MissingMethodException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="className">The target class being inspected.</param>
+        /// <param name="methodName">The target method being retrieved.</param>
+        /// <exception cref="MissingMethodException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowMissingMethodException<T>(string className, string methodName)
+        {
+            throw new MissingMethodException(className, methodName);
+        }
+#endif
+
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowNotSupportedException<T>(string message)
+        {
+            throw new NotSupportedException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="NotSupportedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="NotSupportedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowNotSupportedException<T>(string message, Exception innerException)
+        {
+            throw new NotSupportedException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowObjectDisposedException<T>(string objectName)
+        {
+            throw new ObjectDisposedException(objectName);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowObjectDisposedException<T>(string objectName, Exception innerException)
+        {
+            throw new ObjectDisposedException(objectName, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="ObjectDisposedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="objectName">The name of the disposed object.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="ObjectDisposedException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowObjectDisposedException<T>(string objectName, string message)
+        {
+            throw new ObjectDisposedException(objectName, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowOperationCanceledException<T>(string message)
+        {
+            throw new OperationCanceledException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowOperationCanceledException<T>(string message, Exception innerException)
+        {
+            throw new OperationCanceledException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowOperationCanceledException<T>(CancellationToken token)
+        {
+            throw new OperationCanceledException(token);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowOperationCanceledException<T>(string message, CancellationToken token)
+        {
+            throw new OperationCanceledException(message, token);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="OperationCanceledException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <param name="token">The <see cref="CancellationToken"/> in use.</param>
+        /// <exception cref="OperationCanceledException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowOperationCanceledException<T>(string message, Exception innerException, CancellationToken token)
+        {
+            throw new OperationCanceledException(message, innerException, token);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowPlatformNotSupportedException<T>(string message)
+        {
+            throw new PlatformNotSupportedException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="PlatformNotSupportedException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="PlatformNotSupportedException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowPlatformNotSupportedException<T>(string message, Exception innerException)
+        {
+            throw new PlatformNotSupportedException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="SynchronizationLockException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowSynchronizationLockException<T>(string message)
+        {
+            throw new SynchronizationLockException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="SynchronizationLockException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="SynchronizationLockException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowSynchronizationLockException<T>(string message, Exception innerException)
+        {
+            throw new SynchronizationLockException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="TimeoutException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowTimeoutException<T>(string message)
+        {
+            throw new TimeoutException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="TimeoutException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="TimeoutException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowTimeoutException<T>(string message, Exception innerException)
+        {
+            throw new TimeoutException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowUnauthorizedAccessException<T>(string message)
+        {
+            throw new UnauthorizedAccessException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="UnauthorizedAccessException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="UnauthorizedAccessException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowUnauthorizedAccessException<T>(string message, Exception innerException)
+        {
+            throw new UnauthorizedAccessException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowWin32Exception<T>(int error)
+        {
+            throw new Win32Exception(error);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="error">The Win32 error code associated with this exception.</param>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowWin32Exception<T>(int error, string message)
+        {
+            throw new Win32Exception(error, message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowWin32Exception<T>(string message)
+        {
+            throw new Win32Exception(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="Win32Exception"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="Win32Exception">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowWin32Exception<T>(string message, Exception innerException)
+        {
+            throw new Win32Exception(message, innerException);
+        }
+    }
+}

From 93ed83494a3e34cdaf7cbc9c0ca2b2d137e66505 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 28 Aug 2020 19:26:33 +0200
Subject: [PATCH 429/595] Added missing COMException throw helpers

---
 .../Diagnostics/ThrowHelper.Generic.cs        | 41 +++++++++++++++++++
 Microsoft.Toolkit/Diagnostics/ThrowHelper.cs  | 35 ++++++++++++++++
 .../Diagnostics/Test_ThrowHelper.cs           |  1 +
 3 files changed, 77 insertions(+)

diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs
index 9a1ed504fa6..a4f0dcb7245 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.Generic.cs
@@ -201,6 +201,47 @@ public static T ThrowArgumentOutOfRangeException<T>(string name, object value, s
         }
 
 #if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="COMException">Thrown with the specified parameter.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowCOMException<T>(string message)
+        {
+            throw new COMException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="COMException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowCOMException<T>(string message, Exception innerException)
+        {
+            throw new COMException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of expected result.</typeparam>
+        /// <param name="message">The argument name.</param>
+        /// <param name="error">The HRESULT of the errror to include.</param>
+        /// <exception cref="COMException">Thrown with the specified parameters.</exception>
+        /// <returns>This method always throws, so it actually never returns a value.</returns>
+        [DoesNotReturn]
+        public static T ThrowCOMException<T>(string message, int error)
+        {
+            throw new COMException(message, error);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ExternalException"/>.
         /// </summary>
diff --git a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
index 2338f17a31d..516301b434e 100644
--- a/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
+++ b/Microsoft.Toolkit/Diagnostics/ThrowHelper.cs
@@ -175,6 +175,41 @@ public static void ThrowArgumentOutOfRangeException(string name, object value, s
         }
 
 #if !NETSTANDARD1_4
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <param name="message">The message to include in the exception.</param>
+        /// <exception cref="COMException">Thrown with the specified parameter.</exception>
+        [DoesNotReturn]
+        public static void ThrowCOMException(string message)
+        {
+            throw new COMException(message);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="innerException">The inner <see cref="Exception"/> to include.</param>
+        /// <exception cref="COMException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowCOMException(string message, Exception innerException)
+        {
+            throw new COMException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a new <see cref="COMException"/>.
+        /// </summary>
+        /// <param name="message">The argument name.</param>
+        /// <param name="error">The HRESULT of the errror to include.</param>
+        /// <exception cref="COMException">Thrown with the specified parameters.</exception>
+        [DoesNotReturn]
+        public static void ThrowCOMException(string message, int error)
+        {
+            throw new COMException(message, error);
+        }
+
         /// <summary>
         /// Throws a new <see cref="ExternalException"/>.
         /// </summary>
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
index c9ac6ec63cc..523f155ed4b 100644
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
+++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
@@ -36,6 +36,7 @@ public class Test_ThrowHelper
         [DataRow(typeof(ArgumentException))]
         [DataRow(typeof(ArgumentNullException))]
         [DataRow(typeof(ArgumentOutOfRangeException))]
+        [DataRow(typeof(COMException))]
         [DataRow(typeof(ExternalException))]
         [DataRow(typeof(FormatException))]
         [DataRow(typeof(InsufficientMemoryException))]

From 71d91657f101f9da326febcba53849d9217728ab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 28 Aug 2020 19:28:38 +0200
Subject: [PATCH 430/595] Added ThrowHelper.Generic tests

---
 .../Diagnostics/Test_ThrowHelper.cs           | 64 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
index 523f155ed4b..992ee7bca0f 100644
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
+++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
@@ -58,7 +58,8 @@ public void Test_ThrowHelper_Throw(Type exceptionType)
         {
             var methods = (
                 from method in typeof(ThrowHelper).GetMethods(BindingFlags.Public | BindingFlags.Static)
-                where method.Name == $"Throw{exceptionType.Name}"
+                where method.Name == $"Throw{exceptionType.Name}" &&
+                      !method.IsGenericMethod
                 select method).ToArray();
 
             foreach (var method in methods)
@@ -79,5 +80,66 @@ from parameter in method.GetParameters()
                 }
             }
         }
+
+        [TestCategory("Guard")]
+        [TestMethod]
+        [DataRow(typeof(ArrayTypeMismatchException))]
+        [DataRow(typeof(ArgumentException))]
+        [DataRow(typeof(ArgumentNullException))]
+        [DataRow(typeof(ArgumentOutOfRangeException))]
+        [DataRow(typeof(COMException))]
+        [DataRow(typeof(ExternalException))]
+        [DataRow(typeof(FormatException))]
+        [DataRow(typeof(InsufficientMemoryException))]
+        [DataRow(typeof(InvalidDataException))]
+        [DataRow(typeof(InvalidOperationException))]
+        [DataRow(typeof(LockRecursionException))]
+        [DataRow(typeof(MissingFieldException))]
+        [DataRow(typeof(MissingMemberException))]
+        [DataRow(typeof(MissingMethodException))]
+        [DataRow(typeof(NotSupportedException))]
+        [DataRow(typeof(ObjectDisposedException))]
+        [DataRow(typeof(OperationCanceledException))]
+        [DataRow(typeof(PlatformNotSupportedException))]
+        [DataRow(typeof(SynchronizationLockException))]
+        [DataRow(typeof(TimeoutException))]
+        [DataRow(typeof(UnauthorizedAccessException))]
+        [DataRow(typeof(Win32Exception))]
+        public void Test_ThrowHelper_Generic_Throw(Type exceptionType)
+        {
+            var methods = (
+                from method in typeof(ThrowHelper).GetMethods(BindingFlags.Public | BindingFlags.Static)
+                where method.Name == $"Throw{exceptionType.Name}" &&
+                      method.IsGenericMethod
+                select method).ToArray();
+
+            foreach (var method in methods)
+            {
+                // Prepare the parameters with the default value
+                var parameters = (
+                    from parameter in method.GetParameters()
+                    select DefaultValues[parameter.ParameterType]).ToArray();
+
+                // Invoke with value type
+                try
+                {
+                    method.MakeGenericMethod(typeof(int)).Invoke(null, parameters);
+                }
+                catch (TargetInvocationException e)
+                {
+                    Assert.IsInstanceOfType(e.InnerException, exceptionType);
+                }
+
+                // Invoke with reference type
+                try
+                {
+                    method.MakeGenericMethod(typeof(string)).Invoke(null, parameters);
+                }
+                catch (TargetInvocationException e)
+                {
+                    Assert.IsInstanceOfType(e.InnerException, exceptionType);
+                }
+            }
+        }
     }
 }

From fa0d097b8618795eb4a75dca02a44fbc95278e8a Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 28 Aug 2020 14:37:09 -0700
Subject: [PATCH 431/595] Fix for correct cert and appx detection on TAEF
 tests.

---
 UITests/UITests.App/UITests.App.csproj        |   7 ++--
 UITests/UITests.App/UITests.App.pfx           | Bin 0 -> 2528 bytes
 .../UITests.App/UITests.App_TemporaryKey.pfx  | Bin 2528 -> 0 bytes
 UITests/UITests.Tests.Shared/TestAssembly.cs  |   2 +-
 UITests/UITests.Tests.Shared/Tests.cs         |  33 ++++++++++++++----
 .../UITests.Tests.TAEF.csproj                 |   1 +
 6 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 UITests/UITests.App/UITests.App.pfx
 delete mode 100644 UITests/UITests.App/UITests.App_TemporaryKey.pfx

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 1951642019f..985e9a95b55 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -22,9 +22,8 @@
     <AppxBundle>Never</AppxBundle>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateKeyFile>
-    </PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>78851A63D7F5E9D97F416A5CE3FFAE6D1C38744F</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>UITests.App.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>24D62F3B13B8B9514EAD9C4DE48CC30F7CC6151D</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
@@ -168,7 +167,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="UITests.App_TemporaryKey.pfx" />
+    <None Include="UITests.App.pfx" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
diff --git a/UITests/UITests.App/UITests.App.pfx b/UITests/UITests.App/UITests.App.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..ec83ace8dee66bd5ed3b56449eab930d83815869
GIT binary patch
literal 2528
zcmZXUc{tQ<7sr1y#+IdwExRaYGMFLE$dEOWC9-G9l6{wll9()G8(EX=J(ijfVPt1y
z&DfW$6%Sb_;zf#g>U!Vjx!&vj<DC0@KHvMC>;C6HNF4Jl7(|D}F=sI_UyRX>*=GYW
zf(mfVaS$AHGz~{0arEE+$D&_{;OJLqc##$h3@rcYVm$={7vLbrNF3xlQjp=)e=%)1
zJA}ysfJG<`Vk^O5#vup}GWF4mm8vWm-Hk~qg!_i<$@mY6^(BMdqde?#13~qM0moV$
z9505H(oOS+wV6y3#Nv%DnY8IukZoKXA(cGSl_ZjeC|4bOud|M(l|=;%TJX7M7_T)i
zNuL#S3z{AlGa<A8sXEN^>EVwm6t$kqx~fr_(`5#AS-AQy`>q$yb1mLJ)2PY`J$*hB
zwnr#C(DWZqk$f;#+%kKZx}RP@<s{T1edT_8Gwcx~sytjUp~!1VV97R1q?32|&(2U1
zp5Zm$IX#}T{_8TIDzQh+7TykTGCEI8Tgmu5Rl3EHaO$K?#>IENabZc%63b7K&o0&p
zI#g>F5#{=@ZxQI;3H)6!SI>{Bbpbg0qkw5QJ<Kh$8-q+nLGM1emoZ76ubP_a0Os%>
z2NV){mV^s^DF}xlB#Ezli`U8pGg%w^_>WI4^URZM^jv%RPM39x<zR*il<_|jhV31m
zOcPU9io0W<UJpfgpJ!`vGYK?MjfArb%=M(<Fnv5k)@|Pv)&r|dQ?5r+4$JJjhTSPh
zlO~TPY?#oz(_=fVi+IZOzzlflXc&txI=q<J#_=X)DR<$ooi$giYlT_*y<nhGyrZ_*
z@l2J3s_nLoQ4+k+Rfuy^hvM7S75~Iyh-Z}CB;Q}lOq}HmA@Rd&@KamrOBE*KY7<)<
zCT51C;k#06h^t?^SlU}LKkhKLD%%kv;>CJF(d*CmXJ&cbYOy6(DFmSwL;fj2M_D4)
z^N756q;%53qKR=W>ef_4EEO-uellpmM{>PCd>tL3A8t7YOE^14S)J&ve@7oiw91g3
z_0Sh6&}%sNlx=IYR;a%0@R(S>X%}(+VAIvdiR8x~CR=q#hv3gSHXoLD&yDm1y@+oa
zavi{hZwXT*`hUW#9cnoyh4Oeay%n1W!ciUpA4faX40~aIUH$CbUx)9GRT4?mX@03@
z)Y7$UAu00lv+B|(CK?jQ=1^4FYO&YjD$mr&4H$Eq>UcNOWJ^)_)v5~~Iz71OO6|LN
zrLLVoHY&-q{7HC5->E1_c&w$`Mo8t>slQLS+?p+Xb-w-znDsBVrCh!w(dOh7#u}1{
zN1eKYWqDS`VafbEKJ~M3h4rW$0YkVxg6@9SLQL8Ng2gN68)kgd2r|r<6U#ofN4S|L
z_b0+X=ic>u8n-pS4`fJWPiMS%csXAftYOQ{bf7olqW5rcAj(Gk1J^Qn=s2dUrnwVh
zdqYwk8;=bj4}7}ta{_f#Pjyzdv}E#kt*tR2r`%kT{k}Mg)k3$mp6>i=v~-*9)R(qU
z)x7X)ewi#btd<1xd+Cn)I;v$MG4fSPbsy1a3P<n54C6#PZ2nkiqpW?7IkUw3?K5w`
z3{}0wooj#~N}oS5%l^#CQ;D^s>ipC%ZK!m(lKsftzFjg-XcgnPY_J9vW-K-X{tVui
zaB02BHNB}sF>P3XP}|WC-Buo{l;(JHm=tOq@%akenWL;gN6RYj!A6zts%Rnag1&(_
zWfTlIF^YrRQ_EC#$~ZNI#N}U3mse_jv&^$>w&p$7Zoe%bAD6Gn0wyhP6~{uE&y_eQ
zsFwD5ZH>=e;)*$W^KS9zg<Q^s4UYV)-qo`ndGqH3QwyY6sDoCqG6!9^bH6CY@02e+
zQ5)fxO8vZCn1zZQKyv=QE}6Me3=jwi005-LKadNhC#(zH0Tcl=fB`N6jsS|Lq-hEb
zAZhfM!T@r#EdASa2ApZ?HZ5PGb;;AhndYNu-fch;Y0JPY#Q=hUa7r8?l(DcOU;wxS
zPCx+Q3k1^Q4iE&00;aV5i}(Ppv`UkvLjgY;^QF}Rv@w2w+wU$>!1(vQU|Qu2xBvl2
z9NojeU(U!-fTQ!HAulippdBv%IH3Pu`8Sa&C8ZUc(Z5!H1da~f%7#<*xR<@**sZt{
z^vHNrwCxM;*ONq#c(rQNA#W#>-h8x+guOlkS*5YSCoAxbyY{3_6b9d1TXgrU`*p?h
ziB4ryWwPr`;kH?1IGc}?<J*!uQCGR~(q2~n1LJpkI1rzGn6f5@dFgWdn&Zc*$e9YE
z&HV9Umsb-TMW6*G8R+IS6&JnNEd$RrwBxMQZMG%{qQ;;te@Kvy;O5mbD~&C5%;L?n
z<FDQBem+gK$1cZq!Gib8Gz<KlecM%Jg{hn=+cS#Wpm?Y2*Eeb$imIE~O4tpTJu0z|
zT&=fa|Ik|3R490P^~qM~ZhAO7RLNjFg&1zYmq}oV*Pn-*Lr18`LiV~-B=v6Tb$8R?
zUh7exz}-Q){S{76)W_pu&((pU@yBfH;MaL5G3nTR)TYMI?d<Mzdd|(F8>{^V8;qUA
zc=BZl<fy%Z%p}^gLtk3Ue3myE662CTVbi|EllF?|(ps_FjL#0C3t>?(XLso(*Njp3
zYIO3UgL2No8PZ@I)n+*HtS@OWs#x`;j*@swwEIneq@Q>k^a5yaY;CpI=VpK)JNF<{
z>XAYpaTA(NB+H{azaO1i+O}1)PlU*d{p7LMrfM-#Tl_?@P|9Aj37npf#eP0nF36+u
ztW@^Y<!$%u`S#>v`2hhyVaMk1KJ?p&Bs7<_TQoQZO8ItZ1SG8;9mp66M>E*<SX<qp
z)Q|SLYZD?&@818AW3KTYQSp*n$hs9WEm*QNm*Cdm<82I9)L%)M*M*7LjWe8nbx+&$
zUv7EsQpNuFH6S~XLetbR{G^9xi9-hn|A8DlZKQU?)Kx_#?Pf*Ko1$I};>W(uN7aFa
zQl*AsdcW7BLV|4l`9E-<0?Ttn_AbR7wzDgYWIe_tW_b-w4mVbaOI%p?{g%G8zK-k-
zQf`uclc{yaSW@Kul)@KlT}zKW*jE)I8|Nk^dBj`gvC+$eM}euccIiwcmNYE4!(i4f
zGI}M%NVhF_xckElw|<8Ee(Df+Q<~F`b<ce{{jdup+cv1*U<D>oH;5V>lpXUl0>*}F
z3e}5tZl`2Xq#A1GZ^_2Q6=rg(^`H|3k`2U?QlCp9FC#^ej12Tr>~vs$2-ncHMU~Qr
siqU?jOZ^S%Fk-y6qt+0v%@(}zEw!HHxo2ChT`6<9?-5O6zdqi-0rqx(Jpcdz

literal 0
HcmV?d00001

diff --git a/UITests/UITests.App/UITests.App_TemporaryKey.pfx b/UITests/UITests.App/UITests.App_TemporaryKey.pfx
deleted file mode 100644
index 072b549c7eda08fe04c626fd3e41672db307e7d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2528
zcmZXUcU05a632fDNhlhH7^FxItRf{O6ax`N1f-Y+1Z*g*fB`fRkP@Xs5TvRsAT81a
z1Sy8zqd-7dnuJJ^q6cIZq!^SMST=gz+dc2RbI;tF`OJLpz5m?7Pz5K!AU+ILFdZhS
z9Bmf80SEDea;bu`5UOAl4@Y3A(Cz;zLBBw#&`&%(%d_{eeg9GI7XpEEsgS=gRLC|)
z3MTYl%sc!5L_pJtlcv<txBv$8zkyI8V~nUZxQ|k>`*c!ZHS<FIQ+)ClAN$X-Jx9a3
zmiv!Ry)fG8(3IO?Eu-!a)|YU`TlbQsdIFzKE4NT{u3an~@8{kL_c*?=XGv~+;*+#5
zHmpFr5XCp^Hq*N;*!_+1S@IjZxF?t#FN91R*?S<Ge?CR|o~C1bTX@J6OD^9=NxyJD
z#Jw`MfP3s50$zJ<Zcs8n+T32Y&p2yhYoizVGda`6e6uVgNo)UZyJ*2C98mW!>sCDF
zka!D)^!}x0llZ#B;%QJ(sVLt4QfDq*V@pu_;yIy?3;T3`x1Ustef@Zv5P#Y8%5clp
z&8j-I=<Mj*>}{j;x#Mtinih8mNhylqTe{WGZinynjt11Z?alkVlGV?Pt$U+Uiepif
zpKTV~9No~8Z9|$`8$+D(L&Rqz#c%AWVWLd$ckcPmu8J)=Vorw^GM-t>uZF|WT~*fV
zj0(w<oZqWI9VJ8*VJ;R4lvpENX45N_S~c$G7kPFEuSa&*d&T5H^nE)n&~(xI3Dx*r
zCV@>aPb+hZj1DO;SA9DP_$%BdQT|FpKP+g4w^;c0anp_N;Fx|_;|^qst!wx_xZib2
zo?Ws1;)CQd_Ck4^dedpC^{&Z#bRx%Gp;<e%TqA~wof60**9on@&qI?<-YK>hi8VeA
z$e5_eVu}@=u@o+NV_&fNZee1>c-*sAnpJkly-lt+L9M0xmsB$c&lFYf-pva4c}W$+
z0sX99dm7U!+qQKpTbk%8z=*gbU(?wz9ikaM78I5~CLqkjwIq1UiE5U&c~m67G<9~1
zf#-9$;_Vbe^Mh~?lZtAI(;eF0{TtJIsqzi)oxP8;HY`8>{$vxWH+eWPGW~hVnoN|&
zO0kQ;r>4j9RsOyKZFx0W?<qZt>FQ>GE+{Q3qQd5*`c^sGZws|)FMXctoPE8b*;5Ga
z&o@EqWMR(aJ2nqQm9S%n2HwrxwKDpyD}moTFmEbRW%pf@B-H%gP`p^B@<f`rpP@jW
zp~qKLqa8K$@m^3dcwUj2*UBZh5_?F?91DepCt#Tw?ysWL*8Px|%LrR(*WGYRz(UTo
z$R))*uMg{uzfJUE?HX>d_0^hRSYD3UC7VWYCpb)fBZb83RVpX^xxqu0e4NC&<0f5;
znTDlbhKyCrw(-shDbrp}cGvHqi8XIZ*P9Ix({z{X3FVh-9VO$%ZCcoUaQopL`$6qQ
z#JjwU%-pgg2ho!Wu|XL4{^KRghyv0s`Qqez=?i)@K@B6R^AzQSASi-hwv{Y_&RxmG
zN<K_?$w7FFBwmm99HLt<u8o?~?E;rm1ECUTA<$y^N8t95(9pY2tBKmKGd8ULL!pbK
z;Pb`%4x0<w<Q;5s0AhmJABTj;Lm=N*4LTZ|O)$)@(dvy?F6M-9JF;TlH#aDg^@WGN
z61r<;YJD+BCZwwO70@kq<g=snW204&aeu8#WzD6Yg&IJ$YRyPx^`UDx_^|rN7NVdo
zVsH4iv)+ivy|>!^J2D8sQ73)HujJd(%k?xnt;0-?$ua*mV)*+0lxDeY%IiLlu1PsU
za%+rqUTIIhZM(0{TI+d+OcqVl39aMm4uhL$nSh;o4u^kl&J}oKytGIs->sRkxRPOT
zNv{y-Ci@`*W)uUjZMckl!AA6B4*fGO1x2wi2m}NG0Or!a5Q(*rF#}ux4FC&h^L7m2
z1h@if0FD=F^OhQ*1)TUv)p!+MUZ>7arpb$)d7U_(*WyK5JUs^E025S!fgm6%P6ULt
zmaznW1#a>rK7beC%QIKN50C?FdHWAS2Hbd=5ibq^ym`!vm;3N8@dn&~s^kFcpM4Zw
zb^{;+J{T%r*gr4lhvicFym`n23<7wL_-_UD|0CakrL?}RH!1jI<cCxFbcDtA)fE&d
zgQ<FM$+;7)pU$?jNF+b6qR6KXsp4h6r`Ao%P<$HCUi<InWLSyNAjp!gY&$I9D+w<h
z=@SYSY8ij9GNpc-y);spEp{3CM4cA#e1%_%k1Jb-7`$poiihJ}U+nN7wy>|dU#i>6
zkf^_Y_A712DU1C~`s|rwkJU2i()j|8#1LB%+K1{j0@ll`H$Kjiq&VfM1ZT$!cdG?|
z+e#jL?$C?l${B>v!yjUm-WA23v~OFW1{)s=9?Lmxb4$aDhR!;7W|8@e&23i~NH`-#
zk$@1k;?q9$vN`@H0Y*t`*pUMhZ-jxN*=u_A8WUYq9ZLEH?NW1__{@|p5QQx?d#glN
zK0f`(_7Bv4r?4&SUC$TS&{9)=A`=t#YQo8~AJ2gh#?^MNRCJ7K**Vfdxd$UMvz~2T
z(xd{-xCT7rs&Ge(%;%_;;1BAI#hukpd@%ks7R8p6cti_iKJ0ndDnq^L-fo!I)XJPl
zvgXdtNQSd>Yn7v*eyvBHETd0mKS_gearJ!7hbIGj4^0Y-=a6w<Xrw}<NsVVww-q?M
z(&@T~ioeacxPKe1NL6P0m>pcgEU8BcyUC7Q9?BRsNV|m}@^h~r%r+k*c9umD(;B&z
z<=M8?<I(elLBrE~`lCLz_+=(P9@mva4%oDr$VW|8;Ve%jC2V^>vS5<Y{Lx>XwhkmJ
zFQu~Ya(30Cf~hGU_$0BZQ4R3$AD}Kvt+lV2BJ1MC(BOiHhIG#IVdzc0w>sJ?cJ+3l
zpM#19Qa4>{<VWX7E?QUbnF@!C2I$7Bx+Y~!(bQ8??>{PMY&$Xul}<zWiul{Qs=EVj
zO^r+raZ5S!h$bO#WuVv^me=YF;>X{SuFOq-u%McMg?1IuR-xkdK@k^x<5imjIaM^d
zi_c&D)iE)`^*lEe?#{FNY!4{yHmV!uvoN{Bd3DMmjL9Cz4SNI@SSrbp>6C8@(q`&6
zN6r`Jvvgwoa!$ca8XEMMzGnttl^&!NZb{BcEpjm2I&+Sre_9qQu~X>tc(}tATD?)S
z7o+p})yKYc7|K&D@Qmg=>=@nm%o|qN7I|3p+eoKm#USP+Mi#>lgQ^_h14}}X7L{+f
t<BGS3C7@gpi9kd|=gIkU2(lC>WcJBoke0BJJ-L_<hV{Bt5`KKVzX9@Cf|>vT

diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index 472e1f5e9ae..b0d9a3a5333 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -17,7 +17,7 @@ public class TestAssembly
         [TestProperty("RunFixtureAs:Assembly", "ElevatedUserOrSystem")]
         public static void AssemblyInitialize(TestContext testContext)
         {
-            TestEnvironment.AssemblyInitialize(testContext);
+            TestEnvironment.AssemblyInitialize(testContext, "UITests.App.pfx");
         }
 
         [AssemblyCleanup]
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 76cc1aa4073..5531a81c448 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -1,6 +1,7 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
@@ -22,19 +23,39 @@ public static TestApplicationInfo WinUICsUWPSampleApp
         {
             get
             {
-                var arch = RuntimeInformation.ProcessArchitecture.ToString();
-
                 string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
                 string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.FullName, "UITests.App");
 
+                var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs" };
+                var files = Directory.GetFiles(baseDirectory, "*.appx", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
+
+                if (files.Count() == 0)
+                {
+                    throw new Exception(string.Format("Failed to find '*.appx' in {0}'!", baseDirectory));
+                }
+
+                string mostRecentlyBuiltAppx = string.Empty;
+                DateTime timeMostRecentlyBuilt = DateTime.MinValue;
+
+                foreach (string file in files)
+                {
+                    DateTime fileWriteTime = File.GetLastWriteTime(file);
+
+                    if (fileWriteTime > timeMostRecentlyBuilt)
+                    {
+                        timeMostRecentlyBuilt = fileWriteTime;
+                        mostRecentlyBuiltAppx = file;
+                    }
+                }
+
                 return new TestApplicationInfo(
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f",
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
                     "UITests.App",
                     "UITests.App.exe",
-                    "UITests.App_1.0.0.0_" + arch + "_Debug",
-                    "78851a63d7f5e9d97f416a5ce3ffae6d1c38744f",
+                    mostRecentlyBuiltAppx.Replace(".appx", string.Empty),
+                    "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d",
                     baseDirectory);
             }
         }
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 4010bc8ae85..f1b5a545547 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -43,6 +43,7 @@
     <None Include="$(Pkgruntime_win-x86_microsoft_netcore_app)\runtimes\win-x86\native\*" Link=".NETCoreApp2.1\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
 
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />

From cfb26287273e4e2f5c303400255a641343d19b4c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 31 Aug 2020 22:35:32 +0200
Subject: [PATCH 432/595] Temporary reverted FieldAccessor<T> APIs

Regression to unblock UWP for now, see https://github.com/dotnet/corert/issues/8273
---
 .../ComponentModel/ObservableObject.cs        | 56 ++++++++++++-------
 .../Input/AsyncRelayCommand.cs                |  2 +-
 .../Input/AsyncRelayCommand{T}.cs             |  2 +-
 .../Mvvm/Test_ObservableObject.cs             |  2 +-
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 4e5eb57ecaa..a4b786cf668 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -312,22 +312,26 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// public Task MyTask
         /// {
         ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(() => ref myTask, value);
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
         /// }
         /// </code>
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="fieldAccessor">The <see cref="FieldAccessor{T}"/> instance to access the backing field for the property.</param>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
+        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
+        /// </param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current and new
-        /// value for the target property are the same. The return value being <see langword="true"/> only indicates that the
-        /// new value being assigned to field provided by <paramref name="fieldAccessor"/> is different than the previous one,
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
+        /// and new value for the target property are the same. The return value being <see langword="true"/> only
+        /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fieldAccessor, TTask? newValue, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
@@ -336,19 +340,21 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fie
             // instance. This will result in no further allocations after the first time this method is called for a given
             // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
             // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
-            return SetPropertyAndNotifyOnCompletion(fieldAccessor, newValue, _ => { }, propertyName);
+            return SetPropertyAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(FieldAccessor{TTask},TTask,string)"/>,
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
         /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
         /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="fieldAccessor">The <see cref="FieldAccessor{T}"/> instance to access the backing field for the property.</param>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="fieldExpression">
+        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
@@ -357,12 +363,9 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fie
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fieldAccessor, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
-            // Invoke the accessor once to get a field reference for the synchronous part
-            ref TTask? field = ref fieldAccessor();
-
             if (ReferenceEquals(field, newValue))
             {
                 return false;
@@ -393,6 +396,16 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(FieldAccessor<TTask?> fie
                 return true;
             }
 
+            // Get the target field to set. This is needed because we can't
+            // capture the ref field in a closure (for the async method).
+            if (!((fieldExpression.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
+            {
+                ThrowArgumentExceptionForInvalidFieldExpression();
+
+                // This is never executed, as the method above always throws
+                return false;
+            }
+
             // We use a local async function here so that the main method can
             // remain synchronous and return a value that can be immediately
             // used by the caller. This mirrors Set<T>(ref T, T, string).
@@ -412,7 +425,7 @@ async void MonitorTask()
                 {
                 }
 
-                TTask? currentTask = fieldAccessor();
+                TTask? currentTask = (TTask?)fieldInfo.GetValue(this);
 
                 // Only notify if the property hasn't changed
                 if (ReferenceEquals(newValue, currentTask))
@@ -428,13 +441,6 @@ async void MonitorTask()
             return true;
         }
 
-        /// <summary>
-        /// A custom <see langword="delegate"/> that returns a reference to a backing field to a property.
-        /// </summary>
-        /// <typeparam name="T">The type of reference to return.</typeparam>
-        /// <returns>A reference to the backing field of a property.</returns>
-        protected delegate ref T FieldAccessor<T>();
-
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>
@@ -442,5 +448,13 @@ private static void ThrowArgumentExceptionForInvalidPropertyExpression()
         {
             throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
         }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
+        /// </summary>
+        private static void ThrowArgumentExceptionForInvalidFieldExpression()
+        {
+            throw new ArgumentException("The given expression must be in the form () => field");
+        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index f9b41df775d..471fff34169 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -91,7 +91,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(() => ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 83d25155cf6..2a265f0752e 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -91,7 +91,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(() => ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 82f64fffbdd..89e70171139 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -226,7 +226,7 @@ public class SampleModelWithTask<T> : ObservableObject
             public Task<T> Data
             {
                 get => data;
-                set => SetPropertyAndNotifyOnCompletion(() => ref data, value);
+                set => SetPropertyAndNotifyOnCompletion(ref data, () => data, value);
             }
         }
     }

From 0bd1f92ad00dff22afbc832d197322e22055668c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 31 Aug 2020 23:46:42 +0200
Subject: [PATCH 433/595] Removed Ioc class and MS.Ex.DI dependency

---
 .../DependencyInjection/Ioc.cs                | 150 -----------------
 .../Microsoft.Toolkit.Mvvm.csproj             |   4 +-
 UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs   | 154 ------------------
 .../UnitTests.Shared.projitems                |   1 -
 4 files changed, 2 insertions(+), 307 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
 delete mode 100644 UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs

diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
deleted file mode 100644
index f8567c0de57..00000000000
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ /dev/null
@@ -1,150 +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 System.Threading;
-using Microsoft.Extensions.DependencyInjection;
-
-#nullable enable
-
-namespace Microsoft.Toolkit.Mvvm.DependencyInjection
-{
-    /// <summary>
-    /// A type that facilitates the use of the <see cref="IServiceProvider"/> type.
-    /// The <see cref="Ioc"/> provides the ability to configure services in a singleton, thread-safe
-    /// service provider instance, which can then be used to resolve service instances.
-    /// The first step to use this feature is to declare some services, for instance:
-    /// <code>
-    /// public interface ILogger
-    /// {
-    ///     void Log(string text);
-    /// }
-    /// </code>
-    /// <code>
-    /// public class ConsoleLogger : ILogger
-    /// {
-    ///     void Log(string text) => Console.WriteLine(text);
-    /// }
-    /// </code>
-    /// Then the services configuration should then be done at startup, by calling one of
-    /// the available <see cref="ConfigureServices(IServiceCollection)"/> overloads, like so:
-    /// <code>
-    /// Ioc.Default.ConfigureServices(services =>
-    /// {
-    ///     services.AddSingleton&lt;ILogger, Logger&gt;();
-    /// });
-    /// </code>
-    /// Finally, you can use the <see cref="Ioc"/> instance (which implements <see cref="IServiceProvider"/>)
-    /// to retrieve the service instances from anywhere in your application, by doing as follows:
-    /// <code>
-    /// Ioc.Default.GetService&lt;ILogger&gt;().Log("Hello world!");
-    /// </code>
-    /// </summary>
-    public sealed class Ioc : IServiceProvider
-    {
-        /// <summary>
-        /// Gets the default <see cref="Ioc"/> instance.
-        /// </summary>
-        public static Ioc Default { get; } = new Ioc();
-
-        /// <summary>
-        /// The <see cref="ServiceProvider"/> instance to use, if initialized.
-        /// </summary>
-        private volatile ServiceProvider? serviceProvider;
-
-        /// <inheritdoc/>
-        /// <exception cref="InvalidOperationException">Thrown if the current instance has not been configured yet.</exception>
-        object? IServiceProvider.GetService(Type serviceType)
-        {
-            // As per section I.12.6.6 of the official CLI ECMA-335 spec:
-            // "[...] read and write access to properly aligned memory locations no larger than the native
-            // word size is atomic when all the write accesses to a location are the same size. Atomic writes
-            // shall alter no bits other than those written. Unless explicit layout control is used [...],
-            // data elements no larger than the natural word size [...] shall be properly aligned.
-            // Object references shall be treated as though they are stored in the native word size."
-            // The field being accessed here is of native int size (reference type), and is only ever accessed
-            // directly and atomically by a compare exchange instruction (see below), or here. We can therefore
-            // assume this read is thread safe with respect to accesses to this property or to invocations to one
-            // of the available configuration methods. So we can just read the field directly and make the necessary
-            // check with our local copy, without the need of paying the locking overhead from this get accessor.
-            ServiceProvider? provider = this.serviceProvider;
-
-            if (provider is null)
-            {
-                ThrowInvalidOperationExceptionForMissingInitialization();
-            }
-
-            return provider!.GetService(serviceType);
-        }
-
-        /// <summary>
-        /// Initializes the shared <see cref="IServiceProvider"/> instance.
-        /// </summary>
-        /// <param name="setup">The configuration delegate to use to add services.</param>
-        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
-        public void ConfigureServices(Action<IServiceCollection> setup)
-        {
-            ConfigureServices(setup, new ServiceProviderOptions());
-        }
-
-        /// <summary>
-        /// Initializes the shared <see cref="IServiceProvider"/> instance.
-        /// </summary>
-        /// <param name="setup">The configuration delegate to use to add services.</param>
-        /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
-        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
-        public void ConfigureServices(Action<IServiceCollection> setup, ServiceProviderOptions options)
-        {
-            var collection = new ServiceCollection();
-
-            setup(collection);
-
-            ConfigureServices(collection, options);
-        }
-
-        /// <summary>
-        /// Initializes the shared <see cref="IServiceProvider"/> instance.
-        /// </summary>
-        /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
-        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
-        public void ConfigureServices(IServiceCollection services)
-        {
-            ConfigureServices(services, new ServiceProviderOptions());
-        }
-
-        /// <summary>
-        /// Initializes the shared <see cref="IServiceProvider"/> instance.
-        /// </summary>
-        /// <param name="services">The input <see cref="IServiceCollection"/> instance to use.</param>
-        /// <param name="options">The <see cref="ServiceProviderOptions"/> instance to configure the service provider behaviors.</param>
-        /// <exception cref="InvalidOperationException">Thrown if the current instance has already been configured.</exception>
-        public void ConfigureServices(IServiceCollection services, ServiceProviderOptions options)
-        {
-            ServiceProvider newServices = services.BuildServiceProvider(options);
-
-            ServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, newServices, null);
-
-            if (!(oldServices is null))
-            {
-                ThrowInvalidOperationExceptionForRepeatedConfiguration();
-            }
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when the <see cref="ServiceProvider"/> property is used before initialization.
-        /// </summary>
-        private static void ThrowInvalidOperationExceptionForMissingInitialization()
-        {
-            throw new InvalidOperationException("The service provider has not been configured yet");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when a configuration is attempted more than once.
-        /// </summary>
-        private static void ThrowInvalidOperationExceptionForRepeatedConfiguration()
-        {
-            throw new InvalidOperationException("The default service provider has already been configured");
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index b98b400247d..d9e4a16cdea 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -16,8 +16,9 @@
     <PackageTags>UWP Toolkit Windows MVVM MVVMToolkit observable Ioc dependency injection services extensions helpers</PackageTags>
   </PropertyGroup>
 
-  <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
+  <!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
 
@@ -27,7 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
deleted file mode 100644
index 44fbf61301e..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
+++ /dev/null
@@ -1,154 +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.Extensions.DependencyInjection;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.DependencyInjection;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [TestClass]
-    public class Test_Ioc
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_ServicesNotConfigured()
-        {
-            var ioc = new Ioc();
-
-            Assert.ThrowsException<InvalidOperationException>(() => ioc.GetService<IServiceProvider>());
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_LambdaInitialization()
-        {
-            var ioc = new Ioc();
-
-            ioc.ConfigureServices(services =>
-            {
-                services.AddSingleton<INameService, AliceService>();
-            });
-
-            var service = ioc.GetRequiredService<INameService>();
-
-            Assert.IsNotNull(service);
-            Assert.IsInstanceOfType(service, typeof(AliceService));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_LambdaInitialization_ConcreteType()
-        {
-            var ioc = new Ioc();
-
-            ioc.ConfigureServices(services =>
-            {
-                services.AddSingleton<AliceService, AliceService>();
-            });
-
-            var service = ioc.GetRequiredService<AliceService>();
-
-            Assert.IsNotNull(service);
-            Assert.IsInstanceOfType(service, typeof(AliceService));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_LambdaInitialization_ConstructorInjection()
-        {
-            var ioc = new Ioc();
-            var messenger = new Messenger();
-
-            ioc.ConfigureServices(services =>
-            {
-                services.AddSingleton<INameService, AliceService>();
-                services.AddSingleton<IMessenger>(messenger);
-                services.AddTransient<MyRecipient>();
-            });
-
-            var service = ioc.GetRequiredService<MyRecipient>();
-
-            Assert.IsNotNull(service);
-            Assert.IsInstanceOfType(service, typeof(MyRecipient));
-            Assert.IsNotNull(service.NameService);
-            Assert.IsInstanceOfType(service.NameService, typeof(AliceService));
-            Assert.IsNotNull(service.MessengerService);
-            Assert.AreSame(service.MessengerService, messenger);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_CollectionInitialization()
-        {
-            var ioc = new Ioc();
-
-            var services = new ServiceCollection();
-
-            services.AddSingleton<INameService, AliceService>();
-
-            ioc.ConfigureServices(services);
-
-            var service = ioc.GetRequiredService<INameService>();
-
-            Assert.IsNotNull(service);
-            Assert.IsInstanceOfType(service, typeof(AliceService));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_RepeatedLambdaInitialization()
-        {
-            var ioc = new Ioc();
-
-            ioc.ConfigureServices(services => { });
-
-            Assert.ThrowsException<InvalidOperationException>(() => ioc.ConfigureServices(services => { }));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_Ioc_RepeatedCollectionInitialization()
-        {
-            var ioc = new Ioc();
-
-            var services = new ServiceCollection();
-
-            ioc.ConfigureServices(services);
-
-            Assert.ThrowsException<InvalidOperationException>(() => ioc.ConfigureServices(services));
-        }
-
-        public interface INameService
-        {
-            string GetName();
-        }
-
-        public class BobService : INameService
-        {
-            public string GetName() => "Bob";
-        }
-
-        public class AliceService : INameService
-        {
-            public string GetName() => "Alice";
-        }
-
-        public class MyRecipient : ObservableRecipient
-        {
-            public MyRecipient(INameService nameService, IMessenger messengerService)
-                : base(messengerService)
-            {
-                NameService = nameService;
-            }
-
-            public INameService NameService { get; }
-
-            public IMessenger MessengerService => Messenger;
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index 14147cede7e..2422170a482 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -23,7 +23,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Ioc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.Request.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableObject.cs" />

From ff5f32f46440b58174b65a379a4bd1e16bd1c305 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 1 Sep 2020 15:29:24 -0700
Subject: [PATCH 434/595] Initial Commit to Fix #3449

TODO:
 - [ ] Wait on 3437 to finish resource name refactor
 - [ ] Finish updating GetLocalized calls to use simpler syntax
 - [ ] Ensure Toolbar Resource Keys are Prefixed with proper "WindowsCommunityToolkit_" prefix like all others
 - [ ] Optimize?
 - [ ] Write more test cases?
---
 .../BladeView/BladeItem.cs                    |   4 +-
 .../GridSplitter/GridSplitter.cs              |   2 +-
 .../InAppNotification/InAppNotification.cs    |   2 +-
 .../ToolbarItems/Common/CommonButtons.cs      |  12 +-
 .../Extensions/StringExtensions.cs            |  16 ++-
 .../Strings/en-us/Resources.resw              | 123 ++++++++++++++++++
 .../UnitTests.UWP/Strings/fr/Resources.resw   | 123 ++++++++++++++++++
 .../Controls/Test_TextToolbar_Localization.cs |  94 +++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   5 +
 9 files changed, 368 insertions(+), 13 deletions(-)
 create mode 100644 UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
 create mode 100644 UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
 create mode 100644 UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
index e02715d8b1a..4d9a49de7c0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
@@ -68,7 +68,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = StringExtensions.GetLocalized("WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -84,7 +84,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = StringExtensions.GetLocalized("WindowsCommunityToolkit_BladeView_ExpandButton_Expanded", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WindowsCommunityToolkit_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
index fbf0e750bd9..83c1654d3bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = StringExtensions.GetLocalized("WindowsCommunityToolkit_GridSplitter_AutomationName", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string automationName = "WindowsCommunityToolkit_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 38ddced4e5e..91e9f8434be 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -63,7 +63,7 @@ protected override void OnApplyTemplate()
             {
                 _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed;
                 _dismissButton.Click += DismissButton_Click;
-                AutomationProperties.SetName(_dismissButton, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
+                AutomationProperties.SetName(_dismissButton, "WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
             }
 
             if (_visualStateGroup != null)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
index 3328f0f3748..be014b88284 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
@@ -37,7 +37,7 @@ public ToolbarButton Bold
                 return new ToolbarButton
                 {
                     Name = TextToolbar.BoldElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_BoldLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_BoldLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Bold },
                     ShortcutKey = VirtualKey.B,
                     Activation = MakeBold
@@ -55,7 +55,7 @@ public ToolbarButton Italics
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ItalicsElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_StrikethroughLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_ItalicsLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Italic },
                     ShortcutKey = VirtualKey.I,
                     Activation = MakeItalics
@@ -73,7 +73,7 @@ public ToolbarButton Strikethrough
                 return new ToolbarButton
                 {
                     Name = TextToolbar.StrikethoughElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_StrikethroughLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_StrikethroughLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new FontIcon { Glyph = "\u0335a\u0335b\u0335c\u0335", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                     Activation = MakeStrike,
                     ShortcutKey = VirtualKey.Subtract,
@@ -92,7 +92,7 @@ public ToolbarButton Link
                 return new ToolbarButton
                 {
                     Name = TextToolbar.LinkElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_LinkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_LinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Link },
                     ShortcutKey = VirtualKey.K,
                     Activation = OpenLinkCreator,
@@ -111,7 +111,7 @@ public ToolbarButton List
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ListElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_ListLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_ListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Content = new TextToolbarSymbols.List(),
                     Activation = MakeList
                 };
@@ -128,7 +128,7 @@ public ToolbarButton OrderedList
                 return new ToolbarButton
                 {
                     Name = TextToolbar.OrderedElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_OrderedListLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_OrderedListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Content = new TextToolbarSymbols.NumberedList(),
                     Activation = MakeOList
                 };
diff --git a/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
index ac3fe240312..1701e70ecdd 100644
--- a/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
@@ -57,12 +57,22 @@ public static string GetLocalized(this string resourceKey, UIContext uiContext =
         }
 
         /// <summary>
-        /// Retrieves the provided resource for the given key for use independent of the UI thread.
+        /// Retrieves the provided resource for the given key for use independent of the UI thread. First looks up resource at the application level, before falling back to provided resourcePath. This allows for easily overridable resources within a library.
         /// </summary>
         /// <param name="resourceKey">Resource key to retrieve.</param>
-        /// <param name="resourcePath">Resource path to retrieve.</param>
+        /// <param name="resourcePath">Resource path to fall back to in case resourceKey not found in app resources.</param>
         /// <returns>string value for given resource or empty string if not found.</returns>
         public static string GetLocalized(this string resourceKey, string resourcePath)
-            => ResourceLoader.GetForViewIndependentUse(resourcePath).GetString(resourceKey);
+        {
+            // Try and retrieve resource at app level first.
+            var result = IndependentLoader.GetString(resourceKey);
+
+            if (string.IsNullOrEmpty(result))
+            {
+                result = ResourceLoader.GetForViewIndependentUse(resourcePath).GetString(resourceKey);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
new file mode 100644
index 00000000000..6ea6a7cb805
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+    <value>ItalicsOverride</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
new file mode 100644
index 00000000000..aac8297adbd
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+    <value>ItalicsFr</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
new file mode 100644
index 00000000000..1a3a3e426d7
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
@@ -0,0 +1,94 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using System.Linq;
+using Windows.Globalization;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Markup;
+
+namespace UnitTests.UI.Controls
+{
+    [TestClass]
+    public class Test_TextToolbar_Localization
+    {
+        /// <summary>
+        /// Tests the general ability to look-up a resource from the UI control as a base-case.
+        /// </summary>
+        [TestCategory("Test_TextToolbar_Localization")]
+        [UITestMethod]
+        public void Test_Retrieve()
+        {
+            var treeRoot = XamlReader.Load(
+@"<Page
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+
+    <controls:TextToolbar x:Name=""TextToolbarControl"">
+    </controls:TextToolbar>
+
+</Page>") as FrameworkElement;
+
+            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+
+            var toolbar = treeRoot.FindChildByName("TextToolbarControl") as TextToolbar;
+
+            Assert.IsNotNull(toolbar, "Could not find TextToolbar in tree.");
+
+            var commonButtons = new CommonButtons(toolbar);
+            var boldButton = commonButtons.Bold;
+
+            Assert.IsNotNull(boldButton, "Bold Button not found.");
+
+            Assert.AreEqual("Bold", boldButton.ToolTip, "Label doesn't match expected default value.");
+        }
+
+        /// <summary>
+        /// Tests the ability to override the resource lookup for a toolkit component in the app resource dictionary.
+        /// See Link:Strings/en-us/Resources.resw
+        /// </summary>
+        [TestCategory("Test_TextToolbar_Localization")]
+        [UITestMethod]
+        public void Test_Override()
+        {
+            var commonButtons = new CommonButtons(new TextToolbar());
+            var italicsButton = commonButtons.Italics;
+
+            Assert.IsNotNull(italicsButton, "Italics Button not found.");
+
+            Assert.AreEqual("ItalicsOverride", italicsButton.ToolTip, "Label doesn't match expected default value.");
+        }
+
+        /// <summary>
+        /// Tests the ability to have different overrides in different languages.
+        /// </summary>
+        [TestCategory("Test_TextToolbar_Localization")]
+        [UITestMethod]
+        public void Test_Override_Fr()
+        {
+            // Just double-check we've got the right environment setup in our tests.
+            CollectionAssert.AreEquivalent(new string[] { "en-US", "fr" }, ApplicationLanguages.ManifestLanguages.ToArray(), "Missing locales for test");
+
+            // Override the default language for this test only (we'll set it back after).
+            var defaultLanguage = ApplicationLanguages.PrimaryLanguageOverride;
+            ApplicationLanguages.PrimaryLanguageOverride = "fr";
+
+            var commonButtons = new CommonButtons(new TextToolbar());
+            var italicsButton = commonButtons.Italics;
+
+            ApplicationLanguages.PrimaryLanguageOverride = defaultLanguage;
+
+            // Check for expected values.
+            Assert.IsNotNull(italicsButton, "Italics Button not found.");
+
+            Assert.AreEqual("ItalicsFr", italicsButton.ToolTip, "Label doesn't match expected default value.");
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 0b40d7f34d8..77153e440e5 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -176,6 +176,7 @@
     <Compile Include="PrivateType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helpers\Test_WeakEventListener.cs" />
+    <Compile Include="UI\Controls\Test_TextToolbar_Localization.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_General.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_InterspersedCollection.cs" />
     <Compile Include="UI\Controls\Test_MasterDetailsView.cs" />
@@ -200,6 +201,10 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include=".editorconfig" />
+    <PRIResource Include="Strings\fr\Resources.resw" />
+    <PRIResource Include="Strings\en-us\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Samples\lorem.txt" />

From 8607b79e98400fb80b682e04c0444c5398a4443f Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 2 Sep 2020 15:26:36 +0200
Subject: [PATCH 435/595] add focus behaviors

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  23 +++
 .../AutoFocusBehaviorPage.xaml                |  21 +++
 .../AutoFocusBehaviorPage.xaml.cs             |  16 ++
 .../AutoFocusBehaviorXaml.bind                |  20 ++
 .../FocusBehavior/FocusBehaviorPage.xaml      |  31 +++
 .../FocusBehavior/FocusBehaviorPage.xaml.cs   |  22 +++
 .../FocusBehavior/FocusBehaviorXaml.bind      |  31 +++
 .../SamplePages/samples.json                  |  22 ++-
 .../Behaviors/AutoFocusBehavior.cs            |  18 ++
 .../Behaviors/FocusBehavior.cs                | 176 ++++++++++++++++++
 10 files changed, 379 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Behaviors/AutoFocusBehavior.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 6426c03d171..052031482b1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -517,9 +517,15 @@
     </Content>
     <Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
+    <Compile Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorPage.xaml.cs">
+      <DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
       <DependentUpon>EnumValuesExtensionPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\FocusBehavior\FocusBehaviorPage.xaml.cs">
+      <DependentUpon>FocusBehaviorPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\TilesBrush\TilesBrushPage.xaml.cs">
       <DependentUpon>TilesBrushPage.xaml</DependentUpon>
     </Compile>
@@ -623,6 +629,10 @@
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionXaml.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionCode.bind" />
+    <Content Include="SamplePages\FocusBehavior\FocusBehaviorXaml.bind">
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -1001,10 +1011,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Content Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorXaml.bind">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Content>
     <Page Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SamplePages\FocusBehavior\FocusBehaviorPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1574,6 +1596,7 @@
       <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml
new file mode 100644
index 00000000000..cff145b7aee
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml
@@ -0,0 +1,21 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.AutoFocusBehaviorPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <Grid>
+        <StackPanel HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+            <Button Content="I receive the focus when loaded">
+                <interactivity:Interaction.Behaviors>
+                    <behaviors:AutoFocusBehavior />
+                </interactivity:Interaction.Behaviors>
+            </Button>
+            <Button Content="I do not receive the focus when loaded" />
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml.cs
new file mode 100644
index 00000000000..8d55b38c0b4
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorPage.xaml.cs
@@ -0,0 +1,16 @@
+// 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 Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    /// <summary>
+    /// A page that shows how to use the AutoFocusBehavior
+    /// </summary>
+    public sealed partial class AutoFocusBehaviorPage : Page
+    {
+        public AutoFocusBehaviorPage() => InitializeComponent();
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorXaml.bind
new file mode 100644
index 00000000000..3d5cf980416
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoFocusBehavior/AutoFocusBehaviorXaml.bind
@@ -0,0 +1,20 @@
+<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+  <Grid>
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+      <Button Content="I receive the focus when loaded">
+        <interactivity:Interaction.Behaviors>
+          <behaviors:AutoFocusBehavior />
+        </interactivity:Interaction.Behaviors>
+      </Button>
+      <Button Content="I do not receive the focus when loaded" />
+    </StackPanel>
+  </Grid>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml
new file mode 100644
index 00000000000..869610ef10b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml
@@ -0,0 +1,31 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.FocusBehaviorPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <interactivity:Interaction.Behaviors>
+        <behaviors:FocusBehavior>
+            <behaviors:FocusTarget Control="{x:Bind disabledItem}" />
+            <behaviors:FocusTarget Control="{x:Bind emptyList}" />
+            <behaviors:FocusTarget Control="{x:Bind enabledItem}" />
+        </behaviors:FocusBehavior>
+    </interactivity:Interaction.Behaviors>
+
+    <StackPanel>
+        <Button x:Name="disabledItem"
+                Content="I'm disabled and cannot get the focus"
+                IsEnabled="False" />
+        <ListView x:Name="emptyList">
+            <!--<ListView.Items>
+                <x:String>Item 1</x:String>
+                <x:String>Item 2</x:String>
+            </ListView.Items>-->
+        </ListView>
+        <Button x:Name="enabledItem"
+                Content="I can get the focus" />
+    </StackPanel>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
new file mode 100644
index 00000000000..d6498809499
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
@@ -0,0 +1,22 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    /// <summary>
+    /// A page that shows how to use the FocusBehavior
+    /// </summary>
+    public sealed partial class FocusBehaviorPage : Page, IXamlRenderListener
+    {
+        public FocusBehaviorPage() => InitializeComponent();
+
+        public void OnXamlRendered(FrameworkElement control)
+        {
+
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
new file mode 100644
index 00000000000..66f92d6a253
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
@@ -0,0 +1,31 @@
+<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+  <interactivity:Interaction.Behaviors>
+    <behaviors:FocusBehavior>
+      <behaviors:FocusTarget Control="{Binding ElementName=disabledItem}" />
+      <behaviors:FocusTarget Control="{Binding ElementName=emptyList}" />
+      <behaviors:FocusTarget Control="{Binding ElementName=enabledItem}" />
+    </behaviors:FocusBehavior>
+  </interactivity:Interaction.Behaviors>
+
+  <StackPanel>
+    <Button x:Name="disabledItem"
+            Content="I'm disabled and cannot get the focus"
+            IsEnabled="False" />
+    <ListView x:Name="emptyList">
+      <!-- Uncomment this to fill the list and have it receiving the focus
+            <ListView.Items>
+                <x:String>Item 1</x:String>
+                <x:String>Item 2</x:String>
+            </ListView.Items>-->
+    </ListView>
+    <Button x:Name="enabledItem"
+            Content="I can get the focus" />
+  </StackPanel>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 7cba82117d9..cab3b7fd5c5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -875,12 +875,32 @@
         "Type": "ViewportBehaviorPage",
         "Subcategory": "Systems",
         "About": "Behavior for listening element enter or exit viewport",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Animations/ViewportBehavior",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors",
         "CodeFile": "ViewportBehaviorCode.bind",
         "XamlCodeFile": "ViewportBehaviorXaml.bind",
         "Icon": "/SamplePages/ViewportBehavior/ViewportBehavior.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ViewportBehavior.md"
       },
+      {
+        "Name": "AutoFocusBehavior",
+        "Type": "AutoFocusBehaviorPage",
+        "Subcategory": "Systems",
+        "About": "Behavior to automatically set the focus on a control when it loads",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors/",
+        "XamlCodeFile": "AutoFocusBehaviorXaml.bind",
+        "Icon": "/Assets/Helpers.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/AutoFocusBehavior.md"
+      },
+      {
+        "Name": "FocusBehavior",
+        "Type": "FocusBehaviorPage",
+        "Subcategory": "Systems",
+        "About": "Behavior to automatically set the focus on the first control which accepts it",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors/",
+        "XamlCodeFile": "FocusBehaviorXaml.bind",
+        "Icon": "/Assets/Helpers.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehavior.md"
+      },
       {
         "Name": "Markdown Parser",
         "Type": "MarkdownParserPage",
diff --git a/Microsoft.Toolkit.Uwp.UI/Behaviors/AutoFocusBehavior.cs b/Microsoft.Toolkit.Uwp.UI/Behaviors/AutoFocusBehavior.cs
new file mode 100644
index 00000000000..14e78e19775
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Behaviors/AutoFocusBehavior.cs
@@ -0,0 +1,18 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Behaviors
+{
+    /// <summary>
+    /// This behavior automatically sets the focus on the associated <see cref="Control"/> when it is loaded.
+    /// </summary>
+    public sealed class AutoFocusBehavior : BehaviorBase<Control>
+    {
+        /// <inheritdoc/>
+        protected override void OnAssociatedObjectLoaded() => AssociatedObject.Focus(FocusState.Programmatic);
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
new file mode 100644
index 00000000000..04e670ad381
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
@@ -0,0 +1,176 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace Microsoft.Toolkit.Uwp.UI.Behaviors
+{
+#pragma warning disable SA1402 // File may only contain a single type
+    /// <summary>
+    /// This behavior sets the focus on the first control of <see cref="Targets"/> which accepts it.
+    /// The focus will be set following the <see cref="Targets"/> order. The first control being ready
+    /// and accepting the focus will receive it.
+    /// The focus can be set to another control with a higher priority if it loads before <see cref="FocusEngagementTimeout"/>.
+    /// </summary>
+    [ContentProperty(Name = nameof(Targets))]
+    public sealed class FocusBehavior : BehaviorBase<UIElement>
+    {
+        /// <summary>
+        /// The DP to store the <see cref="Targets"/> property value.
+        /// </summary>
+        public static readonly DependencyProperty TargetsProperty = DependencyProperty.Register(
+            nameof(Targets),
+            typeof(FocusTargetList),
+            typeof(FocusBehavior),
+            new PropertyMetadata(null, OnTargetsPropertyChanged));
+
+        private static readonly TimeSpan FocusEngagementTimeout = TimeSpan.FromMilliseconds(100);
+        private DispatcherTimer _timer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FocusBehavior"/> class.
+        /// </summary>
+        public FocusBehavior() => Targets = new FocusTargetList();
+
+        /// <summary>
+        /// Gets or sets the ordered list of controls which should receive the focus when the associated object is loaded.
+        /// </summary>
+        public FocusTargetList Targets
+        {
+            get => (FocusTargetList)GetValue(TargetsProperty);
+            set => SetValue(TargetsProperty, value);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAssociatedObjectLoaded() => ApplyFocus();
+
+        /// <inheritdoc/>
+        protected override void OnDetaching() => Stop();
+
+        private static void OnTargetsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var behavior = (FocusBehavior)d;
+
+            if (e.OldValue is FocusTargetList oldTargets)
+            {
+                behavior.Stop(oldTargets);
+            }
+
+            behavior.ApplyFocus();
+        }
+
+        private void ApplyFocus()
+        {
+            if (Targets.Count == 0)
+            {
+                return;
+            }
+
+            var focusedControlIndex = -1;
+            for (var i = 0; i < Targets.Count; i++)
+            {
+                var control = Targets[i].Control;
+                if (control.IsLoaded)
+                {
+                    if (control.Focus(FocusState.Programmatic))
+                    {
+                        focusedControlIndex = i;
+                        break;
+                    }
+                }
+                else
+                {
+                    control.Loaded += OnControlLoaded;
+                }
+            }
+
+            if (focusedControlIndex == 0 || Targets.All(t => t.Control?.IsLoaded == true))
+            {
+                // The first control has received the focus or all the control are loaded and none can take the focus: we stop.
+                Stop();
+            }
+            else if (focusedControlIndex > 0)
+            {
+                // We have been able to set the focus on one control.
+                // We start the timer to detect if we can focus another control with an higher priority.
+                // This allows us to handle the case where the controls are not loaded in the order we expect.
+                if (_timer is null)
+                {
+                    _timer = new DispatcherTimer
+                    {
+                        Interval = FocusEngagementTimeout,
+                    };
+                    _timer.Tick += OnEngagementTimerTick;
+                    _timer.Start();
+                }
+            }
+        }
+
+        private void OnControlPropertyChanged(DependencyObject sender, DependencyProperty dp) => ApplyFocus();
+
+        private void OnEngagementTimerTick(object sender, object e)
+        {
+            ApplyFocus();
+            Stop();
+        }
+
+        private void OnControlLoaded(object sender, RoutedEventArgs e) => ApplyFocus();
+
+        private void Stop(FocusTargetList targets = null)
+        {
+            if (_timer != null)
+            {
+                _timer.Stop();
+                _timer = null;
+            }
+
+            foreach (var target in targets ?? Targets)
+            {
+                if (target.Control is null)
+                {
+                    continue;
+                }
+
+                target.Control.Loaded -= OnControlLoaded;
+            }
+        }
+    }
+
+    /// <summary>
+    /// A collection of <see cref="FocusTarget"/>.
+    /// </summary>
+    public sealed class FocusTargetList : List<FocusTarget>
+    {
+    }
+
+    /// <summary>
+    /// A target for the <see cref="FocusBehavior"/>.
+    /// </summary>
+    public sealed class FocusTarget : DependencyObject
+    {
+        /// <summary>
+        /// The DP to store the <see cref="Control"/> property value.
+        /// </summary>
+        public static readonly DependencyProperty ControlProperty = DependencyProperty.Register(
+            nameof(Control),
+            typeof(Control),
+            typeof(FocusTarget),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the control that will receive the focus.
+        /// </summary>
+        public Control Control
+        {
+            get => (Control)GetValue(ControlProperty);
+            set => SetValue(ControlProperty, value);
+        }
+    }
+#pragma warning restore SA1402 // File may only contain a single type
+}

From 92b7a2c9898df6b39e589b8622695168ff6c7ee3 Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 2 Sep 2020 15:28:25 +0200
Subject: [PATCH 436/595] cleaned csproj

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj             | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 052031482b1..66ec6b12d12 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -629,10 +629,8 @@
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionXaml.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionCode.bind" />
-    <Content Include="SamplePages\FocusBehavior\FocusBehaviorXaml.bind">
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="SamplePages\FocusBehavior\FocusBehaviorXaml.bind" />
+    <Content Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorXaml.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -1015,10 +1013,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Content Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorXaml.bind">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Content>
     <Page Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 516914ff1acb1d6a46adb7c4d3ea72a2f14a68ab Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Wed, 2 Sep 2020 15:44:25 +0200
Subject: [PATCH 437/595] changed xaml code to code to avoid crash

---
 .../SamplePages/FocusBehavior/FocusBehaviorXaml.bind        | 6 +++---
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json    | 2 +-
 Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs         | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
index 66f92d6a253..70c46b29117 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorXaml.bind
@@ -8,9 +8,9 @@
 
   <interactivity:Interaction.Behaviors>
     <behaviors:FocusBehavior>
-      <behaviors:FocusTarget Control="{Binding ElementName=disabledItem}" />
-      <behaviors:FocusTarget Control="{Binding ElementName=emptyList}" />
-      <behaviors:FocusTarget Control="{Binding ElementName=enabledItem}" />
+      <behaviors:FocusTarget Control="{x:Bind disabledItem}" />
+      <behaviors:FocusTarget Control="{x:Bind emptyList}" />
+      <behaviors:FocusTarget Control="{x:Bind enabledItem}" />
     </behaviors:FocusBehavior>
   </interactivity:Interaction.Behaviors>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index cab3b7fd5c5..ef73ca3e589 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -897,7 +897,7 @@
         "Subcategory": "Systems",
         "About": "Behavior to automatically set the focus on the first control which accepts it",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors/",
-        "XamlCodeFile": "FocusBehaviorXaml.bind",
+        "CodeFile": "FocusBehaviorXaml.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehavior.md"
       },
diff --git a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
index 04e670ad381..1df3b1514d1 100644
--- a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
@@ -112,8 +112,6 @@ private void ApplyFocus()
             }
         }
 
-        private void OnControlPropertyChanged(DependencyObject sender, DependencyProperty dp) => ApplyFocus();
-
         private void OnEngagementTimerTick(object sender, object e)
         {
             ApplyFocus();

From 4144f60dcc8eca6e1529b1f146db9b9de61d341d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 2 Sep 2020 17:50:52 +0200
Subject: [PATCH 438/595] Removed repeated ErrorsChanged event raise

---
 .../ComponentModel/ObservableValidator.cs            | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 5bf505fc6dc..153a7ded239 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -47,13 +47,15 @@ public void ValidateProperty(object value, [CallerMemberName] string? propertyNa
                 ThrowArgumentNullExceptionForNullPropertyName();
             }
 
+            bool errorsChanged = false;
+
             // Clear the errors for the specified property, if any
             if (this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors) &&
                 propertyErrors.Count > 0)
             {
                 propertyErrors.Clear();
 
-                ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+                errorsChanged = true;
             }
 
             List<ValidationResult> results = new List<ValidationResult>();
@@ -78,6 +80,14 @@ public void ValidateProperty(object value, [CallerMemberName] string? propertyNa
                     propertyErrors.AddRange(results);
                 }
 
+                errorsChanged = true;
+            }
+
+            // Only raise the event once if needed. This happens either when the target property
+            // had existing errors and is now valid, or if the validation has failed and there are
+            // new errors to broadcast, regardless of the previous validation state for the property.
+            if (errorsChanged)
+            {
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
         }

From fed7051317a98e44fb361d722ccdca80980b2133 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 2 Sep 2020 17:56:07 +0200
Subject: [PATCH 439/595] Added null/"" handling in
 ObservableValidator.GetErrors

---
 .../ComponentModel/ObservableValidator.cs              | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 153a7ded239..09fb2728ec9 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -29,9 +29,15 @@ public abstract class ObservableValidator : ObservableObject, INotifyDataErrorIn
         public bool HasErrors => this.errors.Count > 0;
 
         /// <inheritdoc/>
-        public IEnumerable GetErrors(string propertyName)
+        public IEnumerable GetErrors(string? propertyName)
         {
-            return this.errors[propertyName];
+            if (!(propertyName is null) &&
+                this.errors.TryGetValue(propertyName, out List<ValidationResult> errors))
+            {
+                return errors;
+            }
+
+            return null!;
         }
 
         /// <summary>

From dcdf649a8bc15e37f4c07eed28e404ad2dcc71b8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 2 Sep 2020 10:53:25 -0700
Subject: [PATCH 440/595] Addressed PR feedback.

---
 .../DwellInvokedRoutedEventArgs.cs            |  9 +-
 .../DwellProgressEventArgs.cs                 |  9 +-
 .../GazeCursor.cs                             | 12 ++-
 .../GazeEventArgs.cs                          | 16 ++--
 .../GazePointer.cs                            | 49 +++++------
 .../GazeStats.cs                              |  7 +-
 ...t.Toolkit.Uwp.Input.GazeInteraction.csproj |  2 +-
 .../Package.appxmanifest                      |  1 +
 .../TestsPage.xaml                            |  5 ++
 .../UnitTests.XamlIslands.UWPApp.csproj       |  7 +-
 .../XamlIslandsTest_Gaze.cs                   | 87 +++++++++++++++++++
 .../UnitTests.XamlIslands.csproj              |  2 +-
 12 files changed, 148 insertions(+), 58 deletions(-)
 create mode 100644 UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
index 5ee2c572dd8..fe953ca9eba 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellInvokedRoutedEventArgs.cs
@@ -2,7 +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 Windows.UI.Xaml;
+using System.ComponentModel;
 
 namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
 {
@@ -10,13 +10,8 @@ namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
     /// This parameter is passed to the GazeElement::Invoked event and allows
     /// the application to prevent default invocation when the user dwells on a control
     /// </summary>
-    public class DwellInvokedRoutedEventArgs : RoutedEventArgs
+    public sealed class DwellInvokedRoutedEventArgs : HandledEventArgs
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library prevents invoking the control when the user dwells on a control
-        /// </summary>
-        public bool Handled { get; set; }
-
         internal DwellInvokedRoutedEventArgs()
         {
         }
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
index f614f58d4cb..d7e1974a555 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/DwellProgressEventArgs.cs
@@ -3,14 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.UI.Xaml;
+using System.ComponentModel;
 
 namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
 {
     /// <summary>
     /// This parameter is passed to the GazeElement.DwellProgressFeedback event. The event is fired to inform the application of the user's progress towards completing dwelling on a control
     /// </summary>
-    public class DwellProgressEventArgs : RoutedEventArgs
+    public sealed class DwellProgressEventArgs : HandledEventArgs
     {
         /// <summary>
         /// Gets an enum that reflects the current state of dwell progress
@@ -22,11 +22,6 @@ public class DwellProgressEventArgs : RoutedEventArgs
         /// </summary>
         public double Progress { get; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library suppresses default animation for dwell feedback on the control
-        /// </summary>
-        public bool Handled { get; set; }
-
         internal DwellProgressEventArgs(DwellProgressState state, TimeSpan elapsedDuration, TimeSpan triggerDuration)
         {
             State = state;
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
index ab16c42a4a4..d4e95c2f1f0 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeCursor.cs
@@ -145,7 +145,17 @@ private void SetVisibility()
             }
             else if (isOpen)
             {
-                var topmost = VisualTreeHelper.GetOpenPopups(Window.Current).First();
+                Popup topmost;
+
+                if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && _gazePopup.XamlRoot != null)
+                {
+                    topmost = VisualTreeHelper.GetOpenPopupsForXamlRoot(_gazePopup.XamlRoot).First();
+                }
+                else
+                {
+                    topmost = VisualTreeHelper.GetOpenPopups(Window.Current).First();
+                }
+
                 if (_gazePopup != topmost)
                 {
                     _gazePopup.IsOpen = false;
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
index d32e207c3e4..85805fc098e 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeEventArgs.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using Windows.Foundation;
 
 namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
@@ -10,22 +11,17 @@ namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
     /// <summary>
     /// EventArgs used to send Gaze events. See <see cref="GazePointer.GazeEvent"/>
     /// </summary>
-    public class GazeEventArgs
+    public sealed class GazeEventArgs : HandledEventArgs
     {
         /// <summary>
-        /// Gets or sets a value indicating whether the application handled the event. If this parameter is set to true, the library prevents handling the events on that particular gaze event.
+        /// Gets the location of the Gaze event
         /// </summary>
-        public bool Handled { get; set; }
+        public Point Location { get; private set; }
 
         /// <summary>
-        /// Gets or sets the location of the Gaze event
+        /// Gets the timestamp of the gaze event
         /// </summary>
-        public Point Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timestamp of the gaze event
-        /// </summary>
-        public TimeSpan Timestamp { get; set; }
+        public TimeSpan Timestamp { get; private set; }
 
         internal void Set(Point location, TimeSpan timestamp)
         {
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
index 839ebe4780b..d5df67c55ac 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
@@ -60,50 +60,42 @@ public void LoadSettings(ValueSet settings)
             Filter.LoadSettings(settings);
 
             // TODO Add logic to protect against missing settings
-            if (settings.ContainsKey("GazePointer.FixationDelay"))
+            if (settings.TryGetValue("GazePointer.FixationDelay", out var fixationDelay))
             {
-                _defaultFixation = new TimeSpan((int)settings["GazePointer.FixationDelay"] * 10);
+                _defaultFixation = new TimeSpan((int)fixationDelay * 10);
+                SetElementStateDelay(_offScreenElement, PointerState.Fixation, new TimeSpan((int)fixationDelay * 10));
             }
 
-            if (settings.ContainsKey("GazePointer.DwellDelay"))
+            if (settings.TryGetValue("GazePointer.DwellDelay", out var dwellDelay))
             {
-                _defaultDwell = new TimeSpan((int)settings["GazePointer.DwellDelay"] * 10);
+                _defaultDwell = new TimeSpan((int)dwellDelay * 10);
+                SetElementStateDelay(_offScreenElement, PointerState.Dwell, new TimeSpan((int)dwellDelay * 10));
             }
 
-            if (settings.ContainsKey("GazePointer.DwellRepeatDelay"))
+            if (settings.TryGetValue("GazePointer.DwellRepeatDelay", out var dwellRepeatDelay))
             {
-                _defaultDwellRepeatDelay = new TimeSpan((int)settings["GazePointer.DwellRepeatDelay"] * 10);
+                _defaultDwellRepeatDelay = new TimeSpan((int)dwellRepeatDelay * 10);
             }
 
-            if (settings.ContainsKey("GazePointer.RepeatDelay"))
+            if (settings.TryGetValue("GazePointer.RepeatDelay", out var repeatDelay))
             {
-                _defaultRepeatDelay = new TimeSpan((int)settings["GazePointer.RepeatDelay"] * 10);
+                _defaultRepeatDelay = new TimeSpan((int)repeatDelay * 10);
             }
 
-            if (settings.ContainsKey("GazePointer.ThresholdDelay"))
+            if (settings.TryGetValue("GazePointer.ThresholdDelay", out var thresholdDelay))
             {
-                _defaultThreshold = new TimeSpan((int)settings["GazePointer.ThresholdDelay"] * 10);
+                _defaultThreshold = new TimeSpan((int)thresholdDelay * 10);
             }
 
             // TODO need to set fixation and dwell for all elements
-            if (settings.ContainsKey("GazePointer.FixationDelay"))
+            if (settings.TryGetValue("GazePointer.GazeIdleTime", out var gazeIdleTime))
             {
-                SetElementStateDelay(_offScreenElement, PointerState.Fixation, new TimeSpan((int)settings["GazePointer.FixationDelay"] * 10));
+                EyesOffDelay = new TimeSpan((int)gazeIdleTime * 10);
             }
 
-            if (settings.ContainsKey("GazePointer.DwellDelay"))
+            if (settings.TryGetValue("GazePointer.IsSwitchEnabled", out var isSwitchEnabled))
             {
-                SetElementStateDelay(_offScreenElement, PointerState.Dwell, new TimeSpan((int)settings["GazePointer.DwellDelay"] * 10));
-            }
-
-            if (settings.ContainsKey("GazePointer.GazeIdleTime"))
-            {
-                EyesOffDelay = new TimeSpan((int)settings["GazePointer.GazeIdleTime"] * 10);
-            }
-
-            if (settings.ContainsKey("GazePointer.IsSwitchEnabled"))
-            {
-                IsSwitchEnabled = (bool)settings["GazePointer.IsSwitchEnabled"];
+                IsSwitchEnabled = (bool)isSwitchEnabled;
             }
         }
 
@@ -671,17 +663,16 @@ private void RaiseGazePointerEvent(GazeTargetItem target, PointerState state, Ti
             var gpea = new StateChangedEventArgs(control, state, elapsedTime);
 
             /*
-             * var buttonObj = dynamic_cast<Button >(target);
-             * if (buttonObj && buttonObj.Content)
+             * if (control is Button buttonObj && buttonObj.Content != null)
              * {
-             *     String buttonText = dynamic_cast<String>(buttonObj.Content);
-             *     Debug.WriteLine("GPE: %s . %s, %d", buttonText, PointerStates[(int)state], elapsedTime);
+             *     var buttonText = buttonObj.Content as string;
+             *     Debug.WriteLine("GPE: {0} . {1}, {2}", buttonText, PointerStates[(int)state], elapsedTime);
              * }
              * else
              * {
              *     Debug.WriteLine("GPE: 0x%08x . %s, %d", target != null ? target.GetHashCode() : 0, PointerStates[(int)state], elapsedTime);
              * }
-            */
+             */
 
             var gazeElement = target != null ? GazeInput.GetGazeElement(control) : null;
 
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
index fbb3c4d07cb..972026d2b1d 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeStats.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
     /// <summary>
     /// Provides basic stats for eye gaze
     /// </summary>
-    public class GazeStats
+    internal class GazeStats
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GazeStats"/> class.
@@ -70,6 +70,11 @@ public Point Mean
             get
             {
                 var count = _history.Count;
+                if (count < _maxHistoryLen)
+                {
+                    return new Point(0.0f, 0.0f);
+                }
+
                 return new Point((float)_sumX / count, (float)_sumY / count);
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
index 883210a55f3..71d61ad0ef0 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.17134</TargetFrameworks>
+    <TargetFramework>uap10.0.17134</TargetFramework>
     <Title>Windows Community Toolkit Eye Gaze Library</Title>
     <Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
     <PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
diff --git a/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest b/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
index 1d1aaf29eda..e62d0022854 100644
--- a/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
+++ b/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
@@ -45,5 +45,6 @@
   <Capabilities>
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
+    <DeviceCapability Name="gazeInput" />
   </Capabilities>
 </Package>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/TestsPage.xaml b/UnitTests/UnitTests.XamlIslands.UWPApp/TestsPage.xaml
index 1af0c478ab1..91cd3a460c5 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/TestsPage.xaml
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/TestsPage.xaml
@@ -5,6 +5,11 @@
     xmlns:local="using:UnitTests.XamlIslands.UWPApp"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:g='using:Microsoft.Toolkit.Uwp.Input.GazeInteraction'
+    g:GazeInput.Interaction="Disabled"
+    g:GazeInput.IsCursorVisible="True"
+    g:GazeInput.IsSwitchEnabled="False"
+    g:GazeInput.CursorRadius="5"
     mc:Ignorable="d"
     Background="White">
 
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 5d4f2ab6393..910f190b078 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -135,6 +135,7 @@
     </Compile>
     <Compile Include="XamlIslandsTest_TokenizingTextBox.cs" />
     <Compile Include="XamlIslandsTest_TextToolbar.cs" />
+    <Compile Include="XamlIslandsTest_Gaze.cs" />
     <Compile Include="XamlIslandsTest_WrapPanel.cs" />
     <Compile Include="XamlIslandsTest_DropShadowPanel.cs" />
     <Compile Include="XamlIslandsTest_Eyedropper.cs" />
@@ -169,7 +170,7 @@
       <Version>6.2.10</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.0.0</Version>
+      <Version>6.1.2</Version>
     </PackageReference>
     <!-- Ignored for now, until it supports Xaml Islands
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
@@ -182,6 +183,10 @@
       <Project>{42ca4935-54be-42ea-ac19-992378c08de6}</Project>
       <Name>Microsoft.Toolkit.Parsers</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">
+      <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
+      <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs
new file mode 100644
index 00000000000..f8133b8be71
--- /dev/null
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs
@@ -0,0 +1,87 @@
+// 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.Linq;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace UnitTests.XamlIslands.UWPApp
+{
+    [STATestClass]
+    public partial class XamlIslandsTest_Gaze
+    {
+        private Button _button;
+        private Grid _grid;
+
+        [TestInitialize]
+        public async Task Init()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            {
+                var xamlItemsPanelTemplate = @"<Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' 
+                                                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+                                                 xmlns:g='using:Microsoft.Toolkit.Uwp.Input.GazeInteraction'>
+                        <Button HorizontalAlignment='Center' BorderBrush='#7FFFFFFF'
+                                    g:GazeInput.ThresholdDuration='50'
+                                    g:GazeInput.FixationDuration='350'
+                                    g:GazeInput.DwellDuration='400'
+                                    g:GazeInput.RepeatDelayDuration='400'
+                                    g:GazeInput.DwellRepeatDuration='400'
+                                    g:GazeInput.MaxDwellRepeatCount='0'
+                                    Content='Gaze click here'
+                                    Width='100'
+                                    Height='100'/>
+                    </Grid>";
+                _grid = XamlReader.Load(xamlItemsPanelTemplate) as Grid;
+
+                GazeInput.SetInteraction(_grid, Interaction.Enabled);
+                GazeInput.SetIsCursorVisible(_grid, true);
+                GazeInput.SetCursorRadius(_grid, 20);
+                GazeInput.SetIsSwitchEnabled(_grid, false);
+
+                _button = (Button)_grid.Children.First();
+                _button.Click += (sender, e) =>
+                {
+                    _button.Content = "Clicked";
+                };
+
+                var gazeButtonControl = GazeInput.GetGazeElement(_button);
+
+                if (gazeButtonControl == null)
+                {
+                    gazeButtonControl = new GazeElement();
+                    GazeInput.SetGazeElement(_button, gazeButtonControl);
+                }
+
+                TestsPage.Instance.SetMainTestContent(_grid);
+            });
+        }
+
+        [TestCleanup]
+        public async Task Cleanup()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            {
+                GazeInput.SetInteraction(_grid, Interaction.Disabled);
+            });
+        }
+
+        // Ignoring since Gaze isn't working on Xaml Islands
+        [TestMethod]
+        [Ignore]
+        public async Task Gaze_DoesNotCrashOnIslands()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(async () =>
+            {
+                await Task.Delay(10000);
+
+                Assert.AreEqual("Clicked", _button.Content as string);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
index ab52bd03741..8311f5275a5 100644
--- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
+++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.2" />
   </ItemGroup>
 
   <ItemGroup>

From b0f6b719cc66fa936e72057210b763b766158802 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 2 Sep 2020 23:24:31 +0200
Subject: [PATCH 441/595] Added TaskAccessor<TTask> API, code refactoring

---
 .../ComponentModel/ObservableObject.cs        | 88 +++++++++++--------
 .../Input/AsyncRelayCommand.cs                |  4 +-
 .../Input/AsyncRelayCommand{T}.cs             |  4 +-
 .../Mvvm/Test_ObservableObject.cs             |  4 +-
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index a4b786cf668..d43e0fd8316 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -301,37 +301,37 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>, with the difference being that this method
-        /// will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
+        /// The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>, with the difference being that
+        /// this method will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
         /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
         /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// This method and its overload specifically rely on the <see cref="TaskAccessor{TTask}"/> type, which needs
+        /// to be used in the backing field for the target <see cref="Task"/> property. The field doesn't need to be
+        /// initialized, as this method will take care of doing that automatically. The <see cref="TaskAccessor{TTask}"/>
+        /// type also includes an implicit operator, so it can be assigned to any <see cref="Task"/> instance directly.
         /// Here is a sample property declaration using this method:
         /// <code>
-        /// private Task myTask;
+        /// private TaskAccessor&lt;Task&gt; myTask;
         ///
         /// public Task MyTask
         /// {
         ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, () => myTask, value);
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, value);
         /// }
         /// </code>
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update. This is needed to be
-        /// able to raise the <see cref="PropertyChanged"/> to notify the completion of the input task.
-        /// </param>
+        /// <param name="taskAccessor">The field accessor to modify.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
         /// and new value for the target property are the same. The return value being <see langword="true"/> only
-        /// indicates that the new value being assigned to <paramref name="field"/> is different than the previous one,
+        /// indicates that the new value being assigned to <paramref name="taskAccessor"/> is different than the previous one,
         /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>? taskAccessor, TTask? newValue, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
@@ -340,21 +340,19 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
             // instance. This will result in no further allocations after the first time this method is called for a given
             // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
             // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
-            return SetPropertyAndNotifyOnCompletion(ref field, fieldExpression, newValue, _ => { }, propertyName);
+            return SetPropertyAndNotifyOnCompletion(ref taskAccessor, newValue, _ => { }, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TTask,Expression{Func{TTask}},TTask,string)"/>,
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TaskAccessor{TTask},TTask,string)"/>,
         /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
         /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
         /// </summary>
         /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="field">The field storing the property's value.</param>
-        /// <param name="fieldExpression">
-        /// An <see cref="Expression{TDelegate}"/> returning the field to update.</param>
+        /// <param name="taskAccessor">The field accessor to modify.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
@@ -363,10 +361,13 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Expression<Func<TTask?>> fieldExpression, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
+        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>? taskAccessor, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
             where TTask : Task
         {
-            if (ReferenceEquals(field, newValue))
+            // Initialize the task accessor, if none is present
+            var localAccessor = taskAccessor ??= new TaskAccessor<TTask>();
+
+            if (ReferenceEquals(taskAccessor.Value, newValue))
             {
                 return false;
             }
@@ -379,7 +380,7 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
 
             OnPropertyChanging(propertyName);
 
-            field = newValue;
+            localAccessor.Value = newValue;
 
             OnPropertyChanged(propertyName);
 
@@ -396,16 +397,6 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TTask? field, Express
                 return true;
             }
 
-            // Get the target field to set. This is needed because we can't
-            // capture the ref field in a closure (for the async method).
-            if (!((fieldExpression.Body as MemberExpression)?.Member is FieldInfo fieldInfo))
-            {
-                ThrowArgumentExceptionForInvalidFieldExpression();
-
-                // This is never executed, as the method above always throws
-                return false;
-            }
-
             // We use a local async function here so that the main method can
             // remain synchronous and return a value that can be immediately
             // used by the caller. This mirrors Set<T>(ref T, T, string).
@@ -425,10 +416,8 @@ async void MonitorTask()
                 {
                 }
 
-                TTask? currentTask = (TTask?)fieldInfo.GetValue(this);
-
                 // Only notify if the property hasn't changed
-                if (ReferenceEquals(newValue, currentTask))
+                if (ReferenceEquals(newValue, localAccessor.Value))
                 {
                     OnPropertyChanged(propertyName);
                 }
@@ -442,19 +431,42 @@ async void MonitorTask()
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
+        /// A wrapping class that can hold a <see cref="Task"/> value.
         /// </summary>
-        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
+        /// <typeparam name="TTask">The type of value to store.</typeparam>
+        protected sealed class TaskAccessor<TTask>
+            where TTask : Task
         {
-            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TaskAccessor{TTask}"/> class.
+            /// </summary>
+            internal TaskAccessor()
+            {
+            }
+
+#pragma warning disable SA1401 // Fields should be private
+            /// <summary>
+            /// Gets or sets the wrapped <see cref="Task"/> value.
+            /// </summary>
+            internal TTask? Value;
+#pragma warning restore SA1401
+
+            /// <summary>
+            /// Unwraps the <typeparamref name="TTask"/> value stored in the current instance.
+            /// </summary>
+            /// <param name="accessor">The input <see cref="TaskAccessor{TTask}"/> instance.</param>
+            public static implicit operator TTask?(TaskAccessor<TTask>? accessor)
+            {
+                return accessor?.Value;
+            }
         }
 
         /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
+        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
         /// </summary>
-        private static void ThrowArgumentExceptionForInvalidFieldExpression()
+        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
         {
-            throw new ArgumentException("The given expression must be in the form () => field");
+            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index 471fff34169..2ba5598f5b8 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -83,7 +83,7 @@ public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute, Func<b
             this.canExecute = canExecute;
         }
 
-        private Task? executionTask;
+        private TaskAccessor<Task>? executionTask;
 
         /// <inheritdoc/>
         public Task? ExecutionTask
@@ -91,7 +91,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index 2a265f0752e..b9e04fb2be4 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -83,7 +83,7 @@ public AsyncRelayCommand(Func<T, CancellationToken, Task> cancelableExecute, Fun
             this.canExecute = canExecute;
         }
 
-        private Task? executionTask;
+        private TaskAccessor<Task>? executionTask;
 
         /// <inheritdoc/>
         public Task? ExecutionTask
@@ -91,7 +91,7 @@ public Task? ExecutionTask
             get => this.executionTask;
             private set
             {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, () => this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
+                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, value, _ => OnPropertyChanged(nameof(IsRunning))))
                 {
                     OnPropertyChanged(nameof(IsRunning));
                 }
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 89e70171139..5de4cb18a6e 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -221,12 +221,12 @@ static async Task TestAsync(Action<TaskCompletionSource<int>> callback)
 
         public class SampleModelWithTask<T> : ObservableObject
         {
-            private Task<T> data;
+            private TaskAccessor<Task<T>> data;
 
             public Task<T> Data
             {
                 get => data;
-                set => SetPropertyAndNotifyOnCompletion(ref data, () => data, value);
+                set => SetPropertyAndNotifyOnCompletion(ref data, value);
             }
         }
     }

From dd4fd4c83f2ec0e88844ec7c4fe460e6feae332b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 3 Sep 2020 02:03:06 +0200
Subject: [PATCH 442/595] Hidden Task/Task<T> type from TaskNotifier

---
 .../ComponentModel/ObservableObject.cs        | 167 ++++++++++++++----
 .../Input/AsyncRelayCommand.cs                |   2 +-
 .../Input/AsyncRelayCommand{T}.cs             |   2 +-
 .../Mvvm/Test_ObservableObject.cs             |   2 +-
 4 files changed, 138 insertions(+), 35 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index d43e0fd8316..60f5f44d18f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -305,13 +305,13 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// this method will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
         /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
         /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
-        /// This method and its overload specifically rely on the <see cref="TaskAccessor{TTask}"/> type, which needs
+        /// This method and its overload specifically rely on the <see cref="TaskNotifier"/> type, which needs
         /// to be used in the backing field for the target <see cref="Task"/> property. The field doesn't need to be
-        /// initialized, as this method will take care of doing that automatically. The <see cref="TaskAccessor{TTask}"/>
+        /// initialized, as this method will take care of doing that automatically. The <see cref="TaskNotifier"/>
         /// type also includes an implicit operator, so it can be assigned to any <see cref="Task"/> instance directly.
         /// Here is a sample property declaration using this method:
         /// <code>
-        /// private TaskAccessor&lt;Task&gt; myTask;
+        /// private TaskNotifier myTask;
         ///
         /// public Task MyTask
         /// {
@@ -320,19 +320,17 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
         /// }
         /// </code>
         /// </summary>
-        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="taskAccessor">The field accessor to modify.</param>
+        /// <param name="taskNotifier">The field notifier to modify.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
         /// and new value for the target property are the same. The return value being <see langword="true"/> only
-        /// indicates that the new value being assigned to <paramref name="taskAccessor"/> is different than the previous one,
-        /// and it does not mean the new <typeparamref name="TTask"/> instance passed as argument is in any particular state.
+        /// indicates that the new value being assigned to <paramref name="taskNotifier"/> is different than the previous one,
+        /// and it does not mean the new <see cref="Task"/> instance passed as argument is in any particular state.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>? taskAccessor, TTask? newValue, [CallerMemberName] string? propertyName = null)
-            where TTask : Task
+        protected bool SetPropertyAndNotifyOnCompletion(ref TaskNotifier? taskNotifier, Task? newValue, [CallerMemberName] string? propertyName = null)
         {
             // We invoke the overload with a callback here to avoid code duplication, and simply pass an empty callback.
             // The lambda expression here is transformed by the C# compiler into an empty closure class with a
@@ -340,19 +338,18 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>?
             // instance. This will result in no further allocations after the first time this method is called for a given
             // generic type. We only pay the cost of the virtual call to the delegate, but this is not performance critical
             // code and that overhead would still be much lower than the rest of the method anyway, so that's fine.
-            return SetPropertyAndNotifyOnCompletion(ref taskAccessor, newValue, _ => { }, propertyName);
+            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, _ => { }, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given field (which should be the backing
         /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
         /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{TTask}(ref TaskAccessor{TTask},TTask,string)"/>,
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion(ref TaskNotifier,Task,string)"/>,
         /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
         /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
         /// </summary>
-        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
-        /// <param name="taskAccessor">The field accessor to modify.</param>
+        /// <param name="taskNotifier">The field notifier to modify.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="callback">A callback to invoke to update the property value.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
@@ -361,13 +358,86 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>?
         /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
         /// if the current and new value for the target property are the same.
         /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>? taskAccessor, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
-            where TTask : Task
+        protected bool SetPropertyAndNotifyOnCompletion(ref TaskNotifier? taskNotifier, Task? newValue, Action<Task?> callback, [CallerMemberName] string? propertyName = null)
+        {
+            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>, with the difference being that
+        /// this method will also monitor the new value of the property (a generic <see cref="Task"/>) and will also
+        /// raise the <see cref="PropertyChanged"/> again for the target property when it completes.
+        /// This can be used to update bindings observing that <see cref="Task"/> or any of its properties.
+        /// This method and its overload specifically rely on the <see cref="TaskNotifier{T}"/> type, which needs
+        /// to be used in the backing field for the target <see cref="Task"/> property. The field doesn't need to be
+        /// initialized, as this method will take care of doing that automatically. The <see cref="TaskNotifier{T}"/>
+        /// type also includes an implicit operator, so it can be assigned to any <see cref="Task"/> instance directly.
+        /// Here is a sample property declaration using this method:
+        /// <code>
+        /// private TaskNotifier&lt;int&gt; myTask;
+        ///
+        /// public Task&lt;int&gt; MyTask
+        /// {
+        ///     get => myTask;
+        ///     private set => SetAndNotifyOnCompletion(ref myTask, value);
+        /// }
+        /// </code>
+        /// </summary>
+        /// <typeparam name="T">The type of result for the <see cref="Task{TResult}"/> to set and monitor.</typeparam>
+        /// <param name="taskNotifier">The field notifier to modify.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised if the current
+        /// and new value for the target property are the same. The return value being <see langword="true"/> only
+        /// indicates that the new value being assigned to <paramref name="taskNotifier"/> is different than the previous one,
+        /// and it does not mean the new <see cref="Task{TResult}"/> instance passed as argument is in any particular state.
+        /// </remarks>
+        protected bool SetPropertyAndNotifyOnCompletion<T>(ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, [CallerMemberName] string? propertyName = null)
         {
-            // Initialize the task accessor, if none is present
-            var localAccessor = taskAccessor ??= new TaskAccessor<TTask>();
+            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, _ => { }, propertyName);
+        }
 
-            if (ReferenceEquals(taskAccessor.Value, newValue))
+        /// <summary>
+        /// Compares the current and new values for a given field (which should be the backing
+        /// field for a property). If the value has changed, raises the <see cref="PropertyChanging"/>
+        /// event, updates the field and then raises the <see cref="PropertyChanged"/> event.
+        /// This method is just like <see cref="SetPropertyAndNotifyOnCompletion{T}(ref TaskNotifier{T},Task{T},string)"/>,
+        /// with the difference being an extra <see cref="Action{T}"/> parameter with a callback being invoked
+        /// either immediately, if the new task has already completed or is <see langword="null"/>, or upon completion.
+        /// </summary>
+        /// <typeparam name="T">The type of result for the <see cref="Task{TResult}"/> to set and monitor.</typeparam>
+        /// <param name="taskNotifier">The field notifier to modify.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
+        /// if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetPropertyAndNotifyOnCompletion<T>(ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, Action<Task<T>?> callback, [CallerMemberName] string? propertyName = null)
+        {
+            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Implements the notification logic for the related methods.
+        /// </summary>
+        /// <typeparam name="TTask">The type of <see cref="Task"/> to set and monitor.</typeparam>
+        /// <param name="taskNotifier">The field notifier.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, Action<TTask?> callback, [CallerMemberName] string? propertyName = null)
+            where TTask : Task
+        {
+            if (ReferenceEquals(taskNotifier.Task, newValue))
             {
                 return false;
             }
@@ -380,7 +450,7 @@ protected bool SetPropertyAndNotifyOnCompletion<TTask>(ref TaskAccessor<TTask>?
 
             OnPropertyChanging(propertyName);
 
-            localAccessor.Value = newValue;
+            taskNotifier.Task = newValue;
 
             OnPropertyChanged(propertyName);
 
@@ -417,7 +487,7 @@ async void MonitorTask()
                 }
 
                 // Only notify if the property hasn't changed
-                if (ReferenceEquals(newValue, localAccessor.Value))
+                if (ReferenceEquals(newValue, taskNotifier.Task))
                 {
                     OnPropertyChanged(propertyName);
                 }
@@ -431,33 +501,66 @@ async void MonitorTask()
         }
 
         /// <summary>
-        /// A wrapping class that can hold a <see cref="Task"/> value.
+        /// An interface for task notifiers of a specified type.
         /// </summary>
         /// <typeparam name="TTask">The type of value to store.</typeparam>
-        protected sealed class TaskAccessor<TTask>
+        private interface ITaskNotifier<TTask>
             where TTask : Task
         {
             /// <summary>
-            /// Initializes a new instance of the <see cref="TaskAccessor{TTask}"/> class.
+            /// Gets or sets the wrapped <typeparamref name="TTask"/> value.
             /// </summary>
-            internal TaskAccessor()
+            TTask? Task { get; set; }
+        }
+
+        /// <summary>
+        /// A wrapping class that can hold a <see cref="Task"/> value.
+        /// </summary>
+        protected sealed class TaskNotifier : ITaskNotifier<Task>
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TaskNotifier"/> class.
+            /// </summary>
+            internal TaskNotifier()
+            {
+            }
+
+            /// <inheritdoc/>
+            Task? ITaskNotifier<Task>.Task { get; set; }
+
+            /// <summary>
+            /// Unwraps the <see cref="Task"/> value stored in the current instance.
+            /// </summary>
+            /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
+            public static implicit operator Task?(TaskNotifier? notifier)
             {
+                return Unsafe.As<ITaskNotifier<Task>>(notifier)?.Task;
             }
+        }
 
-#pragma warning disable SA1401 // Fields should be private
+        /// <summary>
+        /// A wrapping class that can hold a <see cref="Task{T}"/> value.
+        /// </summary>
+        /// <typeparam name="T">The type of value for the wrapped <see cref="Task{T}"/> instance.</typeparam>
+        protected sealed class TaskNotifier<T> : ITaskNotifier<Task<T>>
+        {
             /// <summary>
-            /// Gets or sets the wrapped <see cref="Task"/> value.
+            /// Initializes a new instance of the <see cref="TaskNotifier{TTask}"/> class.
             /// </summary>
-            internal TTask? Value;
-#pragma warning restore SA1401
+            internal TaskNotifier()
+            {
+            }
+
+            /// <inheritdoc/>
+            Task<T>? ITaskNotifier<Task<T>>.Task { get; set; }
 
             /// <summary>
-            /// Unwraps the <typeparamref name="TTask"/> value stored in the current instance.
+            /// Unwraps the <see cref="Task{T}"/> value stored in the current instance.
             /// </summary>
-            /// <param name="accessor">The input <see cref="TaskAccessor{TTask}"/> instance.</param>
-            public static implicit operator TTask?(TaskAccessor<TTask>? accessor)
+            /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
+            public static implicit operator Task<T>?(TaskNotifier<T>? notifier)
             {
-                return accessor?.Value;
+                return Unsafe.As<ITaskNotifier<Task<T>>>(notifier)?.Task;
             }
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
index 2ba5598f5b8..d7edbca8e05 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
@@ -83,7 +83,7 @@ public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute, Func<b
             this.canExecute = canExecute;
         }
 
-        private TaskAccessor<Task>? executionTask;
+        private TaskNotifier? executionTask;
 
         /// <inheritdoc/>
         public Task? ExecutionTask
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
index b9e04fb2be4..1acf8e72a23 100644
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
@@ -83,7 +83,7 @@ public AsyncRelayCommand(Func<T, CancellationToken, Task> cancelableExecute, Fun
             this.canExecute = canExecute;
         }
 
-        private TaskAccessor<Task>? executionTask;
+        private TaskNotifier? executionTask;
 
         /// <inheritdoc/>
         public Task? ExecutionTask
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 5de4cb18a6e..a8d44e1179f 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -221,7 +221,7 @@ static async Task TestAsync(Action<TaskCompletionSource<int>> callback)
 
         public class SampleModelWithTask<T> : ObservableObject
         {
-            private TaskAccessor<Task<T>> data;
+            private TaskNotifier<T> data;
 
             public Task<T> Data
             {

From 8f168365deb6e236e06960b3d7fc814e3a7a5b9e Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Thu, 3 Sep 2020 09:01:13 +0200
Subject: [PATCH 443/595] timeout is now a DP and removed unused method

---
 .../FocusBehavior/FocusBehaviorPage.xaml.cs   |  8 +------
 .../Behaviors/FocusBehavior.cs                | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
index d6498809499..1dd7c8899fb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FocusBehavior/FocusBehaviorPage.xaml.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
@@ -10,13 +9,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
     /// <summary>
     /// A page that shows how to use the FocusBehavior
     /// </summary>
-    public sealed partial class FocusBehaviorPage : Page, IXamlRenderListener
+    public sealed partial class FocusBehaviorPage : Page
     {
         public FocusBehaviorPage() => InitializeComponent();
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
index 1df3b1514d1..79f7c651e0b 100644
--- a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
@@ -30,7 +30,16 @@ public sealed class FocusBehavior : BehaviorBase<UIElement>
             typeof(FocusBehavior),
             new PropertyMetadata(null, OnTargetsPropertyChanged));
 
-        private static readonly TimeSpan FocusEngagementTimeout = TimeSpan.FromMilliseconds(100);
+
+        /// <summary>
+        /// The DP to store the <see cref="FocusEngagementTimeout"/> property value.
+        /// </summary>
+        public static readonly DependencyProperty FocusEngagementTimeoutProperty = DependencyProperty.Register(
+            nameof(FocusEngagementTimeout),
+            typeof(TimeSpan),
+            typeof(FocusBehavior),
+            new PropertyMetadata(TimeSpan.FromMilliseconds(100)));
+
         private DispatcherTimer _timer;
 
         /// <summary>
@@ -47,6 +56,16 @@ public FocusTargetList Targets
             set => SetValue(TargetsProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the timeout before the <see cref="FocusBehavior"/> stops trying to set the focus to a control with
+        /// a higher priority.
+        /// </summary>
+        public TimeSpan FocusEngagementTimeout
+        {
+            get => (TimeSpan)GetValue(FocusEngagementTimeoutProperty);
+            set => SetValue(FocusEngagementTimeoutProperty, value);
+        }
+
         /// <inheritdoc/>
         protected override void OnAssociatedObjectLoaded() => ApplyFocus();
 

From 51dd094c73bf3be8f666e6674827ea22d2e8d5ca Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 3 Sep 2020 12:35:20 +0200
Subject: [PATCH 444/595] Minor codegen improvements in TaskNotifier

---
 .../ComponentModel/ObservableObject.cs        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 60f5f44d18f..52351551dc3 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -487,7 +487,7 @@ async void MonitorTask()
                 }
 
                 // Only notify if the property hasn't changed
-                if (ReferenceEquals(newValue, taskNotifier.Task))
+                if (ReferenceEquals(taskNotifier.Task, newValue))
                 {
                     OnPropertyChanged(propertyName);
                 }
@@ -525,8 +525,14 @@ internal TaskNotifier()
             {
             }
 
+            private Task? task;
+
             /// <inheritdoc/>
-            Task? ITaskNotifier<Task>.Task { get; set; }
+            Task? ITaskNotifier<Task>.Task
+            {
+                get => this.task;
+                set => this.task = value;
+            }
 
             /// <summary>
             /// Unwraps the <see cref="Task"/> value stored in the current instance.
@@ -534,7 +540,7 @@ internal TaskNotifier()
             /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
             public static implicit operator Task?(TaskNotifier? notifier)
             {
-                return Unsafe.As<ITaskNotifier<Task>>(notifier)?.Task;
+                return notifier?.task;
             }
         }
 
@@ -551,8 +557,14 @@ internal TaskNotifier()
             {
             }
 
+            private Task<T>? task;
+
             /// <inheritdoc/>
-            Task<T>? ITaskNotifier<Task<T>>.Task { get; set; }
+            Task<T>? ITaskNotifier<Task<T>>.Task
+            {
+                get => this.task;
+                set => this.task = value;
+            }
 
             /// <summary>
             /// Unwraps the <see cref="Task{T}"/> value stored in the current instance.
@@ -560,7 +572,7 @@ internal TaskNotifier()
             /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
             public static implicit operator Task<T>?(TaskNotifier<T>? notifier)
             {
-                return Unsafe.As<ITaskNotifier<Task<T>>>(notifier)?.Task;
+                return notifier?.task;
             }
         }
 

From 434a128a0974f2f6f915721e010e1a1233e9dd14 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 3 Sep 2020 12:55:44 +0200
Subject: [PATCH 445/595] Minor codegen improvement in SetProperty with
 Action<T>

---
 .../ComponentModel/ObservableObject.cs             | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index a4b786cf668..4c4b020d145 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -136,7 +136,19 @@ protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comp
         /// </remarks>
         protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, propertyName);
+            // We avoid calling the overload again to ensure the comparison is inlined
+            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            {
+                return false;
+            }
+
+            OnPropertyChanging(propertyName);
+
+            callback(newValue);
+
+            OnPropertyChanged(propertyName);
+
+            return true;
         }
 
         /// <summary>

From be877f2c5b5dc185d1701492453093037abf09ac Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 3 Sep 2020 20:09:34 +0200
Subject: [PATCH 446/595] Speed improvements in wrapping SetProperty<T>

---
 .../ComponentModel/ObservableObject.cs        | 108 ++++++------------
 .../ComponentModel/ObservableRecipient.cs     |  33 +++---
 .../Mvvm/Test_ObservableObject.cs             |   4 +-
 3 files changed, 58 insertions(+), 87 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 4c4b020d145..3fbb4bb5aca 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -123,6 +123,11 @@ protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comp
         /// This overload is much less efficient than <see cref="SetProperty{T}(ref T,T,string)"/> and it
         /// should only be used when the former is not viable (eg. when the target property being
         /// updated does not directly expose a backing field that can be passed by reference).
+        /// For performance reasons, it is recommended to use a stateful callback if possible through
+        /// the <see cref="SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string?)"/> whenever possible
+        /// instead of this overload, as that will allow the C# compiler to cache the input callback and
+        /// reduce the memory allocations. More info on that overload are available in the related XML
+        /// docs. This overload is here for completeness and in cases where that is not applicable.
         /// </summary>
         /// <typeparam name="T">The type of the property that changed.</typeparam>
         /// <param name="oldValue">The current property value.</param>
@@ -209,33 +214,43 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         ///     public string Name
         ///     {
         ///         get => Model.Name;
-        ///         set => Set(() => Model.Name, value);
+        ///         set => Set(Model.Name, value, Model, (model, name) => model.Name = name);
         ///     }
         /// }
         /// </code>
         /// This way we can then use the wrapping object in our application, and all those "proxy" properties will
         /// also raise notifications when changed. Note that this method is not meant to be a replacement for
-        /// <see cref="SetProperty{T}(ref T,T,string)"/>, which offers better performance and less memory usage. Only use this
-        /// overload when relaying properties to a model that doesn't support notifications, and only if you can't
-        /// implement notifications to that model directly (eg. by having it inherit from <see cref="ObservableObject"/>).
+        /// <see cref="SetProperty{T}(ref T,T,string)"/>, and it should only be used when relaying properties to a model that
+        /// doesn't support notifications, and only if you can't implement notifications to that model directly (eg. by having
+        /// it inherit from <see cref="ObservableObject"/>). The syntax relies on passing the target model and a stateless callback
+        /// to allow the C# compiler to cache the function, which results in much better performance and no memory usage.
         /// </summary>
-        /// <typeparam name="T">The type of property to set.</typeparam>
-        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         /// <remarks>
-        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not raised
-        /// if the current and new value for the target property are the same. Additionally, <paramref name="propertyExpression"/>
-        /// must return a property from a model that is stored as another property in the current instance.
-        /// This method only supports one level of indirection: <paramref name="propertyExpression"/> can only
-        /// be used to access properties of a model that is directly stored as a property of the current instance.
-        /// Additionally, this method can only be used if the wrapped item is a reference type.
+        /// The <see cref="PropertyChanging"/> and <see cref="PropertyChanged"/> events are not
+        /// raised if the current and new value for the target property are the same.
         /// </remarks>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, [CallerMemberName] string? propertyName = null)
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, out _, propertyName);
+            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            {
+                return false;
+            }
+
+            OnPropertyChanging(propertyName);
+
+            callback(model, newValue);
+
+            OnPropertyChanged(propertyName);
+
+            return true;
         }
 
         /// <summary>
@@ -243,58 +258,19 @@ protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue
         /// raises the <see cref="PropertyChanging"/> event, updates the property and then raises the
         /// <see cref="PropertyChanged"/> event. The behavior mirrors that of <see cref="SetProperty{T}(ref T,T,string)"/>,
         /// with the difference being that this method is used to relay properties from a wrapped model in the
-        /// current instance. See additional notes about this overload in <see cref="SetProperty{T}(Expression{Func{T}},T,string)"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of property to set.</typeparam>
-        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
-        /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
-        {
-            return SetProperty(propertyExpression, newValue, comparer, out _, propertyName);
-        }
-
-        /// <summary>
-        /// Implements the shared logic for <see cref="SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>
+        /// current instance. See additional notes about this overload in <see cref="SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string)"/>.
         /// </summary>
-        /// <typeparam name="T">The type of property to set.</typeparam>
-        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
-        /// <param name="oldValue">The resulting initial value for the target property.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
-        private protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, out T oldValue, [CallerMemberName] string? propertyName = null)
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, [CallerMemberName] string? propertyName = null)
         {
-            PropertyInfo? parentPropertyInfo;
-            FieldInfo? parentFieldInfo = null;
-
-            // Get the target property info
-            if (!(propertyExpression.Body is MemberExpression targetExpression &&
-                  targetExpression.Member is PropertyInfo targetPropertyInfo &&
-                  targetExpression.Expression is MemberExpression parentExpression &&
-                  (!((parentPropertyInfo = parentExpression.Member as PropertyInfo) is null) ||
-                   !((parentFieldInfo = parentExpression.Member as FieldInfo) is null)) &&
-                  parentExpression.Expression is ConstantExpression instanceExpression &&
-                  instanceExpression.Value is object instance))
-            {
-                ThrowArgumentExceptionForInvalidPropertyExpression();
-
-                // This is never executed, as the method above always throws
-                oldValue = default!;
-
-                return false;
-            }
-
-            object parent = parentPropertyInfo is null
-                ? parentFieldInfo!.GetValue(instance)
-                : parentPropertyInfo.GetValue(instance);
-            oldValue = (T)targetPropertyInfo.GetValue(parent);
-
             if (comparer.Equals(oldValue, newValue))
             {
                 return false;
@@ -302,7 +278,7 @@ parentExpression.Expression is ConstantExpression instanceExpression &&
 
             OnPropertyChanging(propertyName);
 
-            targetPropertyInfo.SetValue(parent, newValue);
+            callback(model, newValue);
 
             OnPropertyChanged(propertyName);
 
@@ -453,14 +429,6 @@ async void MonitorTask()
             return true;
         }
 
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property.
-        /// </summary>
-        private static void ThrowArgumentExceptionForInvalidPropertyExpression()
-        {
-            throw new ArgumentException("The given expression must be in the form () => MyModel.MyProperty");
-        }
-
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when a given <see cref="Expression{TDelegate}"/> is invalid for a property field.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 5c4ba934e60..a52a1dfbf9c 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -9,7 +9,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
@@ -237,42 +236,46 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
         /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
-        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,string)"/>, with the difference being that this
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string)"/>, with the difference being that this
         /// method is used to relay properties from a wrapped model in the current instance. For more info, see the docs for
-        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,string)"/>.
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string)"/>.
         /// </summary>
-        /// <typeparam name="T">The type of property to set.</typeparam>
-        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
+        protected bool SetProperty<TModel,T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(propertyExpression, newValue, EqualityComparer<T>.Default, broadcast, propertyName);
+            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, model, callback, broadcast, propertyName);
         }
 
         /// <summary>
         /// Compares the current and new values for a given nested property. If the value has changed,
         /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
         /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
-        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>,
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,IEqualityComparer{T},TModel,Action{TModel,T},string)"/>,
         /// with the difference being that this method is used to relay properties from a wrapped model in the
         /// current instance. For more info, see the docs for
-        /// <see cref="ObservableObject.SetProperty{T}(Expression{Func{T}},T,IEqualityComparer{T},string)"/>.
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,IEqualityComparer{T},TModel,Action{TModel,T},string)"/>.
         /// </summary>
-        /// <typeparam name="T">The type of property to set.</typeparam>
-        /// <param name="propertyExpression">An <see cref="Expression{TDelegate}"/> returning the property to update.</param>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="propertyExpression"/> is not valid.</exception>
-        protected bool SetProperty<T>(Expression<Func<T>> propertyExpression, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            bool propertyChanged = SetProperty(propertyExpression, newValue, comparer, out T oldValue, propertyName);
+            bool propertyChanged = SetProperty(oldValue, newValue, comparer, model, callback, propertyName);
 
             if (propertyChanged && broadcast)
             {
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
index 89e70171139..b22997eaa04 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
@@ -114,7 +114,7 @@ public WrappingModelWithProperty(Person person)
             public string Name
             {
                 get => Person.Name;
-                set => SetProperty(() => Person.Name, value);
+                set => SetProperty(Person.Name, value, Person, (person, name) => person.Name = name);
             }
         }
 
@@ -164,7 +164,7 @@ public WrappingModelWithField(Person person)
             public string Name
             {
                 get => this.person.Name;
-                set => SetProperty(() => this.person.Name, value);
+                set => SetProperty(this.person.Name, value, this.person, (person, name) => person.Name = name);
             }
         }
 

From f68a05c1730a2e803d44e8d01c61230791cd0bc8 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <chohfi@outlook.com>
Date: Thu, 3 Sep 2020 12:20:28 -0700
Subject: [PATCH 447/595] Update
 Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs

---
 Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
index 79f7c651e0b..01099e13808 100644
--- a/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Behaviors/FocusBehavior.cs
@@ -30,7 +30,6 @@ public sealed class FocusBehavior : BehaviorBase<UIElement>
             typeof(FocusBehavior),
             new PropertyMetadata(null, OnTargetsPropertyChanged));
 
-
         /// <summary>
         /// The DP to store the <see cref="FocusEngagementTimeout"/> property value.
         /// </summary>

From a8293f72200221303aa715df102de3efafb53afb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 3 Sep 2020 21:35:10 +0200
Subject: [PATCH 448/595] Minor codegen improvements for EqualityComparer<T>

---
 .../ComponentModel/ObservableRecipient.cs     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index a52a1dfbf9c..80249075d38 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -203,7 +203,14 @@ protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comp
         /// </remarks>
         protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, callback, broadcast, propertyName);
+            bool propertyChanged = SetProperty(oldValue, newValue, callback, propertyName);
+
+            if (propertyChanged && broadcast)
+            {
+                Broadcast(oldValue, newValue, propertyName);
+            }
+
+            return propertyChanged;
         }
 
         /// <summary>
@@ -249,9 +256,16 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// <param name="broadcast">If <see langword="true"/>, <see cref="Broadcast{T}"/> will also be invoked.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-        protected bool SetProperty<TModel,T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
         {
-            return SetProperty(oldValue, newValue, EqualityComparer<T>.Default, model, callback, broadcast, propertyName);
+            bool propertyChanged = SetProperty(oldValue, newValue, model, callback, propertyName);
+
+            if (propertyChanged && broadcast)
+            {
+                Broadcast(oldValue, newValue, propertyName);
+            }
+
+            return propertyChanged;
         }
 
         /// <summary>

From 7b1fef8caf2afab8d770c807a9aa86b7ea6cd574 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 3 Sep 2020 14:41:17 -0700
Subject: [PATCH 449/595] Initial Refactor of ColorPickerButton to ColorPicker

Need to clean things up a bit more and having issues with Pivot, added notes to original PR
---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   12 +-
 .../ColorPicker.png}                          |  Bin
 .../ColorPickerButtonPage.xaml                |    0
 .../ColorPickerButtonPage.xaml.cs             |    2 +-
 .../ColorPickerButtonXaml.bind                |    0
 .../ColorPicker/ColorPickerPage.xaml          |   16 +
 .../ColorPicker/ColorPickerPage.xaml.cs       |   20 +
 .../ColorPicker/ColorPickerXaml.bind          |   89 ++
 .../SamplePages/samples.json                  |   20 +-
 .../ColorPicker.Properties.cs}                |   12 +-
 .../ColorPicker.Rendering.cs}                 |    4 +-
 .../ColorPicker.cs}                           |   96 +-
 .../ColorPicker/ColorPicker.xaml              | 1407 +++++++++++++++++
 .../ColorPickerButton.xaml                    |  185 +--
 .../ColorPickerSlider.cs}                     |   12 +-
 .../ColorToColorShadeConverter.cs             |    2 +-
 .../ColorToHexConverter.cs                    |    2 +-
 .../ContrastBrushConverter.cs                 |    2 +-
 .../IColorPalette.cs                          |    0
 .../WindowsColorPalette.cs                    |    0
 .../InfiniteCanvas/InfiniteCanvas.TextBox.cs  |    2 +-
 .../InfiniteCanvas/InfiniteCanvas.cs          |    6 +-
 .../InfiniteCanvas/InfiniteCanvas.xaml        |    1 +
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   13 +
 .../Themes/Generic.xaml                       |    3 +-
 25 files changed, 1634 insertions(+), 272 deletions(-)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{ColorPickerButton/ColorPickerButton.png => ColorPicker/ColorPicker.png} (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{ColorPickerButton => ColorPicker}/ColorPickerButtonPage.xaml (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{ColorPickerButton => ColorPicker}/ColorPickerButtonPage.xaml.cs (86%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{ColorPickerButton => ColorPicker}/ColorPickerButtonXaml.bind (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton/ColorPickerButton.Properties.cs => ColorPicker/ColorPicker.Properties.cs} (93%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton/ColorPickerButton.Rendering.cs => ColorPicker/ColorPicker.Rendering.cs} (99%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton/ColorPickerButton.cs => ColorPicker/ColorPicker.cs} (94%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/ColorPickerButton.xaml (89%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton/ColorPickerButtonSlider.cs => ColorPicker/ColorPickerSlider.cs} (87%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/ColorToColorShadeConverter.cs (98%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/ColorToHexConverter.cs (96%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/ContrastBrushConverter.cs (98%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/IColorPalette.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls/{ColorPickerButton => ColorPicker}/WindowsColorPalette.cs (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 2c4cce232cc..5944f463d54 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -272,7 +272,7 @@
     <Content Include="Icons\More.png" />
     <Content Include="Icons\Notifications.png" />
     <Content Include="Icons\Services.png" />
-    <Content Include="SamplePages\ColorPickerButton\ColorPickerButton.png" />
+    <Content Include="SamplePages\ColorPicker\ColorPicker.png" />
     <Content Include="SamplePages\TilesBrush\TilesBrush.png" />
     <Content Include="SamplePages\Eyedropper\Eyedropper.png" />
     <Content Include="SamplePages\OnDevice\OnDevice.png" />
@@ -518,8 +518,8 @@
     </Content>
     <Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
-    <Compile Include="SamplePages\ColorPickerButton\ColorPickerButtonPage.xaml.cs">
-      <DependentUpon>ColorPickerButtonPage.xaml</DependentUpon>
+    <Compile Include="SamplePages\ColorPicker\ColorPickerPage.xaml.cs">
+      <DependentUpon>ColorPickerPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
       <DependentUpon>EnumValuesExtensionPage.xaml</DependentUpon>
@@ -625,9 +625,9 @@
     <Content Include="SamplePages\Triggers\UserHandPreferenceStateTrigger.bind" />
     <Content Include="SamplePages\Triggers\UserInteractionModeStateTrigger.bind" />
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
-    <Content Include="SamplePages\ColorPickerButton\ColorPickerButtonXaml.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionXaml.bind" />
     <Content Include="SamplePages\EnumValuesExtension\EnumValuesExtensionCode.bind" />
+    <Content Include="SamplePages\ColorPicker\ColorPickerXaml.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -1006,9 +1006,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\ColorPickerButton\ColorPickerButtonPage.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="SamplePages\ColorPicker\ColorPickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButton.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPicker.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButton.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPicker.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonPage.xaml
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs
similarity index 86%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonPage.xaml.cs
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs
index e82b33e08b6..72e50046b8f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     /// <summary>
-    /// A page that shows how to use the <see cref="ColorPickerButton"/> control.
+    /// A page that shows how to use the <see cref="UI.Controls.ColorPicker"/> control.
     /// </summary>
     public sealed partial class ColorPickerButtonPage : Page
     {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPickerButton/ColorPickerButtonXaml.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml
new file mode 100644
index 00000000000..f3f82b0397d
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml
@@ -0,0 +1,16 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ColorPickerPage"
+      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:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      mc:Ignorable="d"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid
+        Visibility="Collapsed">
+        <controls:ColorPicker />
+        <controls:ColorPickerSlider />
+    </Grid>
+
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs
new file mode 100644
index 00000000000..15d297b2527
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs
@@ -0,0 +1,20 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    /// <summary>
+    /// A page that shows how to use the <see cref="UI.Controls.ColorPicker"/> control.
+    /// </summary>
+    public sealed partial class ColorPickerPage : Page
+    {
+        public ColorPickerPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
new file mode 100644
index 00000000000..a8a6d994f19
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
@@ -0,0 +1,89 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+  <Page.Resources>
+    <SolidColorBrush Color="{ThemeResource SystemChromeLowColor}" x:Key="SystemControlForegroundChromeLowBrush"/>
+  </Page.Resources>
+
+  <ScrollViewer>
+    <StackPanel Orientation="Vertical"
+                HorizontalAlignment="Center"
+                Spacing="20">
+      <!-- Example 1 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                   VerticalAlignment="Center">
+          Box-shaped spectrum <LineBreak />
+          Alpha channel disabled
+        </TextBlock>
+      </Border>
+      <controls:ColorPicker x:Name="ColorPicker1"
+                            Color="Navy"
+                            ColorSpectrumShape="Box"
+                            IsAlphaEnabled="False"
+                            IsHexInputVisible="True" />
+      <!-- Example 2 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                  VerticalAlignment="Center">
+          Box-shaped spectrum <LineBreak />
+          Alpha channel enabled
+        </TextBlock>
+      </Border>
+      <controls:ColorPicker x:Name="ColorPicker2"
+                            Color="Green"
+                            ColorSpectrumShape="Box"
+                            IsAlphaEnabled="True"
+                            IsHexInputVisible="False" />
+      <!-- Example 3 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                  VerticalAlignment="Center">
+          Ring-shaped spectrum <LineBreak />
+          Alpha channel enabled
+        </TextBlock>
+      </Border>
+      <controls:ColorPicker x:Name="ColorPickerButton3"
+                            Color="Transparent"
+                            ColorSpectrumShape="Ring"
+                            IsAlphaEnabled="True"
+                            IsHexInputVisible="True" />
+      <!-- Example 4 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                  VerticalAlignment="Center">
+          Ring-shaped spectrum <LineBreak />
+          Alpha channel enabled <LineBreak />
+          Saturation+Value spectrum channels
+        </TextBlock>
+      </Border>
+      <controls:ColorPicker x:Name="ColorPickerButton4"
+                            Color="Maroon"
+                            ColorSpectrumShape="Ring"
+                            ColorSpectrumComponents="SaturationValue"
+                            IsAlphaEnabled="True"
+                            IsHexInputVisible="True"/>
+    </StackPanel>
+  </ScrollViewer>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 19fb0e27424..8a2d0e51251 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -47,15 +47,25 @@
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Carousel.md"
       },
       {
-        "Name": "ColorPickerButton",
-        "Type": "ColorPickerButtonPage",
+        "Name": "ColorPicker",
+        "Type": "ColorPickerPage",
         "Subcategory": "Input",
-        "About": "A color picker within a flyout opened by pressing a drop down button containing the selected color.",
+        "About": "An improved color picker control providing more options to select colors.",
         "CodeUrl": "TBD",
-        "XamlCodeFile": "ColorPickerButtonXaml.bind",
-        "Icon": "/SamplePages/ColorPickerButton/ColorPickerButton.png",
+        "XamlCodeFile": "ColorPickerXaml.bind",
+        "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
         "DocumentationUrl": "TBD"
       },
+      //{
+      //  "Name": "ColorPickerButton",
+      //  "Type": "ColorPickerButtonPage",
+      //  "Subcategory": "Input",
+      //  "About": "A color picker within a flyout opened by pressing a drop down button containing the selected color.",
+      //  "CodeUrl": "TBD",
+      //  "XamlCodeFile": "ColorPickerButtonXaml.bind",
+      //  "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
+      //  "DocumentationUrl": "TBD"
+      //},
       {
         "Name": "AdaptiveGridView",
         "Type": "AdaptiveGridViewPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs
index 6944096ce18..b21772a2ea9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs
@@ -8,9 +8,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Contains all properties for the <see cref="ColorPickerButton"/>.
+    /// Contains all properties for the <see cref="ColorPicker"/>.
     /// </summary>
-    public partial class ColorPickerButton
+    public partial class ColorPicker
     {
         /// <summary>
         /// Identifies the <see cref="CustomPaletteColors"/> dependency property.
@@ -19,7 +19,7 @@ public partial class ColorPickerButton
             DependencyProperty.Register(
                 nameof(CustomPaletteColors),
                 typeof(ObservableCollection<Windows.UI.Color>),
-                typeof(ColorPickerButton),
+                typeof(ColorPicker),
                 new PropertyMetadata(Windows.UI.Color.FromArgb(0x00, 0x00, 0x00, 0x00)));
 
         /// <summary>
@@ -37,7 +37,7 @@ public ObservableCollection<Windows.UI.Color> CustomPaletteColors
             DependencyProperty.Register(
                 nameof(CustomPaletteColumnCount),
                 typeof(int),
-                typeof(ColorPickerButton),
+                typeof(ColorPicker),
                 new PropertyMetadata(4));
 
         /// <summary>
@@ -63,7 +63,7 @@ public int CustomPaletteColumnCount
             DependencyProperty.Register(
                 nameof(CustomPalette),
                 typeof(IColorPalette),
-                typeof(ColorPickerButton),
+                typeof(ColorPicker),
                 new PropertyMetadata(DependencyProperty.UnsetValue));
 
         /// <summary>
@@ -90,7 +90,7 @@ public IColorPalette CustomPalette
             DependencyProperty.Register(
                 nameof(IsColorPaletteVisible),
                 typeof(bool),
-                typeof(ColorPickerButton),
+                typeof(ColorPicker),
                 new PropertyMetadata(true));
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Rendering.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Rendering.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs
index bff45ef5f0e..271c9179e0f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.Rendering.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs
@@ -15,9 +15,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Contains the rendering methods used within <see cref="ColorPickerButton"/>.
+    /// Contains the rendering methods used within <see cref="ColorPicker"/>.
     /// </summary>
-    public partial class ColorPickerButton
+    public partial class ColorPicker
     {
         /// <summary>
         /// Generates a new bitmap of the specified size by changing a specific color channel.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
similarity index 94%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
index 7ca287765a1..65616625b32 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
@@ -8,7 +8,7 @@
 using System.Collections.Specialized;
 using System.Globalization;
 using Microsoft.Toolkit.Uwp.Helpers;
-using Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButtonConverters;
+using Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI;
@@ -22,39 +22,38 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Presents a color spectrum, a palette of colors, and color channel sliders for user selection of a color.
     /// </summary>
-    [TemplatePart(Name = nameof(ColorPickerButton.AlphaChannelSlider),          Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.AlphaChannelTextBox),         Type = typeof(TextBox))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel1Slider),              Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel1TextBox),             Type = typeof(TextBox))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel2Slider),              Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel2TextBox),             Type = typeof(TextBox))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel3Slider),              Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.Channel3TextBox),             Type = typeof(TextBox))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground1Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground2Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground3Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground4Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground5Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground6Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground7Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground8Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground9Border),  Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.CheckeredBackground10Border), Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.ColorSpectrumControl),        Type = typeof(ColorSpectrum))]
-    [TemplatePart(Name = nameof(ColorPickerButton.ColorSpectrumAlphaSlider),    Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.ColorSpectrumThirdDimensionSlider), Type = typeof(Slider))]
-    [TemplatePart(Name = nameof(ColorPickerButton.PaletteGridView),             Type = typeof(GridView))]
-    [TemplatePart(Name = nameof(ColorPickerButton.HexInputTextBox),             Type = typeof(TextBox))]
-    [TemplatePart(Name = nameof(ColorPickerButton.HsvToggleButton),             Type = typeof(ToggleButton))]
-    [TemplatePart(Name = nameof(ColorPickerButton.RgbToggleButton),             Type = typeof(ToggleButton))]
-    [TemplatePart(Name = nameof(ColorPickerButton.P1PreviewBorder),             Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.P2PreviewBorder),             Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.N1PreviewBorder),             Type = typeof(Border))]
-    [TemplatePart(Name = nameof(ColorPickerButton.N2PreviewBorder),             Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.AlphaChannelSlider),          Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.AlphaChannelTextBox),         Type = typeof(TextBox))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel1Slider),              Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel1TextBox),             Type = typeof(TextBox))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel2Slider),              Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel2TextBox),             Type = typeof(TextBox))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel3Slider),              Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.Channel3TextBox),             Type = typeof(TextBox))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground1Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground2Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground3Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground4Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground5Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground6Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground7Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground8Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground9Border),  Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground10Border), Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumControl),        Type = typeof(ColorSpectrum))]
+    [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumAlphaSlider),    Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumThirdDimensionSlider), Type = typeof(Slider))]
+    [TemplatePart(Name = nameof(ColorPicker.HexInputTextBox),             Type = typeof(TextBox))]
+    [TemplatePart(Name = nameof(ColorPicker.HsvToggleButton),             Type = typeof(ToggleButton))]
+    [TemplatePart(Name = nameof(ColorPicker.RgbToggleButton),             Type = typeof(ToggleButton))]
+    [TemplatePart(Name = nameof(ColorPicker.P1PreviewBorder),             Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.P2PreviewBorder),             Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.N1PreviewBorder),             Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.N2PreviewBorder),             Type = typeof(Border))]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1501:Statement should not be on a single line", Justification = "Inline brackets are used to improve code readability with repeated null checks.")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1025:Code should not contain multiple whitespace in a row", Justification = "Whitespace is used to align code in columns for readability.")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Only template parts start with a capital letter. This differentiates them from other fields.")]
-    public partial class ColorPickerButton : Windows.UI.Xaml.Controls.ColorPicker
+    public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
     {
         /// <summary>
         /// The period that scheduled color updates will be applied.
@@ -124,7 +123,6 @@ private enum ColorChannel
         private ColorSpectrum ColorSpectrumControl;
         private Slider        ColorSpectrumAlphaSlider;
         private Slider        ColorSpectrumThirdDimensionSlider;
-        private GridView      PaletteGridView;
         private TextBox       HexInputTextBox;
         private ToggleButton  HsvToggleButton;
         private ToggleButton  RgbToggleButton;
@@ -162,11 +160,11 @@ private enum ColorChannel
          ***************************************************************************************/
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorPickerButton"/> class.
+        /// Initializes a new instance of the <see cref="ColorPicker"/> class.
         /// </summary>
-        public ColorPickerButton()
+        public ColorPicker()
         {
-            this.DefaultStyleKey = typeof(ColorPickerButton);
+            this.DefaultStyleKey = typeof(ColorPicker);
 
             // Setup collections
             this.SetValue(CustomPaletteColorsProperty, new ObservableCollection<Color>());
@@ -184,9 +182,9 @@ public ColorPickerButton()
         }
 
         /// <summary>
-        /// Finalizes an instance of the <see cref="ColorPickerButton"/> class.
+        /// Finalizes an instance of the <see cref="ColorPicker"/> class.
         /// </summary>
-        ~ColorPickerButton()
+        ~ColorPicker()
         {
             this.StopDispatcherTimer();
             this.CustomPaletteColors.CollectionChanged -= CustomPaletteColors_CollectionChanged;
@@ -221,8 +219,6 @@ protected override void OnApplyTemplate()
             this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<Slider>("ColorSpectrumAlphaSlider", false);
             this.ColorSpectrumThirdDimensionSlider = this.GetTemplateChild<Slider>("ColorSpectrumThirdDimensionSlider", false);
 
-            this.PaletteGridView = this.GetTemplateChild<GridView>("PaletteGridView", false);
-
             this.HexInputTextBox = this.GetTemplateChild<TextBox>("HexInputTextBox", false);
             this.HsvToggleButton = this.GetTemplateChild<ToggleButton>("HsvToggleButton", false);
             this.RgbToggleButton = this.GetTemplateChild<ToggleButton>("RgbToggleButton", false);
@@ -323,7 +319,6 @@ private void ConnectEvents(bool connected)
                 // Add all events
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged += ColorSpectrum_ColorChanged; }
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     += ColorSpectrum_GotFocus; }
-                if (this.PaletteGridView      != null) { this.PaletteGridView.Loaded            += PaletteGridView_Loaded; }
                 if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           += HexInputTextBox_KeyDown; }
                 if (this.HexInputTextBox      != null) { this.HexInputTextBox.LostFocus         += HexInputTextBox_LostFocus; }
                 if (this.HsvToggleButton      != null) { this.HsvToggleButton.Checked           += ColorRepToggleButton_CheckedUnchecked; }
@@ -378,7 +373,6 @@ private void ConnectEvents(bool connected)
                 // Remove all events
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged -= ColorSpectrum_ColorChanged; }
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     -= ColorSpectrum_GotFocus; }
-                if (this.PaletteGridView      != null) { this.PaletteGridView.Loaded            -= PaletteGridView_Loaded; }
                 if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           -= HexInputTextBox_KeyDown; }
                 if (this.HexInputTextBox      != null) { this.HexInputTextBox.LostFocus         -= HexInputTextBox_LostFocus; }
                 if (this.HsvToggleButton      != null) { this.HsvToggleButton.Checked           -= ColorRepToggleButton_CheckedUnchecked; }
@@ -1254,7 +1248,7 @@ private void DispatcherTimer_Tick(object sender, object e)
          ***************************************************************************************/
 
         /// <summary>
-        /// Callback for when the <see cref="ColorPicker.Color"/> dependency property value changes.
+        /// Callback for when the <see cref="Windows.UI.Xaml.Controls.ColorPicker.Color"/> dependency property value changes.
         /// </summary>
         private void OnColorChanged(DependencyObject d, DependencyProperty e)
         {
@@ -1358,24 +1352,6 @@ private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventAr
             return;
         }
 
-        /// <summary>
-        /// Event handler for when the grid view showing all colors in the palette is loaded.
-        /// This will set the correct column count to any UniformGrid panel.
-        /// </summary>
-        private void PaletteGridView_Loaded(object sender, RoutedEventArgs e)
-        {
-            // RelativeSource binding of an ancestor type doesn't work in UWP.
-            // Therefore, setting this property must be done here in code-behind.
-            var palettePanel = (sender as DependencyObject)?.FindDescendant<UniformGrid>();
-
-            if (palettePanel != null)
-            {
-                palettePanel.Columns = this.CustomPaletteColumnCount;
-            }
-
-            return;
-        }
-
         /// <summary>
         /// Event handler for when the list of custom palette colors is changed.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
new file mode 100644
index 00000000000..b91c9e8aafa
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -0,0 +1,1407 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
+                    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+                    xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
+
+    <SolidColorBrush x:Key="CheckerboardColor0">
+        <SolidColorBrush.Color>
+            <Color>Transparent</Color>
+        </SolidColorBrush.Color>
+    </SolidColorBrush>
+    <SolidColorBrush x:Key="CheckerboardColor1">
+        <SolidColorBrush.Color>
+            <Color>#70F5F5F5</Color>
+        </SolidColorBrush.Color>
+    </SolidColorBrush>
+    <SolidColorBrush x:Name="CheckerColorBrush"
+                     Color="{ThemeResource SystemListLowColor}" />
+
+    <!-- The XAML compiler has a serious bug that doesn't allow using conditional XAML on Setters...
+         The work-around is to create multiple styles as condition XAML still works at the style level.
+         This is needed to support CornerRadius properties. -->
+
+    <Style TargetType="controls:ColorPicker"
+           x:Key="BaseColorPickerStyle">
+        <Setter Property="MaxWidth" Value="392" /><!-- TODO: Get rid of this restricton -->
+        <Setter Property="MinWidth" Value="312" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template" Value="{StaticResource ColorPickerTemplate}"/>
+    </Style>
+
+    <ControlTemplate TargetType="controls:ColorPicker"
+                     x:Key="ColorPickerTemplate">
+        <Grid BorderBrush="{TemplateBinding BorderBrush}" 
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Margin="{TemplateBinding Padding}">
+            <Grid.Resources>
+                <localconverters:ColorToColorShadeConverter x:Key="ColorToColorShade" />
+                <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" />
+                <localconverters:ColorToHexConverter x:Key="ColorToHex" />
+                <localconverters:ContrastBrushConverter x:Key="ContrastBrush" />
+
+                <contract7NotPresent:Style TargetType="TextBox"
+                                                       x:Key="InputTextBoxStyle">
+                    <!-- Currently not used -->
+                </contract7NotPresent:Style>
+                <contract7Present:Style TargetType="TextBox"
+                                                    x:Key="InputTextBoxStyle">
+                    <Setter Property="CornerRadius"
+                                        Value="0,2,2,0" />
+                </contract7Present:Style>
+            </Grid.Resources>
+            <VisualStateManager.VisualStateGroups>
+
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background"
+                                                Value="{ThemeResource ButtonBackgroundDisabled}" />
+                            <Setter Target="RootButton.BorderBrush"
+                                                Value="{ThemeResource ButtonBorderBrushDisabled}" />
+                            <Setter Target="DropDownGlyph.Foreground"
+                                                Value="{ThemeResource ButtonForegroundDisabled}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="PointerOver">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background"
+                                                Value="{ThemeResource ButtonBackgroundPointerOver}" />
+                            <Setter Target="RootButton.BorderBrush"
+                                                Value="{ThemeResource ButtonBorderBrushPointerOver}" />
+                            <Setter Target="DropDownGlyph.Foreground"
+                                                Value="{ThemeResource ButtonForegroundPointerOver}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Pressed">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background"
+                                                Value="{ThemeResource ButtonBackgroundPressed}" />
+                            <Setter Target="RootButton.BorderBrush"
+                                                Value="{ThemeResource ButtonBorderBrushPressed}" />
+                            <Setter Target="DropDownGlyph.Foreground"
+                                                Value="{ThemeResource ButtonForegroundPressed}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorSpectrumVisibility">
+                    <VisualState x:Name="ColorSpectrumVisible" />
+                    <VisualState x:Name="ColorSpectrumCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="SpectrumPivotItem.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorPaletteVisibility">
+                    <VisualState x:Name="ColorPaletteVisible" />
+                    <VisualState x:Name="ColorPaletteCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="PalettePivotItem.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorPreviewVisibility">
+                    <VisualState x:Name="ColorPreviewVisible" />
+                    <VisualState x:Name="ColorPreviewCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorPreviewGrid.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="PreviousColorVisibility">
+                    <!-- Previous color is not currently supported -->
+                    <VisualState x:Name="PreviousColorCollapsedVertical" />
+                    <VisualState x:Name="PreviousColorVisibleVertical" />
+                    <VisualState x:Name="PreviousColorCollapsedHorizontal" />
+                    <VisualState x:Name="PreviousColorVisibleHorizontal" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ThirdDimensionSliderVisibility">
+                    <VisualState x:Name="ThirdDimensionSliderVisible" />
+                    <VisualState x:Name="ThirdDimensionSliderCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumThirdDimensionSlider.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaSliderVisibility">
+                    <VisualState x:Name="AlphaSliderVisible" />
+                    <VisualState x:Name="AlphaSliderCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumAlphaSlider.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelBorder.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelTextBox.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelSlider.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="MoreButtonVisibility">
+                    <!-- More button isn't supported -->
+                    <VisualState x:Name="MoreButtonVisible" />
+                    <VisualState x:Name="MoreButtonCollapsed" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="TextEntryGridVisibility">
+                    <!-- Text entry grid is not currently supported -->
+                    <VisualState x:Name="TextEntryGridCollapsed" />
+                    <VisualState x:Name="TextEntryGridVisible" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorChannelTextInputVisibility">
+                    <VisualState x:Name="ColorChannelTextInputVisible" />
+                    <VisualState x:Name="ColorChannelTextInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ChannelsPivotItem.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaTextInputVisibility">
+                    <VisualState x:Name="AlphaTextInputVisible" />
+                    <VisualState x:Name="AlphaTextInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="AlphaChannelTextBox.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorRepresentationSelected">
+                    <VisualState x:Name="RgbSelected" />
+                    <VisualState x:Name="HsvSelected">
+                        <VisualState.Setters>
+                            <Setter Target="Channel1TextBlock.Text"
+                                                Value="H" />
+                            <Setter Target="Channel2TextBlock.Text"
+                                                Value="S" />
+                            <Setter Target="Channel3TextBlock.Text"
+                                                Value="V" />
+                            <Setter Target="Channel1TextBox.(AutomationProperties.Name)"
+                                                Value="Hue Channel" />
+                            <Setter Target="Channel2TextBox.(AutomationProperties.Name)"
+                                                Value="Saturation Channel" />
+                            <Setter Target="Channel3TextBox.(AutomationProperties.Name)"
+                                                Value="Value Channel" />
+                            <Setter Target="Channel1Slider.(AutomationProperties.Name)"
+                                                Value="Hue Channel" />
+                            <Setter Target="Channel2Slider.(AutomationProperties.Name)"
+                                                Value="Saturation Channel" />
+                            <Setter Target="Channel3Slider.(AutomationProperties.Name)"
+                                                Value="Value Channel" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="HexInputVisibility">
+                    <VisualState x:Name="HexInputVisible" />
+                    <VisualState x:Name="HexInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="HexInputGrid.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaEnabledState">
+                    <!-- Not currently supported -->
+                    <VisualState x:Name="AlphaDisabled">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumAlphaSlider.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelBorder.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelTextBox.Visibility"
+                                                Value="Collapsed" />
+                            <Setter Target="AlphaChannelSlider.Visibility"
+                                                Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="AlphaEnabled" />
+                </VisualStateGroup>
+
+            </VisualStateManager.VisualStateGroups>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <!-- The whole background of the pivot header is changed here.
+                                        It's much easier to do this than customize the PivotHeaderItem template.
+                                        Remember PivotHeaderItem has a default height of 48px. -->
+            <Border Grid.Row="0"
+                    CornerRadius="4"
+                    Height="48"
+                    Background="{ThemeResource SystemControlAcrylicElementBrush}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"/>
+            <Pivot Grid.Row="0"
+                   Grid.RowSpan="2"> <!-- TODO: Remove Pivot -->
+                <Pivot.ItemContainerStyle>
+                    <Style TargetType="PivotItem">
+                        <Setter Property="HorizontalContentAlignment"
+                                                    Value="Stretch" />
+                        <Setter Property="VerticalContentAlignment"
+                                                    Value="Stretch" />
+                        <Setter Property="Margin"
+                                                    Value="12" />
+                        <Setter Property="Padding"
+                                                    Value="0" />
+                    </Style>
+                </Pivot.ItemContainerStyle>
+                <PivotItem x:Name="SpectrumPivotItem"
+                                                AutomationProperties.Name="Spectrum">
+                    <PivotItem.Header>
+                        <FontIcon Glyph="&#xE76D;"
+                                                        Width="108" />
+                    </PivotItem.Header>
+                    <PivotItem.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
+                                                                                    Grid.Column="0"
+                                                                                    Grid.Row="1"
+                                                                                    Grid.RowSpan="2"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Orientation="Vertical"
+                                                                                    Width="20"
+                                                                                    HorizontalAlignment="Center"
+                                                                                    VerticalAlignment="Stretch"
+                                                                                    Margin="0,0,12,0" />
+                            <!-- Keep in mind the spectrum is always HSV -->
+                            <!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
+                            <ColorSpectrum x:Name="ColorSpectrumControl"
+                                                                AutomationProperties.Name="Third Dimension"
+                                                                Grid.Column="1"
+                                                                Grid.Row="0"
+                                                                Grid.RowSpan="2"
+                                                                MinWidth="256" MinHeight="256"
+                                                                Components="{TemplateBinding ColorSpectrumComponents}"
+                                                                MinHue="{TemplateBinding MinHue}"
+                                                                MaxHue="{TemplateBinding MaxHue}"
+                                                                MinSaturation="{TemplateBinding MinSaturation}"
+                                                                MaxSaturation="{TemplateBinding MaxSaturation}"
+                                                                MinValue="{TemplateBinding MinValue}"
+                                                                MaxValue="{TemplateBinding MaxValue}"
+                                                                Shape="{TemplateBinding ColorSpectrumShape}"
+                                                                HorizontalAlignment="Stretch"
+                                                                VerticalAlignment="Stretch" />
+                            <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
+                                                                                    AutomationProperties.Name="Alpha Channel"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="1"
+                                                                                    Grid.RowSpan="2"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Orientation="Vertical"
+                                                                                    Width="20"
+                                                                                    HorizontalAlignment="Center"
+                                                                                    VerticalAlignment="Stretch"
+                                                                                    Margin="12,0,0,0" />
+                        </Grid>
+                    </PivotItem.Content>
+                </PivotItem>
+                <PivotItem x:Name="PalettePivotItem"
+                                                AutomationProperties.Name="Palette">
+                    <PivotItem.Header>
+                        <FontIcon Glyph="&#xE790;"
+                                                        Width="108" />
+                    </PivotItem.Header>
+                    <PivotItem.Content>
+                        <GridView SelectionMode="Single"
+                                  SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=TwoWay}"
+                                  ItemsSource="{TemplateBinding CustomPaletteColors}"
+                                  Margin="0"
+                                  Padding="0"
+                                  Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
+                            <GridView.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker" 
+                                                          Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}"/>
+                                </ItemsPanelTemplate>
+                            </GridView.ItemsPanel>
+                            <GridView.ItemContainerStyle>
+                                <Style TargetType="GridViewItem">
+                                    <Setter Property="FontFamily"
+                                                                Value="{ThemeResource ContentControlThemeFontFamily}" />
+                                    <Setter Property="FontSize"
+                                                                Value="{ThemeResource ControlContentThemeFontSize}" />
+                                    <Setter Property="Background"
+                                                                Value="Transparent" />
+                                    <Setter Property="Foreground"
+                                                                Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                    <Setter Property="TabNavigation"
+                                                                Value="Local" />
+                                    <Setter Property="IsHoldingEnabled"
+                                                                Value="True" />
+                                    <Setter Property="HorizontalContentAlignment"
+                                                                Value="Stretch" />
+                                    <Setter Property="VerticalContentAlignment"
+                                                                Value="Stretch" />
+                                    <Setter Property="Margin"
+                                                                Value="0" />
+                                    <Setter Property="Padding"
+                                                                Value="0" />
+                                    <Setter Property="MinWidth"
+                                                                Value="10" />
+                                    <Setter Property="MinHeight"
+                                                                Value="10" />
+                                    <Setter Property="AllowDrop"
+                                                                Value="False" />
+                                    <Setter Property="UseSystemFocusVisuals"
+                                                                Value="{StaticResource UseSystemFocusVisuals}" />
+                                    <Setter Property="FocusVisualMargin"
+                                                                Value="-2" />
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="GridViewItem">
+                                                <Grid x:Name="ContentBorder"
+                                                                            Control.IsTemplateFocusTarget="True"
+                                                                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+                                                                            Background="{TemplateBinding Background}"
+                                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                                            CornerRadius="{TemplateBinding CornerRadius}"
+                                                                            RenderTransformOrigin="0.5,0.5">
+
+                                                    <Grid.RenderTransform>
+                                                        <ScaleTransform x:Name="ContentBorderScale" />
+                                                    </Grid.RenderTransform>
+
+                                                    <VisualStateManager.VisualStateGroups>
+                                                        <VisualStateGroup x:Name="FocusStates">
+                                                            <VisualState x:Name="Focused">
+
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Collapsed" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+                                                            <VisualState x:Name="Unfocused" />
+
+                                                        </VisualStateGroup>
+                                                        <VisualStateGroup x:Name="CommonStates">
+                                                            <VisualState x:Name="Normal">
+
+                                                                <Storyboard>
+                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="PointerOver">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="Pressed">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <PointerDownThemeAnimation TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="Selected">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="PointerOverSelected">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="PressedSelected">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <PointerDownThemeAnimation TargetName="ContentPresenter" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                        </VisualStateGroup>
+
+                                                        <VisualStateGroup x:Name="DisabledStates">
+                                                            <VisualState x:Name="Enabled" />
+
+                                                            <VisualState x:Name="Disabled">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                        </VisualStateGroup>
+
+                                                        <VisualStateGroup x:Name="MultiSelectStates">
+                                                            <VisualState x:Name="MultiSelectDisabled">
+
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                                                        <DiscreteObjectKeyFrame KeyTime="0:0:0.333"
+                                                                                                                    Value="Collapsed" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <FadeOutThemeAnimation TargetName="MultiSelectSquare" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="MultiSelectEnabled">
+
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <FadeInThemeAnimation TargetName="MultiSelectSquare" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                        </VisualStateGroup>
+
+                                                        <VisualStateGroup x:Name="DataVirtualizationStates">
+                                                            <VisualState x:Name="DataAvailable" />
+
+                                                            <VisualState x:Name="DataPlaceholder">
+
+                                                                <Storyboard>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                        <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                                                    </ObjectAnimationUsingKeyFrames>
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                        </VisualStateGroup>
+
+                                                        <VisualStateGroup x:Name="ReorderHintStates">
+                                                            <VisualState x:Name="NoReorderHint" />
+
+                                                            <VisualState x:Name="BottomReorderHint">
+
+                                                                <Storyboard>
+                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Bottom" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="TopReorderHint">
+
+                                                                <Storyboard>
+                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Top" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="RightReorderHint">
+
+                                                                <Storyboard>
+                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Right" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="LeftReorderHint">
+
+                                                                <Storyboard>
+                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Left" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualStateGroup.Transitions>
+                                                                <VisualTransition To="NoReorderHint"
+                                                                                                        GeneratedDuration="0:0:0.2" />
+                                                            </VisualStateGroup.Transitions>
+
+                                                        </VisualStateGroup>
+
+                                                        <VisualStateGroup x:Name="DragStates">
+                                                            <VisualState x:Name="NotDragging" />
+
+                                                            <VisualState x:Name="Dragging">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                                    <DragItemThemeAnimation TargetName="ContentBorder" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="DraggingTarget" />
+
+                                                            <VisualState x:Name="MultipleDraggingPrimary">
+
+                                                                <Storyboard>
+                                                                    <!-- These two Opacity animations are required - the FadeInThemeAnimations
+                                                                                                on the same elements animate an internal Opacity. -->
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
+                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
+                                                                    <DragItemThemeAnimation TargetName="ContentBorder" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="MultipleDraggingSecondary" />
+
+                                                            <VisualState x:Name="DraggedPlaceholder" />
+
+                                                            <VisualState x:Name="Reordering">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderThemeOpacity}" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="ReorderingTarget">
+
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeOpacity}" />
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
+                                                                                                            Storyboard.TargetProperty="ScaleX"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
+                                                                                                            Storyboard.TargetProperty="ScaleY"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="MultipleReorderingPrimary">
+
+                                                                <Storyboard>
+                                                                    <!-- These two Opacity animations are required - the FadeInThemeAnimations
+                                                                                                on the same elements animate an internal Opacity. -->
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
+                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="ReorderedPlaceholder">
+
+                                                                <Storyboard>
+                                                                    <FadeOutThemeAnimation TargetName="ContentBorder" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualState x:Name="DragOver">
+
+                                                                <Storyboard>
+                                                                    <DropTargetItemThemeAnimation TargetName="ContentBorder" />
+                                                                </Storyboard>
+                                                            </VisualState>
+
+                                                            <VisualStateGroup.Transitions>
+                                                                <VisualTransition To="NotDragging"
+                                                                                                        GeneratedDuration="0:0:0.2" />
+                                                            </VisualStateGroup.Transitions>
+
+                                                        </VisualStateGroup>
+
+                                                    </VisualStateManager.VisualStateGroups>
+                                                    <ContentPresenter x:Name="ContentPresenter"
+                                                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                                            Margin="{TemplateBinding Padding}" />
+                                                    <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
+                                                                                In the DataPlaceholder state, the Content is not loaded yet so we
+                                                                                approximate the size of the item using placeholder text. -->
+                                                    <TextBlock x:Name="PlaceholderTextBlock"
+                                                                                    Visibility="Collapsed"
+                                                                                    Text="Xg"
+                                                                                    Foreground="{x:Null}"
+                                                                                    Margin="{TemplateBinding Padding}"
+                                                                                    IsHitTestVisible="False"
+                                                                                    AutomationProperties.AccessibilityView="Raw" />
+                                                    <Rectangle x:Name="PlaceholderRect"
+                                                                                    Visibility="Collapsed"
+                                                                                    Fill="{ThemeResource ListViewItemPlaceholderBackground}" />
+                                                    <Rectangle x:Name="BorderRectangle"
+                                                                                    IsHitTestVisible="False"
+                                                                                    Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
+                                                                                    StrokeThickness="2"
+                                                                                    Opacity="0" />
+                                                    <Border x:Name="MultiSelectSquare"
+                                                                                Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
+                                                                                Width="20"
+                                                                                Height="20"
+                                                                                Margin="0,2,2,0"
+                                                                                VerticalAlignment="Top"
+                                                                                HorizontalAlignment="Right"
+                                                                                Visibility="Collapsed">
+                                                        <FontIcon x:Name="MultiSelectCheck"
+                                                                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                                        Glyph="&#xE73E;"
+                                                                                        FontSize="16"
+                                                                                        Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
+                                                                                        Opacity="0" />
+                                                    </Border>
+                                                    <Border x:Name="MultiArrangeOverlayTextBorder"
+                                                                                Opacity="0"
+                                                                                IsHitTestVisible="False"
+                                                                                MinWidth="20"
+                                                                                Height="20"
+                                                                                VerticalAlignment="Center"
+                                                                                HorizontalAlignment="Center"
+                                                                                Background="{ThemeResource SystemControlBackgroundAccentBrush}"
+                                                                                BorderThickness="2"
+                                                                                BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}">
+                                                        <TextBlock x:Name="MultiArrangeOverlayText"
+                                                                                        Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
+                                                                                        Style="{ThemeResource CaptionTextBlockStyle}"
+                                                                                        IsHitTestVisible="False"
+                                                                                        Opacity="0"
+                                                                                        VerticalAlignment="Center"
+                                                                                        HorizontalAlignment="Center"
+                                                                                        AutomationProperties.AccessibilityView="Raw" />
+                                                    </Border>
+
+                                                </Grid>
+
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </GridView.ItemContainerStyle>
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayName}}"
+                                                                HorizontalAlignment="Stretch"
+                                                                VerticalAlignment="Stretch">
+                                        <Border.Background>
+                                            <SolidColorBrush Color="{Binding}" />
+                                        </Border.Background>
+                                    </Border>
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+                        </GridView>
+                    </PivotItem.Content>
+                </PivotItem>
+                <PivotItem x:Name="ChannelsPivotItem"
+                                                AutomationProperties.Name="Channels">
+                    <PivotItem.Header>
+                        <FontIcon Glyph="&#xE9E9;"
+                                                        Width="108" />
+                    </PivotItem.Header>
+                    <PivotItem.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="30" />
+                                <ColumnDefinition Width="80" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="24" />
+                                <RowDefinition Height="1*" />
+                                <RowDefinition Height="1*" />
+                                <RowDefinition Height="1*" />
+                                <RowDefinition Height="1*" />
+                                <!-- Note that there is an additional 12px added by the PivotItem -->
+                                <RowDefinition Height="12" />
+                            </Grid.RowDefinitions>
+                            <!-- Top color model & Hex input -->
+                            <Grid Grid.Column="0"
+                                                        Grid.ColumnSpan="3"
+                                                        Grid.Row="0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="12" />
+                                    <ColumnDefinition Width="2*" />
+                                </Grid.ColumnDefinitions>
+                                <!-- Content RGB/HSV names are hard-coded in ColorPicker as well -->
+                                <!-- ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                                <ToggleButton x:Name="RgbToggleButton"
+                                                                    Grid.Column="0"
+                                                                    Content="RGB"
+                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                                                    BorderThickness="1"
+                                                                    Background="Transparent"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    IsThreeState="False"
+                                                                    contract7Present:CornerRadius="2,0,0,2"/>
+                                <ToggleButton x:Name="HsvToggleButton"
+                                                                    Grid.Column="1"
+                                                                    Content="HSV"
+                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                                                    BorderThickness="1"
+                                                                    Background="Transparent"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    IsThreeState="False"
+                                                                    contract7Present:CornerRadius="0,2,2,0" />
+                                <Grid x:Name="HexInputGrid"
+                                                            Grid.Column="3">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="30" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Border Grid.Column="0"
+                                                                Height="32"
+                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                                BorderThickness="1,1,0,1"
+                                                                CornerRadius="2,0,0,2">
+                                        <TextBlock Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                        FontWeight="SemiBold"
+                                                                        Text="#"
+                                                                        HorizontalAlignment="Center"
+                                                                        VerticalAlignment="Center" />
+                                    </Border>
+                                    <!-- Name must NOT match what is in ColorPicker 'HexTextBox' -->
+                                    <TextBox x:Name="HexInputTextBox"
+                                                                    Style="{StaticResource InputTextBoxStyle}"
+                                                                    AutomationProperties.Name="Hexadecimal Color Input"
+                                                                    Height="32"
+                                                                    Grid.Column="1"
+                                                                    HorizontalAlignment="Stretch" />
+                                </Grid>
+                            </Grid>
+                            <!-- Color channel editing controls -->
+                            <!-- Channel 1 RGB:Red HSV:Hue -->
+                            <Border Grid.Column="0"
+                                                        Grid.Row="2"
+                                                        Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                                <TextBlock x:Name="Channel1TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="R"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                            </Border>
+                            <TextBox x:Name="Channel1TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="2"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Red Channel"
+                                                            VerticalAlignment="Center" />
+                            <controls:ColorPickerSlider x:Name="Channel1Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="2"
+                                                                                    AutomationProperties.Name="Red Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                            <!-- Channel 2 RGB:Green HSV:Saturation -->
+                            <Border Grid.Column="0"
+                                                        Grid.Row="3"
+                                                        Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                                <TextBlock x:Name="Channel2TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="G"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                            </Border>
+                            <TextBox x:Name="Channel2TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="3"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Green Channel"
+                                                            VerticalAlignment="Center" />
+                            <controls:ColorPickerSlider x:Name="Channel2Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="3"
+                                                                                    AutomationProperties.Name="Green Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                            <!-- Channel 3 RGB:Blue HSV:Value -->
+                            <Border Grid.Column="0"
+                                                        Grid.Row="4"
+                                                        Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                                <TextBlock x:Name="Channel3TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="B"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                            </Border>
+                            <TextBox x:Name="Channel3TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="4"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Blue Channel"
+                                                            VerticalAlignment="Center" />
+                            <controls:ColorPickerSlider x:Name="Channel3Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="4"
+                                                                                    AutomationProperties.Name="Blue Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                            <!-- Alpha channel -->
+                            <Border x:Name="AlphaChannelBorder"
+                                                        Grid.Column="0"
+                                                        Grid.Row="5"
+                                                        Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                                <TextBlock x:Name="AlphaChannelTextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="A"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                            </Border>
+                            <TextBox x:Name="AlphaChannelTextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="5"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Alpha Channel"
+                                                            VerticalAlignment="Center" />
+                            <controls:ColorPickerSlider x:Name="AlphaChannelSlider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="5"
+                                                                                    AutomationProperties.Name="Alpha Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                        </Grid>
+                    </PivotItem.Content>
+                </PivotItem>
+            </Pivot>
+            <!-- TODO: Expose resources for the height of this part and the margin -->
+            <Grid x:Name="ColorPreviewGrid"
+                                        Grid.Row="2"
+                                        Height="48"
+                                        Margin="12,0,12,12">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="4"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="4"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Left-side Preview Darker Shades -->
+                <Border x:Name="CheckeredBackground2Border"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Stretch" />
+                <Border x:Name="N2PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            VerticalAlignment="Stretch"
+                                            CornerRadius="2,0,0,2">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-2'}" />
+                    </Border.Background>
+                </Border>
+                <!-- The -1 and +1 accent preview originally had a drop shadow as well.
+                                            However, due to Z-order issues with the checkered background,
+                                            shadow and preview border, it would have required it's own
+                                            checkered background. This was judged not worth the performance 
+                                            trade-off so shadows were removed. -->
+                <Border x:Name="N1PreviewBorder"
+                                                Grid.Row="1"
+                                                Grid.Column="1">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-1'}" />
+                    </Border.Background>
+                </Border>
+                <!-- Right-side Preview Lighter Shades -->
+                <Border x:Name="CheckeredBackground4Border"
+                                                Grid.Row="1"
+                                                Grid.Column="3"
+                                                Grid.ColumnSpan="2"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch" />
+                <Border x:Name="P1PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="3">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='1'}" />
+                    </Border.Background>
+                </Border>
+                <Border x:Name="P2PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="4"
+                                            CornerRadius="0,2,2,0">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='2'}" />
+                    </Border.Background>
+                </Border>
+                <!-- Main Color Preview Box at Bottom -->
+                <!-- Must be last for drop shadow Z-index -->
+                <controls:DropShadowPanel Grid.RowSpan="3"
+                                          Grid.Column="2"
+                                          BlurRadius="10.0"
+                                          ShadowOpacity="0.75"
+                                          OffsetX="0.0"
+                                          OffsetY="0.0"
+                                          Color="Black"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Stretch">
+                    <Grid>
+                        <Border Background="{ThemeResource FlyoutPresenterBackground}"
+                                                    CornerRadius="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch" />
+                        <Border x:Name="CheckeredBackground3Border"
+                                                    CornerRadius="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch" />
+                        <Border x:Name="PreviewBorder"
+                                                    CornerRadius="2">
+                            <Border.Background>
+                                <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
+                            </Border.Background>
+                        </Border>
+                    </Grid>
+                </controls:DropShadowPanel>
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <!-- TODO: Remove duplicity here when #3440 is resolved -->
+    <contract7NotPresent:Style TargetType="controls:ColorPicker"
+                               BasedOn="{StaticResource BaseColorPickerStyle}">
+        <!-- Currently not used -->
+    </contract7NotPresent:Style>
+
+    <contract7Present:Style TargetType="controls:ColorPicker"
+                            BasedOn="{StaticResource BaseColorPickerStyle}">
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+    </contract7Present:Style>
+
+    <!-- TODO: Pull into separate file? -->
+    <Style TargetType="controls:ColorPickerSlider" BasedOn="{StaticResource ColorPickerSliderStyle}"/>
+
+    <Style x:Key="ColorPickerSliderStyle" TargetType="controls:ColorPickerSlider">
+        <Setter Property="VerticalAlignment"
+                                        Value="Center" />
+        <Setter Property="IsThumbToolTipEnabled"
+                                        Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <!-- Based on WinUI version 2.4.2 -->
+                <ControlTemplate TargetType="controls:ColorPickerSlider">
+                    <Grid Margin="{TemplateBinding Padding}">
+                        <Grid.Resources>
+                            <Style TargetType="Thumb"
+                                                           x:Key="SliderThumbStyle">
+                                <Setter Property="BorderThickness"
+                                                                Value="3" />
+                                <Setter Property="Background"
+                                                                Value="Transparent" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Thumb">
+                                            <Border Background="{TemplateBinding Background}"
+                                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                                            CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Grid.Resources>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+
+                                <!-- The Pressed state is purposely the same as normal.
+                                                             This ensures that the thumb always has the correct contrast with 
+                                                             the selected color underneath it when dragging or moving. -->
+                                <VisualState x:Name="Pressed" />
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="VerticalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="SliderContainer.Background"
+                                                                        Value="{ThemeResource SliderContainerBackgroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="VerticalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="SliderContainer.Background"
+                                                                        Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusEngagementStates">
+                                <VisualState x:Name="FocusDisengaged" />
+                                <VisualState x:Name="FocusEngagedHorizontal">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
+                                                                        Value="False" />
+                                        <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)"
+                                                                        Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="FocusEngagedVertical">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
+                                                                        Value="False" />
+                                        <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)"
+                                                                        Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Grid x:Name="SliderContainer"
+                                                      Background="{ThemeResource SliderContainerBackground}"
+                                                      Control.IsTemplateFocusTarget="True">
+                            <Grid x:Name="HorizontalTemplate"
+                                                          MinHeight="20">
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="0" />
+                                </Grid.RowDefinitions>
+
+                                <Rectangle x:Name="HorizontalTrackRect"
+                                                                   Fill="{TemplateBinding Background}"
+                                                                   Height="20"
+                                                                   Grid.Row="1"
+                                                                   Grid.ColumnSpan="3"
+                                                                   RadiusX="10"
+                                                                   RadiusY="10" />
+                                <Rectangle x:Name="HorizontalDecreaseRect"
+                                                                   Fill="Transparent"
+                                                                   Grid.Row="1"
+                                                                   RadiusX="8"
+                                                                   RadiusY="8" />
+                                <Thumb x:Name="HorizontalThumb"
+                                                               Style="{StaticResource SliderThumbStyle}"
+                                                               DataContext="{TemplateBinding Value}"
+                                                               BorderBrush="{TemplateBinding BorderBrush}"
+                                                               Height="20"
+                                                               Width="20"
+                                                               contract7Present:CornerRadius="10"
+                                                               Grid.Row="0"
+                                                               Grid.RowSpan="3"
+                                                               Grid.Column="1"
+                                                               FocusVisualMargin="-14,-6,-14,-6"
+                                                               AutomationProperties.AccessibilityView="Raw" />
+                            </Grid>
+                            <Grid x:Name="VerticalTemplate"
+                                                          MinWidth="20"
+                                                          Visibility="Collapsed">
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="0" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="0" />
+                                </Grid.ColumnDefinitions>
+
+                                <Rectangle x:Name="VerticalTrackRect"
+                                                                   Fill="{TemplateBinding Background}"
+                                                                   Width="20"
+                                                                   Grid.Column="1"
+                                                                   Grid.RowSpan="3"
+                                                                   RadiusX="10"
+                                                                   RadiusY="10" />
+                                <Rectangle x:Name="VerticalDecreaseRect"
+                                                                   Fill="Transparent"
+                                                                   Grid.Column="1"
+                                                                   Grid.Row="2"
+                                                                   RadiusX="8"
+                                                                   RadiusY="8" />
+                                <Thumb x:Name="VerticalThumb"
+                                                               Style="{StaticResource SliderThumbStyle}"
+                                                               DataContext="{TemplateBinding Value}"
+                                                               BorderBrush="{TemplateBinding BorderBrush}"
+                                                               Height="20"
+                                                               Width="20"
+                                                               contract7Present:CornerRadius="10"
+                                                               Grid.Row="1"
+                                                               Grid.Column="0"
+                                                               Grid.ColumnSpan="3"
+                                                               FocusVisualMargin="-6,-14,-6,-14"
+                                                               AutomationProperties.AccessibilityView="Raw" />
+                            </Grid>
+                        </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
similarity index 89%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
index 13940d25389..80abd02ecd7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
@@ -3,7 +3,7 @@
                     xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButtonConverters"
+                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters">
 
     <!-- The XAML compiler has a serious bug that doesn't allow using conditional XAML on Setters...
@@ -41,183 +41,6 @@
                             </SolidColorBrush>
                             <SolidColorBrush x:Name="CheckerColorBrush"
                                              Color="{ThemeResource SystemListLowColor}" />
-                            <Style x:Key="ColorPickerButtonSliderStyle"
-                                   TargetType="controls:ColorPickerButtonSlider">
-                                <Setter Property="VerticalAlignment"
-                                        Value="Center" />
-                                <Setter Property="IsThumbToolTipEnabled"
-                                        Value="False" />
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <!-- Based on WinUI version 2.4.2 -->
-                                        <ControlTemplate TargetType="controls:ColorPickerButtonSlider">
-                                            <Grid Margin="{TemplateBinding Padding}">
-                                                <Grid.Resources>
-                                                    <Style TargetType="Thumb"
-                                                           x:Key="SliderThumbStyle">
-                                                        <Setter Property="BorderThickness"
-                                                                Value="3" />
-                                                        <Setter Property="Background"
-                                                                Value="Transparent" />
-                                                        <Setter Property="Template">
-                                                            <Setter.Value>
-                                                                <ControlTemplate TargetType="Thumb">
-                                                                    <Border Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
-                                                                </ControlTemplate>
-                                                            </Setter.Value>
-                                                        </Setter>
-                                                    </Style>
-                                                </Grid.Resources>
-
-                                                <VisualStateManager.VisualStateGroups>
-                                                    <VisualStateGroup x:Name="CommonStates">
-                                                        <VisualState x:Name="Normal" />
-
-                                                        <!-- The Pressed state is purposely the same as normal.
-                                                             This ensures that the thumb always has the correct contrast with 
-                                                             the selected color underneath it when dragging or moving. -->
-                                                        <VisualState x:Name="Pressed" />
-
-                                                        <VisualState x:Name="Disabled">
-                                                            <VisualState.Setters>
-                                                                <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                                                <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                                                <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundDisabled}" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-
-                                                        <VisualState x:Name="PointerOver">
-                                                            <VisualState.Setters>
-                                                                <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                                                <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                                                <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-
-                                                    </VisualStateGroup>
-                                                    <VisualStateGroup x:Name="FocusEngagementStates">
-                                                        <VisualState x:Name="FocusDisengaged" />
-                                                        <VisualState x:Name="FocusEngagedHorizontal">
-                                                            <VisualState.Setters>
-                                                                <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                                                <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-                                                        <VisualState x:Name="FocusEngagedVertical">
-                                                            <VisualState.Setters>
-                                                                <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                                                <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-
-                                                    </VisualStateGroup>
-
-                                                </VisualStateManager.VisualStateGroups>
-
-                                                <Grid x:Name="SliderContainer"
-                                                      Background="{ThemeResource SliderContainerBackground}"
-                                                      Control.IsTemplateFocusTarget="True">
-                                                    <Grid x:Name="HorizontalTemplate"
-                                                          MinHeight="20">
-
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                            <ColumnDefinition Width="*" />
-                                                        </Grid.ColumnDefinitions>
-
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="0" />
-                                                            <RowDefinition Height="*" />
-                                                            <RowDefinition Height="0" />
-                                                        </Grid.RowDefinitions>
-
-                                                        <Rectangle x:Name="HorizontalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Height="20"
-                                                                   Grid.Row="1"
-                                                                   Grid.ColumnSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
-                                                        <Rectangle x:Name="HorizontalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Row="1"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
-                                                        <Thumb x:Name="HorizontalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               contract7Present:CornerRadius="10"
-                                                               Grid.Row="0"
-                                                               Grid.RowSpan="3"
-                                                               Grid.Column="1"
-                                                               FocusVisualMargin="-14,-6,-14,-6"
-                                                               AutomationProperties.AccessibilityView="Raw" />
-                                                    </Grid>
-                                                    <Grid x:Name="VerticalTemplate"
-                                                          MinWidth="20"
-                                                          Visibility="Collapsed">
-
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="*" />
-                                                            <RowDefinition Height="Auto" />
-                                                            <RowDefinition Height="Auto" />
-                                                        </Grid.RowDefinitions>
-
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="0" />
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="0" />
-                                                        </Grid.ColumnDefinitions>
-
-                                                        <Rectangle x:Name="VerticalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Width="20"
-                                                                   Grid.Column="1"
-                                                                   Grid.RowSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
-                                                        <Rectangle x:Name="VerticalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Column="1"
-                                                                   Grid.Row="2"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
-                                                        <Thumb x:Name="VerticalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               contract7Present:CornerRadius="10"
-                                                               Grid.Row="1"
-                                                               Grid.Column="0"
-                                                               Grid.ColumnSpan="3"
-                                                               FocusVisualMargin="-6,-14,-6,-14"
-                                                               AutomationProperties.AccessibilityView="Raw" />
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
                             <contract7NotPresent:Style TargetType="TextBox"
                                                        x:Key="InputTextBoxStyle">
                                 <!-- Currently not used -->
@@ -496,11 +319,10 @@
                                                             <RowDefinition Height="Auto" />
                                                             <RowDefinition Height="*" />
                                                         </Grid.RowDefinitions>
-                                                        <controls:ColorPickerButtonSlider x:Name="ColorSpectrumThirdDimensionSlider"
+                                                        <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
                                                                                           Grid.Column="0"
                                                                                           Grid.Row="1"
                                                                                           Grid.RowSpan="2"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
                                                                                           BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
                                                                                           Orientation="Vertical"
                                                                                           Width="20"
@@ -524,12 +346,11 @@
                                                                        Shape="{TemplateBinding ColorSpectrumShape}"
                                                                        HorizontalAlignment="Stretch"
                                                                        VerticalAlignment="Stretch" />
-                                                        <controls:ColorPickerButtonSlider x:Name="ColorSpectrumAlphaSlider"
+                                                        <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
                                                                                           AutomationProperties.Name="Alpha Channel"
                                                                                           Grid.Column="2"
                                                                                           Grid.Row="1"
                                                                                           Grid.RowSpan="2"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
                                                                                           BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
                                                                                           Orientation="Vertical"
                                                                                           Width="20"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButtonSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
similarity index 87%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButtonSlider.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
index ec9166b7bf9..a6cb9fb13ee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButtonSlider.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
@@ -5,10 +5,11 @@
 using Windows.Foundation;
 using Windows.UI.Xaml.Controls;
 
+// TODO: Do we want this in a subnamespace at least?
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// A <see cref="Slider"/> implementation for use in the <see cref="ColorPickerButton"/>.
+    /// A <see cref="Slider"/> implementation for use in the <see cref="ColorPicker"/>.
     /// </summary>
     /// <remarks>
     ///
@@ -22,11 +23,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// here in the future just like ColorPicker.
     ///
     /// </remarks>
-    public class ColorPickerButtonSlider : Slider
+    public class ColorPickerSlider : Slider
     {
         private Size oldSize;
         private Size measuredSize;
 
+        /// <inheritdoc/>
+        public ColorPickerSlider()
+            : base()
+        {
+            this.DefaultStyleKey = typeof(ColorPickerSlider);
+        }
+
         /// <summary>
         /// Measures the size in layout required for child elements and determines a size for the
         /// FrameworkElement-derived class.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToColorShadeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
index 532e91f3d41..a74e6e4ae54 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToColorShadeConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButtonConverters
+namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters
 {
     /// <summary>
     /// Creates an accent color shade from a color value.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToHexConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
index 2622b246180..b460c8820fa 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorToHexConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButtonConverters
+namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters
 {
     /// <summary>
     /// Converts a color to a hex string and vice versa.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ContrastBrushConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
index c05fd1a67aa..97d0f6bc7bb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ContrastBrushConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
@@ -7,7 +7,7 @@
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButtonConverters
+namespace Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters
 {
     /// <summary>
     /// Gets a color, either black or white, depending on the brightness of the supplied color.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/IColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/WindowsColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/WindowsColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/WindowsColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/WindowsColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
index 94a537fbb53..6edfd098f16 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
@@ -108,7 +108,7 @@ private void CanvasTextBox_SizeChanged(object sender, SizeChangedEventArgs e)
             SelectedTextDrawable?.UpdateBounds(_canvasTextBox.ActualWidth, _canvasTextBox.ActualHeight);
         }
 
-        private void CanvasTextBoxColorPicker_ColorChanged(ColorPicker sender, ColorChangedEventArgs args)
+        private void CanvasTextBoxColorPicker_ColorChanged(Windows.UI.Xaml.Controls.ColorPicker sender, ColorChangedEventArgs args)
         {
             if (SelectedTextDrawable != null)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs
index 23cb0a3ef3c..be4e955b281 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// InfiniteCanvas is a canvas that supports Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export canvas data, Import canvas data.
     /// </summary>
     [TemplatePart(Name = CanvasTextBoxToolsName, Type = typeof(StackPanel))]
-    [TemplatePart(Name = CanvasTextBoxColorPickerName, Type = typeof(ColorPicker))]
+    [TemplatePart(Name = CanvasTextBoxColorPickerName, Type = typeof(Windows.UI.Xaml.Controls.ColorPicker))]
     [TemplatePart(Name = CanvasTextBoxFontSizeTextBoxName, Type = typeof(TextBox))]
     [TemplatePart(Name = CanvasTextBoxItalicButtonName, Type = typeof(ToggleButton))]
     [TemplatePart(Name = CanvasTextBoxBoldButtonName, Type = typeof(ToggleButton))]
@@ -69,7 +69,7 @@ public partial class InfiniteCanvas : Control
         private InkToolbarCustomToggleButton _enableTouchInkingButton;
         private InfiniteCanvasTextBox _canvasTextBox;
         private StackPanel _canvasTextBoxTools;
-        private ColorPicker _canvasTextBoxColorPicker;
+        private Windows.UI.Xaml.Controls.ColorPicker _canvasTextBoxColorPicker;
 
         private TextBox _canvasTextBoxFontSizeTextBox;
         private ToggleButton _canvasTextBoxItalicButton;
@@ -243,7 +243,7 @@ public InfiniteCanvas()
         protected override void OnApplyTemplate()
         {
             _canvasTextBoxTools = (StackPanel)GetTemplateChild(CanvasTextBoxToolsName);
-            _canvasTextBoxColorPicker = (ColorPicker)GetTemplateChild(CanvasTextBoxColorPickerName);
+            this._canvasTextBoxColorPicker = (Windows.UI.Xaml.Controls.ColorPicker)GetTemplateChild(CanvasTextBoxColorPickerName);
             _canvasTextBoxFontSizeTextBox = (TextBox)GetTemplateChild(CanvasTextBoxFontSizeTextBoxName);
             _canvasTextBoxItalicButton = (ToggleButton)GetTemplateChild(CanvasTextBoxItalicButtonName);
             _canvasTextBoxBoldButton = (ToggleButton)GetTemplateChild(CanvasTextBoxBoldButtonName);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
index 9d78d87c390..975ef857783 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
@@ -63,6 +63,7 @@
                                     <Grid Width="2"
                                           Height="48"
                                           Background="Black" />
+                                    <!-- TODO: Replace this with ColorPickerButton -->
                                     <Button Padding="0,2,0,0"
                                             Style="{StaticResource CanvasTextBoxButtonStyle}"
                                             ToolTipService.ToolTip="Text Color">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 0785dd2fd3d..ad8206561b9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -45,6 +45,16 @@
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="ColorPicker\ColorPicker - Copy.xaml" />
+    <None Remove="ColorPicker\ColorPickerButton.xaml" />
+    <None Remove="ColorPicker\ColorPickerButtonm.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Remove="ColorPicker\ColorPickerButton.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
@@ -59,6 +69,9 @@
   </ItemGroup>
  
   <ItemGroup>
+    <Page Update="ColorPicker\ColorPicker - Copy.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="ImageCropper\ImageCropper.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 551444a6805..2d30ad50b00 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -4,7 +4,8 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml" />
+        <!--<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml" />-->
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />

From 97ab1d8ba90652fa7c338a646fab8e3cda79d22c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 12:07:04 +0200
Subject: [PATCH 450/595] Removed unnecessary using directives

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 4b2f37b04d5..e1f2f36df6f 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -10,8 +10,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq.Expressions;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 

From dd8c7b4c49e58ffd17e02a0dbf4fed133759aa51 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 18:24:53 +0200
Subject: [PATCH 451/595] Bug fixes and minor optimization to
 ObservableValidator

---
 .../ComponentModel/ObservableValidator.cs     | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 09fb2728ec9..e7e0da3d1b7 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -22,11 +22,18 @@ public abstract class ObservableValidator : ObservableObject, INotifyDataErrorIn
         /// </summary>
         private readonly Dictionary<string, List<ValidationResult>> errors = new Dictionary<string, List<ValidationResult>>();
 
+        /// <summary>
+        /// Indicates the total number of properties with errors (not total errors).
+        /// This is used to allow <see cref="HasErrors"/> to operate in O(1) time, as it can just
+        /// check whether this value is not 0 instead of having to traverse <see cref="errors"/>.
+        /// </summary>
+        private int totalErrors;
+
         /// <inheritdoc/>
         public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
 
         /// <inheritdoc/>
-        public bool HasErrors => this.errors.Count > 0;
+        public bool HasErrors => this.totalErrors > 0;
 
         /// <inheritdoc/>
         public IEnumerable GetErrors(string? propertyName)
@@ -46,7 +53,7 @@ public IEnumerable GetErrors(string? propertyName)
         /// <param name="value">The value to test for the specified property.</param>
         /// <param name="propertyName">The name of the property to validate.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="propertyName"/> is <see langword="null"/>.</exception>
-        public void ValidateProperty(object value, [CallerMemberName] string? propertyName = null)
+        protected void ValidateProperty(object value, [CallerMemberName] string? propertyName = null)
         {
             if (propertyName is null)
             {
@@ -67,11 +74,23 @@ public void ValidateProperty(object value, [CallerMemberName] string? propertyNa
             List<ValidationResult> results = new List<ValidationResult>();
 
             // Validate the property
-            if (!Validator.TryValidateProperty(
+            if (Validator.TryValidateProperty(
                 value,
                 new ValidationContext(this, null, null) { MemberName = propertyName },
                 results))
             {
+                if (errorsChanged)
+                {
+                    this.totalErrors--;
+                }
+            }
+            else
+            {
+                if (!errorsChanged)
+                {
+                    this.totalErrors++;
+                }
+
                 // We can avoid the repeated dictionary lookup if we just check the result of the previous
                 // one here. If the retrieved errors collection is null, we can log the ones produced by
                 // the validation we just performed. We also don't need to create a new list and add them

From 96828978ddd44ef1e8d295534ca8763aed1ff9e1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 19:00:02 +0200
Subject: [PATCH 452/595] Improved support for INotifyDataErrorInfo.GetErrors

---
 .../ComponentModel/ObservableValidator.cs                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index e7e0da3d1b7..f7526d316bb 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -44,7 +44,12 @@ public IEnumerable GetErrors(string? propertyName)
                 return errors;
             }
 
-            return null!;
+            // The INotifyDataErrorInfo.GetErrors method doesn't specify exactly what to
+            // return when the input property name is invalid, but given that the return
+            // type is marked as a non-nullable reference type, here we're returning an
+            // empty array to respect the contract. We do the same when the input property
+            // is null as well, as we don't support entity-level errors at the moment.
+            return Array.Empty<ValidationResult>();
         }
 
         /// <summary>

From 0a7df907f3c63009ee7f36cc5bd45c7e589a5eb4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 19:00:11 +0200
Subject: [PATCH 453/595] Added tests for ObservableValidator

---
 .../Mvvm/Test_ObservableValidator.cs          | 110 ++++++++++++++++++
 .../UnitTests.Shared.projitems                |   1 +
 2 files changed, 111 insertions(+)
 create mode 100644 UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
new file mode 100644
index 00000000000..ce1c2501452
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
@@ -0,0 +1,110 @@
+// 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.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    public class Test_ObservableValidator
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableValidator_HasErrors()
+        {
+            var model = new Person();
+
+            Assert.IsFalse(model.HasErrors);
+
+            model.Name = "No";
+
+            Assert.IsTrue(model.HasErrors);
+
+            model.Name = "Valid";
+
+            Assert.IsFalse(model.HasErrors);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableValidator_ErrorsChanged()
+        {
+            var model = new Person();
+
+            List<(object Sender, DataErrorsChangedEventArgs Args)> errors = new List<(object, DataErrorsChangedEventArgs)>();
+
+            model.ErrorsChanged += (s, e) => errors.Add((s, e));
+
+            model.Name = "Foo";
+
+            Assert.AreEqual(errors.Count, 1);
+            Assert.AreSame(errors[0].Sender, model);
+            Assert.AreEqual(errors[0].Args.PropertyName, nameof(Person.Name));
+
+            errors.Clear();
+
+            model.Name = "Bar";
+
+            Assert.AreEqual(errors.Count, 1);
+            Assert.AreSame(errors[0].Sender, model);
+            Assert.AreEqual(errors[0].Args.PropertyName, nameof(Person.Name));
+
+            errors.Clear();
+
+            model.Name = "Valid";
+
+            Assert.AreEqual(errors.Count, 1);
+            Assert.AreSame(errors[0].Sender, model);
+            Assert.AreEqual(errors[0].Args.PropertyName, nameof(Person.Name));
+
+            errors.Clear();
+
+            model.Name = "This is fine";
+
+            Assert.AreEqual(errors.Count, 0);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableValidator_GetErrors()
+        {
+            var model = new Person();
+
+            Assert.AreEqual(model.GetErrors(null).Cast<object>().Count(), 0);
+            Assert.AreEqual(model.GetErrors(string.Empty).Cast<object>().Count(), 0);
+            Assert.AreEqual(model.GetErrors("ThereIsntAPropertyWithThisName").Cast<object>().Count(), 0);
+            Assert.AreEqual(model.GetErrors(nameof(Person.Name)).Cast<object>().Count(), 0);
+
+            model.Name = "Foo";
+
+            var errors = model.GetErrors(nameof(Person.Name)).Cast<ValidationResult>().ToArray();
+
+            Assert.AreEqual(errors.Length, 1);
+            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
+        }
+
+        public class Person : ObservableValidator
+        {
+            private string name;
+
+            [MinLength(4)]
+            [MaxLength(20)]
+            public string Name
+            {
+                get => this.name;
+                set
+                {
+                    ValidateProperty(value);
+
+                    SetProperty(ref this.name, value);
+                }
+            }
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index 2422170a482..1d958a159c5 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.Request.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableValidator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_AsyncRelayCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />

From c5cbb8cfd426566a3a71f0be72959b7bd00660ab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 19:17:49 +0200
Subject: [PATCH 454/595] Added support for entity-level errors

---
 .../ComponentModel/ObservableValidator.cs     | 28 +++++++++++--
 .../Mvvm/Test_ObservableValidator.cs          | 42 +++++++++++++++++++
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index f7526d316bb..39e96ef6e4d 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.ComponentModel
@@ -36,10 +38,17 @@ public abstract class ObservableValidator : ObservableObject, INotifyDataErrorIn
         public bool HasErrors => this.totalErrors > 0;
 
         /// <inheritdoc/>
+        [Pure]
         public IEnumerable GetErrors(string? propertyName)
         {
-            if (!(propertyName is null) &&
-                this.errors.TryGetValue(propertyName, out List<ValidationResult> errors))
+            // Entity-level errors when the target property is null or empty
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                return this.GetAllErrors();
+            }
+
+            // Property-level errors, if any
+            if (this.errors.TryGetValue(propertyName, out List<ValidationResult> errors))
             {
                 return errors;
             }
@@ -47,11 +56,22 @@ public IEnumerable GetErrors(string? propertyName)
             // The INotifyDataErrorInfo.GetErrors method doesn't specify exactly what to
             // return when the input property name is invalid, but given that the return
             // type is marked as a non-nullable reference type, here we're returning an
-            // empty array to respect the contract. We do the same when the input property
-            // is null as well, as we don't support entity-level errors at the moment.
+            // empty array to respect the contract. This also matches the behavior of
+            // this method whenever errors for a valid properties are retrieved.
             return Array.Empty<ValidationResult>();
         }
 
+        /// <summary>
+        /// Implements the logic for entity-level errors gathering for <see cref="GetErrors"/>.
+        /// </summary>
+        /// <returns>An <see cref="IEnumerable"/> instance with all the errors in <see cref="errors"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private IEnumerable GetAllErrors()
+        {
+            return this.errors.Values.SelectMany(errors => errors);
+        }
+
         /// <summary>
         /// Validates a property with a specified name and a given input value.
         /// </summary>
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
index ce1c2501452..e7a37486455 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
@@ -87,6 +87,34 @@ public void Test_ObservableValidator_GetErrors()
 
             Assert.AreEqual(errors.Length, 1);
             Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
+
+            Assert.AreEqual(model.GetErrors("ThereIsntAPropertyWithThisName").Cast<object>().Count(), 0);
+
+            errors = model.GetErrors(null).Cast<ValidationResult>().ToArray();
+
+            Assert.AreEqual(errors.Length, 1);
+            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
+
+            errors = model.GetErrors(string.Empty).Cast<ValidationResult>().ToArray();
+
+            Assert.AreEqual(errors.Length, 1);
+            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
+
+            model.Age = -1;
+
+            errors = model.GetErrors(null).Cast<ValidationResult>().ToArray();
+
+            Assert.AreEqual(errors.Length, 2);
+            Assert.IsTrue(errors.Any(e => e.MemberNames.First().Equals(nameof(Person.Name))));
+            Assert.IsTrue(errors.Any(e => e.MemberNames.First().Equals(nameof(Person.Age))));
+
+            model.Age = 26;
+
+            errors = model.GetErrors(null).Cast<ValidationResult>().ToArray();
+
+            Assert.AreEqual(errors.Length, 1);
+            Assert.IsTrue(errors.Any(e => e.MemberNames.First().Equals(nameof(Person.Name))));
+            Assert.IsFalse(errors.Any(e => e.MemberNames.First().Equals(nameof(Person.Age))));
         }
 
         public class Person : ObservableValidator
@@ -105,6 +133,20 @@ public string Name
                     SetProperty(ref this.name, value);
                 }
             }
+
+            private int age;
+
+            [Range(0, 100)]
+            public int Age
+            {
+                get => this.age;
+                set
+                {
+                    ValidateProperty(value);
+
+                    SetProperty(ref this.age, value);
+                }
+            }
         }
     }
 }

From 4c7b2cf69e82ee76cdf0ca392309be6c25bd1997 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 4 Sep 2020 22:24:03 +0200
Subject: [PATCH 455/595] Suppressed false positive nullability warning

string.IsNullOrEmpty lacks annotations on .NET Standard 2.0
---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 39e96ef6e4d..2346928feb8 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -48,7 +48,7 @@ public IEnumerable GetErrors(string? propertyName)
             }
 
             // Property-level errors, if any
-            if (this.errors.TryGetValue(propertyName, out List<ValidationResult> errors))
+            if (this.errors.TryGetValue(propertyName!, out List<ValidationResult> errors))
             {
                 return errors;
             }

From 5aafde6809ae05bd6d0d5de3146a5b24c0188ed6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 5 Sep 2020 13:08:04 +0200
Subject: [PATCH 456/595] Added bool return value to ValidateProperty

---
 .../ComponentModel/ObservableValidator.cs     | 12 ++++++++---
 .../Mvvm/Test_ObservableValidator.cs          | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 2346928feb8..1bfbc4d3549 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -77,8 +77,9 @@ private IEnumerable GetAllErrors()
         /// </summary>
         /// <param name="value">The value to test for the specified property.</param>
         /// <param name="propertyName">The name of the property to validate.</param>
+        /// <returns>Whether or not the validation was successful.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="propertyName"/> is <see langword="null"/>.</exception>
-        protected void ValidateProperty(object value, [CallerMemberName] string? propertyName = null)
+        protected bool ValidateProperty(object? value, [CallerMemberName] string? propertyName = null)
         {
             if (propertyName is null)
             {
@@ -99,10 +100,13 @@ protected void ValidateProperty(object value, [CallerMemberName] string? propert
             List<ValidationResult> results = new List<ValidationResult>();
 
             // Validate the property
-            if (Validator.TryValidateProperty(
+            bool isValid = Validator.TryValidateProperty(
                 value,
                 new ValidationContext(this, null, null) { MemberName = propertyName },
-                results))
+                results);
+
+            // Update the state and/or the errors for the property
+            if (isValid)
             {
                 if (errorsChanged)
                 {
@@ -140,6 +144,8 @@ protected void ValidateProperty(object value, [CallerMemberName] string? propert
             {
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
+
+            return isValid;
         }
 
         /// <summary>
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
index e7a37486455..724b7a7d3c7 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
@@ -117,12 +117,28 @@ public void Test_ObservableValidator_GetErrors()
             Assert.IsFalse(errors.Any(e => e.MemberNames.First().Equals(nameof(Person.Age))));
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableValidator_ValidateReturn()
+        {
+            var model = new Person();
+
+            Assert.IsFalse(model.ValidateName(null));
+            Assert.IsFalse(model.ValidateName(string.Empty));
+            Assert.IsFalse(model.ValidateName("No"));
+            Assert.IsFalse(model.ValidateName("This text is really, really too long for the target property"));
+            Assert.IsTrue(model.ValidateName("1234"));
+            Assert.IsTrue(model.ValidateName("01234567890123456789"));
+            Assert.IsTrue(model.ValidateName("Hello world"));
+        }
+
         public class Person : ObservableValidator
         {
             private string name;
 
             [MinLength(4)]
             [MaxLength(20)]
+            [Required]
             public string Name
             {
                 get => this.name;
@@ -134,6 +150,11 @@ public string Name
                 }
             }
 
+            public bool ValidateName(string value)
+            {
+                return ValidateProperty(value, nameof(Name));
+            }
+
             private int age;
 
             [Range(0, 100)]

From d86f7948e19233433d97a84c1e3b255bb4887d84 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 5 Sep 2020 16:45:47 +0200
Subject: [PATCH 457/595] Added MessageHandler<in TRecipient> "covariance"

---
 .../Messaging/IMessenger.cs                   | 11 ++--
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 50 ++++++++++++-------
 .../Messaging/MessengerExtensions.cs          | 42 ++++++++++++++--
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 17 +++++++
 4 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index f008ba14a5a..006ce132141 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -13,10 +13,13 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// closures: if an instance method on a recipient needs to be invoked it is possible to just
     /// cast the recipient to the right type and then access the local method from that instance.
     /// </summary>
+    /// <typeparam name="TRecipient">The type of recipient for the message.</typeparam>
     /// <typeparam name="TMessage">The type of message to receive.</typeparam>
     /// <param name="recipient">The recipient that is receiving the message.</param>
     /// <param name="message">The message being received.</param>
-    public delegate void MessageHandler<in TMessage>(object recipient, TMessage message);
+    public delegate void MessageHandler<in TRecipient, in TMessage>(TRecipient recipient, TMessage message)
+        where TRecipient : class
+        where TMessage : class;
 
     /// <summary>
     /// An interface for a type providing the ability to exchange messages between different objects.
@@ -39,13 +42,15 @@ bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         /// <summary>
         /// Registers a recipient for a given type of message.
         /// </summary>
+        /// <typeparam name="TRecipient">The type of recipient for the message.</typeparam>
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
         /// <param name="recipient">The recipient that will receive the messages.</param>
         /// <param name="token">A token used to determine the receiving channel to use.</param>
-        /// <param name="handler">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
+        /// <param name="handler">The <see cref="MessageHandler{TRecipient,TMessage}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
-        void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> handler)
+        void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken token, MessageHandler<TRecipient, TMessage> handler)
+            where TRecipient : class
             where TMessage : class
             where TToken : IEquatable<TToken>;
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index f352fa364b2..60a3003e36d 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -50,8 +50,8 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// <code>
     /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, Receive);
     /// </code>
-    /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TMessage}"/> instance
-    /// compatible with the <see cref="MessengerExtensions.Register{T}(IMessenger,object,MessageHandler{T})"/> method.
+    /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TRecipient,TMessage}"/> instance
+    /// compatible with <see cref="MessengerExtensions.Register{TRecipient,TMessage}(IMessenger,TRecipient,MessageHandler{TRecipient,TMessage})"/>.
     /// This will also work if multiple overloads of that method are available, each handling a different
     /// message type: the C# compiler will automatically pick the right one for the current message type.
     /// For info on the other available features, check the <see cref="IMessenger"/> interface.
@@ -66,18 +66,23 @@ public sealed class Messenger : IMessenger
         //                    |   ________(recipients registrations)___________\________/            /          __/
         //                    |  /           _______(channel registrations)_____\___________________/          /
         //                    | /           /                                    \                            /
-        // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TMessage>>> mapping = Mapping<TMessage, TToken>
-        //                                            /               / \        /                   /
-        //                      ___(Type2.tToken)____/               /   \______/___________________/
+        // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<object, TMessage>>> mapping = Mapping<TMessage, TToken>
+        //                                            /               / \        /                         /
+        //                      ___(Type2.tToken)____/               /   \______/_________________________/
         //                     /________________(Type2.tMessage)____/          /
         //                    /       ________________________________________/
         //                   /       /
         // DictionarySlim<Type2, IMapping> typesMap;
         // --------------------------------------------------------------------------------------------------------
-        // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds
-        // the references from registered recipients to handlers. The handlers are stored in a <TToken, Action<TMessage>>
-        // dictionary, so that each recipient can have up to one registered handler for a given token, for each
-        // message type. Each mapping is stored in the types map, which associates each pair of concrete types to its
+        // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds the references
+        // from registered recipients to handlers. The handlers are stored in a <TToken, MessageHandler<object, TMessage>>
+        // dictionary, so that each recipient can have up to one registered handler for a given token, for each message type.
+        // Note that the registered handlers are unsafe-cast to a MessageHandler<object, TMessage> instance even if they were
+        // actually of type MessageHandler<TRecipient, TMessage>. This allows the messenger to track and invoke type-specific
+        // handlers without using reflection and without having to capture the input handler in a proxy delegate, causing one
+        // extra memory allocations and adding overhead. The type conversion is guaranteed to be respected due to how the
+        // messenger type itself works - as registered handlers are always invoked on their respective recipients.
+        // Each mapping is stored in the types map, which associates each pair of concrete types to its
         // mapping instance. Mapping instances are exposed as IMapping items, as each will be a closed type over
         // a different combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in
         // the main recipients map, along with a set of all the existing dictionaries of handlers for that recipient (for all
@@ -137,7 +142,8 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public void Register<TMessage, TToken>(object recipient, TToken token, MessageHandler<TMessage> handler)
+        public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken token, MessageHandler<TRecipient, TMessage> handler)
+            where TRecipient : class
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
@@ -146,19 +152,20 @@ public void Register<TMessage, TToken>(object recipient, TToken token, MessageHa
                 // Get the <TMessage, TToken> registration list for this recipient
                 Mapping<TMessage, TToken> mapping = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, MessageHandler<TMessage>>? map = ref mapping.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, MessageHandler<object, TMessage>>? map = ref mapping.GetOrAddValueRef(key);
 
-                map ??= new DictionarySlim<TToken, MessageHandler<TMessage>>();
+                map ??= new DictionarySlim<TToken, MessageHandler<object, TMessage>>();
 
                 // Add the new registration entry
-                ref MessageHandler<TMessage>? registeredHandler = ref map.GetOrAddValueRef(token);
+                ref MessageHandler<object, TMessage>? registeredHandler = ref map.GetOrAddValueRef(token);
 
                 if (!(registeredHandler is null))
                 {
                     ThrowInvalidOperationExceptionForDuplicateRegistration();
                 }
 
-                registeredHandler = handler;
+                // Treat the input delegate as if it was covariant (see comments below in the Send method)
+                registeredHandler = Unsafe.As<MessageHandler<object, TMessage>>(handler);
 
                 // Update the total counter for handlers for the current type parameters
                 mapping.TotalHandlersCount++;
@@ -356,7 +363,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                 var key = new Recipient(recipient);
 
-                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, MessageHandler<TMessage>>? dictionary))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, MessageHandler<object, TMessage>>? dictionary))
                 {
                     return;
                 }
@@ -461,9 +468,14 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 {
                     // We're doing an unsafe cast to skip the type checks again.
                     // See the comments in the UnregisterAll method for more info.
-                    MessageHandler<TMessage> handler = Unsafe.As<MessageHandler<TMessage>>(Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)j));
-
-                    handler(Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)j), message);
+                    object handler = Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)j);
+                    object recipient = Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)j);
+
+                    // Here we perform an unsafe cast to enable covariance for delegate types.
+                    // We know that the input recipient will always respect the type constraints
+                    // of each original input delegate, and doing so allows us to still invoke
+                    // them all from here without worrying about specific generic type arguments.
+                    Unsafe.As<MessageHandler<object, TMessage>>(handler)(recipient, message);
                 }
             }
             finally
@@ -559,7 +571,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
         /// This type is defined for simplicity and as a workaround for the lack of support for using type aliases
         /// over open generic types in C# (using type aliases can only be used for concrete, closed types).
         /// </remarks>
-        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TMessage>>>, IMapping
+        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<object, TMessage>>>, IMapping
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
index 5e2473db331..2a6a0383bec 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
@@ -174,7 +174,7 @@ static Action<IMessenger, object, TToken> GetRegistrationAction(Type type, Metho
         public static void Register<TMessage>(this IMessenger messenger, IRecipient<TMessage> recipient)
             where TMessage : class
         {
-            messenger.Register<TMessage, Unit>(recipient, default, (r, m) => Unsafe.As<IRecipient<TMessage>>(r).Receive(m));
+            messenger.Register<IRecipient<TMessage>, TMessage, Unit>(recipient, default, (r, m) => r.Receive(m));
         }
 
         /// <summary>
@@ -191,7 +191,7 @@ public static void Register<TMessage, TToken>(this IMessenger messenger, IRecipi
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            messenger.Register<TMessage, TToken>(recipient, token, (r, m) => Unsafe.As<IRecipient<TMessage>>(r).Receive(m));
+            messenger.Register<IRecipient<TMessage>, TMessage, TToken>(recipient, token, (r, m) => r.Receive(m));
         }
 
         /// <summary>
@@ -200,15 +200,49 @@ public static void Register<TMessage, TToken>(this IMessenger messenger, IRecipi
         /// <typeparam name="TMessage">The type of message to receive.</typeparam>
         /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
         /// <param name="recipient">The recipient that will receive the messages.</param>
-        /// <param name="handler">The <see cref="MessageHandler{T}"/> to invoke when a message is received.</param>
+        /// <param name="handler">The <see cref="MessageHandler{TRecipient,TMessage}"/> to invoke when a message is received.</param>
         /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
         /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
-        public static void Register<TMessage>(this IMessenger messenger, object recipient, MessageHandler<TMessage> handler)
+        public static void Register<TMessage>(this IMessenger messenger, object recipient, MessageHandler<object, TMessage> handler)
             where TMessage : class
         {
             messenger.Register(recipient, default(Unit), handler);
         }
 
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TRecipient">The type of recipient for the message.</typeparam>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="handler">The <see cref="MessageHandler{TRecipient,TMessage}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        /// <remarks>This method will use the default channel to perform the requested registration.</remarks>
+        public static void Register<TRecipient, TMessage>(this IMessenger messenger, TRecipient recipient, MessageHandler<TRecipient, TMessage> handler)
+            where TRecipient : class
+            where TMessage : class
+        {
+            messenger.Register(recipient, default(Unit), handler);
+        }
+
+        /// <summary>
+        /// Registers a recipient for a given type of message.
+        /// </summary>
+        /// <typeparam name="TMessage">The type of message to receive.</typeparam>
+        /// <typeparam name="TToken">The type of token to use to pick the messages to receive.</typeparam>
+        /// <param name="messenger">The <see cref="IMessenger"/> instance to use to register the recipient.</param>
+        /// <param name="recipient">The recipient that will receive the messages.</param>
+        /// <param name="token">A token used to determine the receiving channel to use.</param>
+        /// <param name="handler">The <see cref="MessageHandler{TRecipient,TMessage}"/> to invoke when a message is received.</param>
+        /// <exception cref="InvalidOperationException">Thrown when trying to register the same message twice.</exception>
+        public static void Register<TMessage, TToken>(this IMessenger messenger, object recipient, TToken token, MessageHandler<object, TMessage> handler)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            messenger.Register(recipient, token, handler);
+        }
+
         /// <summary>
         /// Unregisters a recipient from messages of a given type.
         /// </summary>
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 96818789f5e..41b073e3f81 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -297,8 +297,25 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken()
             Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_Messenger_RegisterWithTypeParameter()
+        {
+            var messenger = new Messenger();
+            var recipient = new RecipientWithNoMessages { Number = 42 };
+
+            int number = 0;
+
+            messenger.Register<RecipientWithNoMessages, MessageA>(recipient, (r, m) => number = r.Number);
+
+            messenger.Send<MessageA>();
+
+            Assert.AreEqual(number, 42);
+        }
+
         public sealed class RecipientWithNoMessages
         {
+            public int Number { get; set; }
         }
 
         public sealed class RecipientWithSomeMessages

From af91276723f5c877c3986bec61f7df9035f36f5d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 6 Sep 2020 19:50:09 +0200
Subject: [PATCH 458/595] Tweaked IMessenger and Messenger XML docs

---
 .../Messaging/IMessenger.cs                   | 48 +++++++++++++++++++
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 48 ++-----------------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 006ce132141..9968d79cb2c 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -23,6 +23,54 @@ public delegate void MessageHandler<in TRecipient, in TMessage>(TRecipient recip
 
     /// <summary>
     /// An interface for a type providing the ability to exchange messages between different objects.
+    /// This can be useful to decouple different modules of an application without having to keep strong
+    /// references to types being referenced. It is also possible to send messages to specific channels, uniquely
+    /// identified by a token, and to have different messengers in different sections of an applications.
+    /// In order to use the <see cref="IMessenger"/> functionalities, first define a message type, like so:
+    /// <code>
+    /// public sealed class LoginCompletedMessage { }
+    /// </code>
+    /// Then, register your a recipient for this message:
+    /// <code>
+    /// Messenger.Default.Register&lt;MyRecipientType, LoginCompletedMessage&gt;(this, (r, m) =>
+    /// {
+    ///     // Handle the message here...
+    /// });
+    /// </code>
+    /// The message handler here is a lambda expression taking two parameters: the recipient and the message.
+    /// This is done to avoid the allocations for the closures that would've been generated if the expression
+    /// had captured the current instance. The recipient type parameter is used so that the recipient can be
+    /// directly accessed within the handler without the need to manually perform type casts. This allows the
+    /// code to be less verbose and more reliable, as all the checks are done just at build time. If the handler
+    /// is defined within the same type as the recipient, it is also possible to directly access private members.
+    /// This allows the message handler to be a static method, which enables the C# compiler to perform a number
+    /// of additional memory optimizations (such as caching the delegate, avoiding unnecessary memory allocations).
+    /// Finally, send a message when needed, like so:
+    /// <code>
+    /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
+    /// </code>
+    /// Additionally, the method group syntax can also be used to specify the message handler
+    /// to invoke when receiving a message, if a method with the right signature is available
+    /// in the current scope. This is helpful to keep the registration and handling logic separate.
+    /// Following up from the previous example, consider a class having this method:
+    /// <code>
+    /// private static void Receive(MyRecipientType recipient, LoginCompletedMessage message)
+    /// {
+    ///     // Handle the message there
+    /// }
+    /// </code>
+    /// The registration can then be performed in a single line like so:
+    /// <code>
+    /// Messenger.Default.Register(this, Receive);
+    /// </code>
+    /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TRecipient,TMessage}"/> instance
+    /// compatible with <see cref="MessengerExtensions.Register{TRecipient,TMessage}(IMessenger,TRecipient,MessageHandler{TRecipient,TMessage})"/>.
+    /// This will also work if multiple overloads of that method are available, each handling a different
+    /// message type: the C# compiler will automatically pick the right one for the current message type.
+    /// It is also possible to register message handlers explicitly using the <see cref="IRecipient{TMessage}"/> interface.
+    /// To do so, the recipient just needs to implement the interface and then call the
+    /// <see cref="MessengerExtensions.RegisterAll(IMessenger,object)"/> extension, which will automatically register
+    /// all the handlers that are declared by the recipient type. Registration for individual handlers is supported as well.
     /// </summary>
     public interface IMessenger
     {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 60a3003e36d..5e6d4728ae1 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -12,50 +12,12 @@
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
     /// <summary>
-    /// A type that can be used to exchange messages between different objects.
-    /// This can be useful to decouple different modules of an application without having to keep strong
-    /// references to types being referenced. It is also possible to send messages to specific channels, uniquely
-    /// identified by a token, and to have different messengers in different sections of an applications.
-    /// In order to use the <see cref="IMessenger"/> functionalities, first define a message type, like so:
-    /// <code>
-    /// public sealed class LoginCompletedMessage { }
-    /// </code>
-    /// Then, register your a recipient for this message:
-    /// <code>
-    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, (r, m) =>
-    /// {
-    ///     // Handle the message here...
-    /// });
-    /// </code>
-    /// The message handler here is a lambda expression taking two parameters: the recipient and the message.
-    /// This is done to avoid the allocations for the closures that would've been generated if the expression
-    /// had captured the current instance - instead it is possible to just cast the recipient to the right type
-    /// and access private instance members from the handler directly. This allows the message handler to be a
-    /// static method, which enables the C# to perform a number of additional memory optimizations.
-    /// Finally, send a message when needed, like so:
-    /// <code>
-    /// Messenger.Default.Send&lt;LoginCompletedMessage&gt;();
-    /// </code>
-    /// Additionally, the method group syntax can also be used to specify the message handler
-    /// to invoke when receiving a message, if a method with the right signature is available
-    /// in the current scope. This is helpful to keep the registration and handling logic separate.
-    /// Following up from the previous example, consider a class having this method:
-    /// <code>
-    /// private static void Receive(object recipient, LoginCompletedMessage message)
-    /// {
-    ///     // Handle the message there
-    /// }
-    /// </code>
-    /// The registration can then be performed in a single line like so:
-    /// <code>
-    /// Messenger.Default.Register&lt;LoginCompletedMessage&gt;(this, Receive);
-    /// </code>
-    /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TRecipient,TMessage}"/> instance
-    /// compatible with <see cref="MessengerExtensions.Register{TRecipient,TMessage}(IMessenger,TRecipient,MessageHandler{TRecipient,TMessage})"/>.
-    /// This will also work if multiple overloads of that method are available, each handling a different
-    /// message type: the C# compiler will automatically pick the right one for the current message type.
-    /// For info on the other available features, check the <see cref="IMessenger"/> interface.
+    /// A class providing a reference implementation for the <see cref="IMessenger"/> interface.
     /// </summary>
+    /// <remarks>
+    /// This <see cref="IMessenger"/> implementation uses strong references to track the registered
+    /// recipients, so it is necessary to manually unregister them when they're no longer needed.
+    /// </remarks>
     public sealed class Messenger : IMessenger
     {
         // The Messenger class uses the following logic to link stored instances together:

From 3293fa6da031afccc98a53b4800be3f376667e02 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 00:31:58 +0200
Subject: [PATCH 459/595] Minor code refactoring

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 5e6d4728ae1..c93d12430f3 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -24,26 +24,28 @@ public sealed class Messenger : IMessenger
         // --------------------------------------------------------------------------------------------------------
         // DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
         //                    |                   \________________[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
-        //                    |                                            \___          /            /            /
-        //                    |   ________(recipients registrations)___________\________/            /          __/
-        //                    |  /           _______(channel registrations)_____\___________________/          /
-        //                    | /           /                                    \                            /
-        // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<object, TMessage>>> mapping = Mapping<TMessage, TToken>
-        //                                            /               / \        /                         /
-        //                      ___(Type2.tToken)____/               /   \______/_________________________/
-        //                     /________________(Type2.tMessage)____/          /
-        //                    /       ________________________________________/
+        //                    |                                             \____________/_________                /
+        //                    |   ________(recipients registrations)____________________/          \              /
+        //                    |  /                       ____(channel registrations)________________\____________/
+        //                    | /                       /                                            \
+        // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TRecipient, TMessage>>> mapping = Mapping<TMessage, TToken>
+        //                                            /                                   /          /
+        //                      ___(Type2.tToken)____/                                   /          /
+        //                     /________________(Type2.tMessage)________________________/          /
+        //                    /       ____________________________________________________________/
         //                   /       /
         // DictionarySlim<Type2, IMapping> typesMap;
         // --------------------------------------------------------------------------------------------------------
         // Each combination of <TMessage, TToken> results in a concrete Mapping<TMessage, TToken> type, which holds the references
-        // from registered recipients to handlers. The handlers are stored in a <TToken, MessageHandler<object, TMessage>>
-        // dictionary, so that each recipient can have up to one registered handler for a given token, for each message type.
-        // Note that the registered handlers are unsafe-cast to a MessageHandler<object, TMessage> instance even if they were
-        // actually of type MessageHandler<TRecipient, TMessage>. This allows the messenger to track and invoke type-specific
-        // handlers without using reflection and without having to capture the input handler in a proxy delegate, causing one
-        // extra memory allocations and adding overhead. The type conversion is guaranteed to be respected due to how the
-        // messenger type itself works - as registered handlers are always invoked on their respective recipients.
+        // from registered recipients to handlers. The handlers are stored in a <TToken, MessageHandler<object, TMessage>> dictionary,
+        // so that each recipient can have up to one registered handler for a given token, for each message type.
+        // Note that the registered handlers are only stored as object references, even if they were actually of type
+        // MessageHandler<TRecipient, TMessage>, to avoid unnecessary unsafe casts. Each handler is also generic with respect to the
+        // recipient type, in order to allow the messenger to track and invoke type-specific handlers without using reflection and
+        // without having to capture the input handler in a proxy delegate, causing one extra memory allocations and adding overhead.
+        // This allows users to retain type information on each registered recipient, instead of having to manually cast each recipient
+        // to the right type within the handler. The type conversion is guaranteed to be respected due to how the messenger type
+        // itself works - as registered handlers are always invoked on their respective recipients.
         // Each mapping is stored in the types map, which associates each pair of concrete types to its
         // mapping instance. Mapping instances are exposed as IMapping items, as each will be a closed type over
         // a different combination of TMessage and TToken generic type parameters. Each existing recipient is also stored in
@@ -114,12 +116,12 @@ public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken
                 // Get the <TMessage, TToken> registration list for this recipient
                 Mapping<TMessage, TToken> mapping = GetOrAddMapping<TMessage, TToken>();
                 var key = new Recipient(recipient);
-                ref DictionarySlim<TToken, MessageHandler<object, TMessage>>? map = ref mapping.GetOrAddValueRef(key);
+                ref DictionarySlim<TToken, object>? map = ref mapping.GetOrAddValueRef(key);
 
-                map ??= new DictionarySlim<TToken, MessageHandler<object, TMessage>>();
+                map ??= new DictionarySlim<TToken, object>();
 
                 // Add the new registration entry
-                ref MessageHandler<object, TMessage>? registeredHandler = ref map.GetOrAddValueRef(token);
+                ref object? registeredHandler = ref map.GetOrAddValueRef(token);
 
                 if (!(registeredHandler is null))
                 {
@@ -127,7 +129,7 @@ public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken
                 }
 
                 // Treat the input delegate as if it was covariant (see comments below in the Send method)
-                registeredHandler = Unsafe.As<MessageHandler<object, TMessage>>(handler);
+                registeredHandler = handler;
 
                 // Update the total counter for handlers for the current type parameters
                 mapping.TotalHandlersCount++;
@@ -325,7 +327,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                 var key = new Recipient(recipient);
 
-                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, MessageHandler<object, TMessage>>? dictionary))
+                if (!mapping!.TryGetValue(key, out DictionarySlim<TToken, object>? dictionary))
                 {
                     return;
                 }
@@ -533,7 +535,7 @@ private Mapping<TMessage, TToken> GetOrAddMapping<TMessage, TToken>()
         /// This type is defined for simplicity and as a workaround for the lack of support for using type aliases
         /// over open generic types in C# (using type aliases can only be used for concrete, closed types).
         /// </remarks>
-        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<object, TMessage>>>, IMapping
+        private sealed class Mapping<TMessage, TToken> : DictionarySlim<Recipient, DictionarySlim<TToken, object>>, IMapping
             where TMessage : class
             where TToken : IEquatable<TToken>
         {

From b6c7859ad6bad7dca8bdda64e783b4bb3e2b56b4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 14:34:49 +0200
Subject: [PATCH 460/595] Minor code refactoring in unit tests

---
 .../Extensions/Test_TypeExtensions.cs         | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
index 5acb2392faa..29162c2ae4a 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.Toolkit.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -15,32 +14,33 @@ public class Test_TypeExtensions
     {
         [TestCategory("TypeExtensions")]
         [TestMethod]
-        public void Test_TypeExtensions_BuiltInTypes()
+        [DataRow("bool", typeof(bool))]
+        [DataRow("int", typeof(int))]
+        [DataRow("float", typeof(float))]
+        [DataRow("double", typeof(double))]
+        [DataRow("decimal", typeof(decimal))]
+        [DataRow("object", typeof(object))]
+        [DataRow("string", typeof(string))]
+        public void Test_TypeExtensions_BuiltInTypes(string name, Type type)
         {
-            Assert.AreEqual("bool", typeof(bool).ToTypeString());
-            Assert.AreEqual("int", typeof(int).ToTypeString());
-            Assert.AreEqual("float", typeof(float).ToTypeString());
-            Assert.AreEqual("double", typeof(double).ToTypeString());
-            Assert.AreEqual("decimal", typeof(decimal).ToTypeString());
-            Assert.AreEqual("object", typeof(object).ToTypeString());
-            Assert.AreEqual("string", typeof(string).ToTypeString());
+            Assert.AreEqual(name, type.ToTypeString());
         }
 
         [TestCategory("TypeExtensions")]
         [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1009", Justification = "Nullable value tuple type")]
-        public void Test_TypeExtensions_GenericTypes()
+        [DataRow("int?", typeof(int?))]
+        [DataRow("System.DateTime?", typeof(DateTime?))]
+        [DataRow("(int, float)", typeof((int, float)))]
+        [DataRow("(double?, string, int)?", typeof((double?, string, int)?))]
+        [DataRow("int[]", typeof(int[]))]
+        [DataRow("int[,]", typeof(int[,]))]
+        [DataRow("System.Span<float>", typeof(Span<float>))]
+        [DataRow("System.Memory<char>", typeof(Memory<char>))]
+        [DataRow("System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>))]
+        [DataRow("System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<float>>", typeof(Dictionary<int, List<float>>))]
+        public void Test_TypeExtensions_GenericTypes(string name, Type type)
         {
-            Assert.AreEqual("int?", typeof(int?).ToTypeString());
-            Assert.AreEqual("System.DateTime?", typeof(DateTime?).ToTypeString());
-            Assert.AreEqual("(int, float)", typeof((int, float)).ToTypeString());
-            Assert.AreEqual("(double?, string, int)?", typeof((double?, string, int)?).ToTypeString());
-            Assert.AreEqual("int[]", typeof(int[]).ToTypeString());
-            Assert.AreEqual(typeof(int[,]).ToTypeString(), "int[,]");
-            Assert.AreEqual("System.Span<float>", typeof(Span<float>).ToTypeString());
-            Assert.AreEqual("System.Memory<char>", typeof(Memory<char>).ToTypeString());
-            Assert.AreEqual("System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>).ToTypeString());
-            Assert.AreEqual(typeof(Dictionary<int, List<float>>).ToTypeString(), "System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<float>>");
+            Assert.AreEqual(name, type.ToTypeString());
         }
     }
 }

From e8f98f2df6ca3ebd9a099ccefbd1fa4459250821 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 18:56:24 +0200
Subject: [PATCH 461/595] Added support for nested types

---
 .../Extensions/TypeExtensions.cs              | 122 +++++++++++++-----
 .../Extensions/Test_TypeExtensions.cs         |  81 ++++++++++++
 2 files changed, 169 insertions(+), 34 deletions(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index 3d84b9aed68..0b2ab60b4c5 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -56,7 +56,7 @@ public static class TypeExtensions
         public static string ToTypeString(this Type type)
         {
             // Local function to create the formatted string for a given type
-            static string FormatDisplayString(Type type)
+            static string FormatDisplayString(Type type, int genericTypeOffset, ReadOnlySpan<Type> typeArguments)
             {
                 // Primitive types use the keyword name
                 if (BuiltInTypesMap.TryGetValue(type, out string? typeName))
@@ -64,62 +64,114 @@ static string FormatDisplayString(Type type)
                     return typeName!;
                 }
 
-                // Generic types
-                if (
-#if NETSTANDARD1_4
-                    type.GetTypeInfo().IsGenericType &&
-#else
-                    type.IsGenericType &&
-#endif
-                    type.FullName is { } fullName &&
-                    fullName.Split('`') is { } tokens &&
-                    tokens.Length > 0 &&
-                    tokens[0] is { } genericName &&
-                    genericName.Length > 0)
+                // Array types are displayed as Foo[]
+                if (type.IsArray)
+                {
+                    var elementType = type.GetElementType()!;
+                    var rank = type.GetArrayRank();
+
+                    return $"{FormatDisplayString(elementType, 0, elementType.GetGenericArguments())}[{new string(',', rank - 1)}]";
+                }
+
+                // By checking generic types here we are only interested in specific cases,
+                // ie. nullable value types or value typles. We have a separate path for custom
+                // generic types, as we can't rely on this API in that case, as it doesn't show
+                // a difference between nested types that are themselves generic, or nested simple
+                // types from a generic declaring type. To deal with that, we need to manually track
+                // the offset within the array of generic arguments for the whole constructed type.
+                if (type.IsGenericType())
                 {
-                    var typeArguments = type.GetGenericArguments().Select(FormatDisplayString);
+                    var genericTypeDefinition = type.GetGenericTypeDefinition();
 
                     // Nullable<T> types are displayed as T?
-                    var genericType = type.GetGenericTypeDefinition();
-                    if (genericType == typeof(Nullable<>))
+                    if (genericTypeDefinition == typeof(Nullable<>))
                     {
-                        return $"{typeArguments.First()}?";
+                        var nullableArguments = type.GetGenericArguments();
+
+                        return $"{FormatDisplayString(nullableArguments[0], 0, nullableArguments)}?";
                     }
 
                     // ValueTuple<T1, T2> types are displayed as (T1, T2)
-                    if (genericType == typeof(ValueTuple<>) ||
-                        genericType == typeof(ValueTuple<,>) ||
-                        genericType == typeof(ValueTuple<,,>) ||
-                        genericType == typeof(ValueTuple<,,,>) ||
-                        genericType == typeof(ValueTuple<,,,,>) ||
-                        genericType == typeof(ValueTuple<,,,,,>) ||
-                        genericType == typeof(ValueTuple<,,,,,,>) ||
-                        genericType == typeof(ValueTuple<,,,,,,,>))
+                    if (genericTypeDefinition == typeof(ValueTuple<>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,,,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,,,,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,,,,,>) ||
+                        genericTypeDefinition == typeof(ValueTuple<,,,,,,,>))
                     {
-                        return $"({string.Join(", ", typeArguments)})";
+                        var formattedTypes = type.GetGenericArguments().Select(t => FormatDisplayString(t, 0, t.GetGenericArguments()));
+
+                        return $"({string.Join(", ", formattedTypes)})";
                     }
+                }
+
+                string displayName;
+
+                // Generic types
+                if (type.Name.Contains('`'))
+                {
+                    // Retrieve the current generic arguments for the current type (leaf or not)
+                    var tokens = type.Name.Split('`');
+                    var genericArgumentsCount = int.Parse(tokens[1]);
+                    var typeArgumentsOffset = typeArguments.Length - genericTypeOffset - genericArgumentsCount;
+                    var currentTypeArguments = typeArguments.Slice(typeArgumentsOffset, genericArgumentsCount).ToArray();
+                    var formattedTypes = currentTypeArguments.Select(t => FormatDisplayString(t, 0, t.GetGenericArguments()));
 
                     // Standard generic types are displayed as Foo<T>
-                    return $"{genericName}<{string.Join(", ", typeArguments)}>";
+                    displayName = $"{tokens[0]}<{string.Join(", ", formattedTypes)}>";
+
+                    // Track the current offset for the shared generic arguments list
+                    genericTypeOffset += genericArgumentsCount;
+                }
+                else
+                {
+                    // Simple custom types
+                    displayName = type.Name;
                 }
 
-                // Array types are displayed as Foo[]
-                if (type.IsArray)
+                // If the type is nested, recursively format the hierarchy as well
+                if (type.IsNested)
                 {
-                    var elementType = type.GetElementType();
-                    var rank = type.GetArrayRank();
+                    var openDeclaringType = type.DeclaringType!;
+                    var rootGenericArguments = typeArguments.Slice(0, typeArguments.Length - genericTypeOffset).ToArray();
+
+                    // If the declaring type is generic, we need to reconstruct the closed type
+                    // manually, as the declaring type instance doesn't retain type information.
+                    if (rootGenericArguments.Length > 0)
+                    {
+                        var closedDeclaringType = openDeclaringType.GetGenericTypeDefinition().MakeGenericType(rootGenericArguments);
+
+                        return $"{FormatDisplayString(closedDeclaringType, genericTypeOffset, typeArguments)}.{displayName}";
+                    }
 
-                    return $"{FormatDisplayString(elementType)}[{new string(',', rank - 1)}]";
+                    return $"{FormatDisplayString(openDeclaringType, genericTypeOffset, typeArguments)}.{displayName}";
                 }
 
-                return type.ToString();
+                return $"{type.Namespace}.{displayName}";
             }
 
             // Atomically get or build the display string for the current type.
             // Manually create a static lambda here to enable caching of the generated closure.
             // This is a workaround for the missing caching for method group conversions, and should
             // be removed once this issue is resolved: https://github.com/dotnet/roslyn/issues/5835.
-            return DisplayNames.GetValue(type, t => FormatDisplayString(t));
+            return DisplayNames.GetValue(type, t => FormatDisplayString(t, 0, type.GetGenericArguments()));
+        }
+
+        /// <summary>
+        /// Returns whether or not a given type is generic.
+        /// </summary>
+        /// <param name="type">The input type.</param>
+        /// <returns>Whether or not the input type is generic.</returns>
+        [Pure]
+        private static bool IsGenericType(this Type type)
+        {
+#if NETSTANDARD1_4
+            return type.GetTypeInfo().IsGenericType;
+#else
+            return type.IsGenericType;
+#endif
         }
 
 #if NETSTANDARD1_4
@@ -128,6 +180,7 @@ tokens[0] is { } genericName &&
         /// </summary>
         /// <param name="type">The input type.</param>
         /// <returns>An array of types representing the generic arguments.</returns>
+        [Pure]
         private static Type[] GetGenericArguments(this Type type)
         {
             return type.GetTypeInfo().GenericTypeParameters;
@@ -139,6 +192,7 @@ private static Type[] GetGenericArguments(this Type type)
         /// <param name="type">The input type.</param>
         /// <param name="value">The type to check against.</param>
         /// <returns><see langword="true"/> if <paramref name="type"/> is an instance of <paramref name="value"/>, <see langword="false"/> otherwise.</returns>
+        [Pure]
         internal static bool IsInstanceOfType(this Type type, object value)
         {
             return type.GetTypeInfo().IsAssignableFrom(value.GetType().GetTypeInfo());
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
index 29162c2ae4a..4fe7c9d8726 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
@@ -42,5 +42,86 @@ public void Test_TypeExtensions_GenericTypes(string name, Type type)
         {
             Assert.AreEqual(name, type.ToTypeString());
         }
+
+        [TestCategory("TypeExtensions")]
+        [TestMethod]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal", typeof(Animal))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat", typeof(Animal.Cat))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Dog", typeof(Animal.Dog))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int?>", typeof(Animal.Rabbit<int?>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<string>", typeof(Animal.Rabbit<string>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int>.Foo", typeof(Animal.Rabbit<int>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<(string, int)?>.Foo", typeof(Animal.Rabbit<(string, int)?>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int>.Foo<string>", typeof(Animal.Rabbit<int>.Foo<string>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int>.Foo<int[]>", typeof(Animal.Rabbit<int>.Foo<int[]>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<string[]>.Foo<object>", typeof(Animal.Rabbit<string[]>.Foo<object>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<(string, int)?>.Foo<(int, int?)>", typeof(Animal.Rabbit<(string, int)?>.Foo<(int, int?)>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>", typeof(Animal.Giraffe<float, DateTime>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)>", typeof(Animal.Giraffe<string, (int?, object)>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)?>.Foo", typeof(Animal.Giraffe<string, (int?, object)?>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>.Foo", typeof(Animal.Giraffe<float, DateTime>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)?>.Foo<string>", typeof(Animal.Giraffe<string, (int?, object)?>.Foo<string>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>.Foo<(float?, int)?>", typeof(Animal.Giraffe<float, DateTime>.Foo<(float?, int)?>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Vehicle<double>", typeof(Vehicle<double>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Vehicle<int?>[]", typeof(Vehicle<int?>[]))]
+        [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Vehicle<int>>", typeof(List<Vehicle<int>>))]
+        [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int?>>", typeof(List<Animal.Rabbit<int?>>))]
+        [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime[]>>", typeof(List<Animal.Giraffe<float, DateTime[]>>))]
+        public void Test_TypeExtensions_NestedTypes(string name, Type type)
+        {
+            Assert.AreEqual(name, type.ToTypeString());
+        }
+
+        private class Animal
+        {
+            public struct Cat
+            {
+            }
+
+            public struct Cat<T1>
+            {
+                public struct Bar
+                {
+                }
+
+                public struct Bar<T2>
+                {
+                }
+            }
+
+            public class Dog
+            {
+            }
+
+            public class Rabbit<T>
+            {
+                public class Foo
+                {
+                }
+
+                public class Foo<T2>
+                {
+                }
+            }
+
+            public class Giraffe<T1, T2>
+            {
+                public class Foo
+                {
+                }
+
+                public class Foo<T3>
+                {
+                }
+            }
+        }
+
+        private class Vehicle<T>
+        {
+        }
+    }
+
+    internal struct Foo<T>
+    {
     }
 }

From 15f90f376f40a932e091fb9597b8303798ec0568 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 18:57:22 +0200
Subject: [PATCH 462/595] Added support for void type

---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs               | 3 ++-
 UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index 0b2ab60b4c5..51650dcdcf0 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -39,7 +39,8 @@ public static class TypeExtensions
             [typeof(double)] = "double",
             [typeof(decimal)] = "decimal",
             [typeof(object)] = "object",
-            [typeof(string)] = "string"
+            [typeof(string)] = "string",
+            [typeof(void)] = "void"
         };
 
         /// <summary>
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
index 4fe7c9d8726..c4bf0b9354a 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
@@ -21,6 +21,7 @@ public class Test_TypeExtensions
         [DataRow("decimal", typeof(decimal))]
         [DataRow("object", typeof(object))]
         [DataRow("string", typeof(string))]
+        [DataRow("void", typeof(void))]
         public void Test_TypeExtensions_BuiltInTypes(string name, Type type)
         {
             Assert.AreEqual(name, type.ToTypeString());

From 7c090e735e98d118d8bc75d3a6f21bf54a4beb66 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 19:06:55 +0200
Subject: [PATCH 463/595] Added support for pointer and by-ref types

---
 .../Extensions/TypeExtensions.cs              | 32 +++++++++++++++---
 .../Extensions/Test_TypeExtensions.cs         | 33 +++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index 51650dcdcf0..a94e39c5046 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -154,10 +154,34 @@ static string FormatDisplayString(Type type, int genericTypeOffset, ReadOnlySpan
             }
 
             // Atomically get or build the display string for the current type.
-            // Manually create a static lambda here to enable caching of the generated closure.
-            // This is a workaround for the missing caching for method group conversions, and should
-            // be removed once this issue is resolved: https://github.com/dotnet/roslyn/issues/5835.
-            return DisplayNames.GetValue(type, t => FormatDisplayString(t, 0, type.GetGenericArguments()));
+            return DisplayNames.GetValue(type, t =>
+            {
+                // By-ref types are displayed as T&
+                if (t.IsByRef)
+                {
+                    t = t.GetElementType();
+
+                    return $"{FormatDisplayString(t, 0, type.GetGenericArguments())}&";
+                }
+
+                // Pointer types are displayed as T*
+                if (t.IsPointer)
+                {
+                    int depth = 0;
+
+                    // Calculate the pointer indirection level
+                    while (t.IsPointer)
+                    {
+                        depth++;
+                        t = t.GetElementType();
+                    }
+
+                    return $"{FormatDisplayString(t, 0, type.GetGenericArguments())}{new string('*', depth)}";
+                }
+
+                // Standard path for concrete types
+                return FormatDisplayString(t, 0, type.GetGenericArguments());
+            });
         }
 
         /// <summary>
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
index c4bf0b9354a..486cc1ad4a7 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
@@ -73,6 +73,39 @@ public void Test_TypeExtensions_NestedTypes(string name, Type type)
             Assert.AreEqual(name, type.ToTypeString());
         }
 
+#pragma warning disable SA1015 // Closing generic brackets should be spaced correctly
+        [TestCategory("TypeExtensions")]
+        [TestMethod]
+        [DataRow("void*", typeof(void*))]
+        [DataRow("int**", typeof(int**))]
+        [DataRow("byte***", typeof(byte***))]
+        [DataRow("System.Guid*", typeof(Guid*))]
+        [DataRow("UnitTests.Extensions.Foo<int>*", typeof(Foo<int>*))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat**", typeof(Animal.Cat**))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<int>*", typeof(Animal.Cat<int>*))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<float>.Bar**", typeof(Animal.Cat<float>.Bar**))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<double>.Bar<int>***", typeof(Animal.Cat<double>.Bar<int>***))]
+        public void Test_TypeExtensions_PointerTypes(string name, Type type)
+        {
+            Assert.AreEqual(name, type.ToTypeString());
+        }
+#pragma warning restore SA1015
+
+        [TestCategory("TypeExtensions")]
+        [TestMethod]
+        [DataRow("int&", typeof(int))]
+        [DataRow("byte&", typeof(byte))]
+        [DataRow("System.Guid&", typeof(Guid))]
+        [DataRow("UnitTests.Extensions.Foo<int>&", typeof(Foo<int>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat&", typeof(Animal.Cat))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<int>&", typeof(Animal.Cat<int>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<float>.Bar&", typeof(Animal.Cat<float>.Bar))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Cat<double>.Bar<int>&", typeof(Animal.Cat<double>.Bar<int>))]
+        public void Test_TypeExtensions_RefTypes(string name, Type type)
+        {
+            Assert.AreEqual(name, type.MakeByRefType().ToTypeString());
+        }
+
         private class Animal
         {
             public struct Cat

From 9e045fa89826017c45fec7124868a1e01c723ec4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 19:09:30 +0200
Subject: [PATCH 464/595] Fixed unwanted capture in lambda expression

---
 Microsoft.Toolkit/Extensions/TypeExtensions.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit/Extensions/TypeExtensions.cs b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
index a94e39c5046..ddbdc934cd4 100644
--- a/Microsoft.Toolkit/Extensions/TypeExtensions.cs
+++ b/Microsoft.Toolkit/Extensions/TypeExtensions.cs
@@ -159,9 +159,9 @@ static string FormatDisplayString(Type type, int genericTypeOffset, ReadOnlySpan
                 // By-ref types are displayed as T&
                 if (t.IsByRef)
                 {
-                    t = t.GetElementType();
+                    t = t.GetElementType()!;
 
-                    return $"{FormatDisplayString(t, 0, type.GetGenericArguments())}&";
+                    return $"{FormatDisplayString(t, 0, t.GetGenericArguments())}&";
                 }
 
                 // Pointer types are displayed as T*
@@ -173,14 +173,14 @@ static string FormatDisplayString(Type type, int genericTypeOffset, ReadOnlySpan
                     while (t.IsPointer)
                     {
                         depth++;
-                        t = t.GetElementType();
+                        t = t.GetElementType()!;
                     }
 
-                    return $"{FormatDisplayString(t, 0, type.GetGenericArguments())}{new string('*', depth)}";
+                    return $"{FormatDisplayString(t, 0, t.GetGenericArguments())}{new string('*', depth)}";
                 }
 
                 // Standard path for concrete types
-                return FormatDisplayString(t, 0, type.GetGenericArguments());
+                return FormatDisplayString(t, 0, t.GetGenericArguments());
             });
         }
 

From 94d6e6fed7274a4f58c0dd56ca9bb6b6451799f5 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 8 Sep 2020 14:06:20 -0700
Subject: [PATCH 465/595] Fix Unit Test for Localization in Release Mode

Also fixed a missed rename from a Debug/Release #ifdef
---
 .../Models/Sample.cs                          |  2 +-
 .../Controls/Test_TextToolbar_Localization.cs | 41 +++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 9e21f19f9ba..46e8fb953dc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -329,7 +329,7 @@ async Task<Stream> CopyStream(HttpContent source)
                             // Takes a second copy of the image stream, so that is can save the image data to cache.
                             using (var saveStream = await CopyStream(response.Content))
                             {
-                                await SaveImageToCache(localpath, saveStream);
+                                await SaveImageToCache(localPath, saveStream);
                             }
 #endif
                         }
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
index 1a3a3e426d7..4f741f78474 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.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 Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common;
 using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText;
@@ -9,7 +10,10 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 using System.Linq;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.Core;
 using Windows.Globalization;
+using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
@@ -69,26 +73,37 @@ public void Test_Override()
         /// <summary>
         /// Tests the ability to have different overrides in different languages.
         /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         [TestCategory("Test_TextToolbar_Localization")]
-        [UITestMethod]
-        public void Test_Override_Fr()
+        [TestMethod]
+        public async Task Test_Override_Fr()
         {
-            // Just double-check we've got the right environment setup in our tests.
-            CollectionAssert.AreEquivalent(new string[] { "en-US", "fr" }, ApplicationLanguages.ManifestLanguages.ToArray(), "Missing locales for test");
+            await CoreApplication.MainView.DispatcherQueue.ExecuteOnUIThreadAsync(async () =>
+            {
+                // Just double-check we've got the right environment setup in our tests.
+                CollectionAssert.AreEquivalent(new string[] { "en-US", "fr" }, ApplicationLanguages.ManifestLanguages.ToArray(), "Missing locales for test");
 
-            // Override the default language for this test only (we'll set it back after).
-            var defaultLanguage = ApplicationLanguages.PrimaryLanguageOverride;
-            ApplicationLanguages.PrimaryLanguageOverride = "fr";
+                // Override the default language for this test only (we'll set it back after).
+                var defaultLanguage = ApplicationLanguages.PrimaryLanguageOverride;
+                ApplicationLanguages.PrimaryLanguageOverride = "fr";
 
-            var commonButtons = new CommonButtons(new TextToolbar());
-            var italicsButton = commonButtons.Italics;
+                // Need to add a delay for release mode as otherwise the language switch doesn't kickover quick enough
+                // This should be sufficient as we're just using this as a test-harness.
+                await Task.Delay(3000);
 
-            ApplicationLanguages.PrimaryLanguageOverride = defaultLanguage;
+                var commonButtons = new CommonButtons(new TextToolbar());
+                var italicsButton = commonButtons.Italics;
 
-            // Check for expected values.
-            Assert.IsNotNull(italicsButton, "Italics Button not found.");
+                // Note: When running locally if the test somehow fails before the default is reset, then
+                // the tests will be in a bad state as PrimaryLanguageOverride is persisted.
+                // To fix this, uninstall the UnitTests UWP app and run the tests again.
+                ApplicationLanguages.PrimaryLanguageOverride = defaultLanguage;
+
+                // Check for expected values.
+                Assert.IsNotNull(italicsButton, "Italics Button not found.");
 
-            Assert.AreEqual("ItalicsFr", italicsButton.ToolTip, "Label doesn't match expected default value.");
+                Assert.AreEqual("ItalicsFr", italicsButton.ToolTip, "Label doesn't match expected default value.");
+            });
         }
     }
 }

From 96e8e48381158531f725721e9740e0b858a361d7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 8 Sep 2020 23:44:07 +0200
Subject: [PATCH 466/595] Improved phrasing of LFU cache mode

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 988e1f44a94..79322cb2f8f 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Toolkit.HighPerformance.Buffers
     /// The <see cref="GetOrAdd(ReadOnlySpan{char})"/> method provides a best-effort alternative to just creating
     /// a new <see cref="string"/> instance every time, in order to minimize the number of duplicated instances.
     /// The <see cref="StringPool"/> type will internally manage a highly efficient priority queue for the
-    /// cached <see cref="string"/> instances, so that when the full capacity is reached, the last recently
+    /// cached <see cref="string"/> instances, so that when the full capacity is reached, the least frequently
     /// used values will be automatically discarded to leave room for new values to cache.
     /// </summary>
     public sealed class StringPool

From e74eb65ee2fbe676549307c44fa6ec32c6feec0d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 9 Sep 2020 00:21:16 +0200
Subject: [PATCH 467/595] Added llamas
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🦙
---
 .../Extensions/Test_TypeExtensions.cs            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
index 486cc1ad4a7..00fa6df6a8a 100644
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
@@ -57,17 +57,17 @@ public void Test_TypeExtensions_GenericTypes(string name, Type type)
         [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int>.Foo<int[]>", typeof(Animal.Rabbit<int>.Foo<int[]>))]
         [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<string[]>.Foo<object>", typeof(Animal.Rabbit<string[]>.Foo<object>))]
         [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<(string, int)?>.Foo<(int, int?)>", typeof(Animal.Rabbit<(string, int)?>.Foo<(int, int?)>))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>", typeof(Animal.Giraffe<float, DateTime>))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)>", typeof(Animal.Giraffe<string, (int?, object)>))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)?>.Foo", typeof(Animal.Giraffe<string, (int?, object)?>.Foo))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>.Foo", typeof(Animal.Giraffe<float, DateTime>.Foo))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<string, (int?, object)?>.Foo<string>", typeof(Animal.Giraffe<string, (int?, object)?>.Foo<string>))]
-        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime>.Foo<(float?, int)?>", typeof(Animal.Giraffe<float, DateTime>.Foo<(float?, int)?>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<float, System.DateTime>", typeof(Animal.Llama<float, DateTime>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<string, (int?, object)>", typeof(Animal.Llama<string, (int?, object)>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<string, (int?, object)?>.Foo", typeof(Animal.Llama<string, (int?, object)?>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<float, System.DateTime>.Foo", typeof(Animal.Llama<float, DateTime>.Foo))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<string, (int?, object)?>.Foo<string>", typeof(Animal.Llama<string, (int?, object)?>.Foo<string>))]
+        [DataRow("UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<float, System.DateTime>.Foo<(float?, int)?>", typeof(Animal.Llama<float, DateTime>.Foo<(float?, int)?>))]
         [DataRow("UnitTests.Extensions.Test_TypeExtensions.Vehicle<double>", typeof(Vehicle<double>))]
         [DataRow("UnitTests.Extensions.Test_TypeExtensions.Vehicle<int?>[]", typeof(Vehicle<int?>[]))]
         [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Vehicle<int>>", typeof(List<Vehicle<int>>))]
         [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Animal.Rabbit<int?>>", typeof(List<Animal.Rabbit<int?>>))]
-        [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Animal.Giraffe<float, System.DateTime[]>>", typeof(List<Animal.Giraffe<float, DateTime[]>>))]
+        [DataRow("System.Collections.Generic.List<UnitTests.Extensions.Test_TypeExtensions.Animal.Llama<float, System.DateTime[]>>", typeof(List<Animal.Llama<float, DateTime[]>>))]
         public void Test_TypeExtensions_NestedTypes(string name, Type type)
         {
             Assert.AreEqual(name, type.ToTypeString());
@@ -138,7 +138,7 @@ public class Foo<T2>
                 }
             }
 
-            public class Giraffe<T1, T2>
+            public class Llama<T1, T2>
             {
                 public class Foo
                 {

From 5c59d87e0f84da95ad10decd5a34251e49e4c855 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 8 Sep 2020 15:56:21 -0700
Subject: [PATCH 468/595] Test Localization Changes on XAML Islands

---
 .../Controls/Test_TextToolbar_Localization.cs |  6 +-
 .../FakeTestClasses/Assert.cs                 | 26 ++++-
 .../Strings/en-us/Resources.resw              |  3 +
 .../UnitTests.XamlIslands.UWPApp.csproj       |  5 +
 .../XamlIslandsTest_StringExtensions.cs       | 97 +++++++++++++++++++
 5 files changed, 132 insertions(+), 5 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
index 4f741f78474..e4acdf40096 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
@@ -27,7 +27,7 @@ public class Test_TextToolbar_Localization
         /// </summary>
         [TestCategory("Test_TextToolbar_Localization")]
         [UITestMethod]
-        public void Test_Retrieve()
+        public void Test_TextToolbar_Localization_Retrieve()
         {
             var treeRoot = XamlReader.Load(
 @"<Page
@@ -60,7 +60,7 @@ public void Test_Retrieve()
         /// </summary>
         [TestCategory("Test_TextToolbar_Localization")]
         [UITestMethod]
-        public void Test_Override()
+        public void Test_TextToolbar_Localization_Override()
         {
             var commonButtons = new CommonButtons(new TextToolbar());
             var italicsButton = commonButtons.Italics;
@@ -76,7 +76,7 @@ public void Test_Override()
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         [TestCategory("Test_TextToolbar_Localization")]
         [TestMethod]
-        public async Task Test_Override_Fr()
+        public async Task Test_TextToolbar_Localization_Override_Fr()
         {
             await CoreApplication.MainView.DispatcherQueue.ExecuteOnUIThreadAsync(async () =>
             {
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
index c192ef9bfdc..12734c569e6 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
@@ -3,16 +3,38 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Linq;
+using Windows.UI.Xaml;
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
     public static class Assert
     {
-        internal static void AreEqual(object expected, object actual)
+        internal static void AreEqual(object expected, object actual, string message = "")
         {
             if (!expected.Equals(actual))
             {
-                throw new Exception($"Assert.AreEqual failed. Expected:<{expected}>. Actual:<{actual}>.");
+                throw new Exception($"Assert.AreEqual failed. Expected:<{expected}>. Actual:<{actual}>. {message}");
+            }
+        }
+
+        internal static void IsNotNull(object actual, string message = "")
+        {
+            if (actual == null)
+            {
+                throw new Exception($"Assert.IsNotNull failed. Expected:<value>. Actual:<null>. {message}");
+            }
+        }
+    }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Internal Types used to mimic unit test framework.")]
+    public static class CollectionAssert
+    {
+        internal static void AreEquivalent<T>(T[] expected, T[] actual, string message = "")
+        {
+            if (expected.Length != actual.Length || expected.Intersect(actual).Count() != actual.Length)
+            {
+                throw new Exception($"CollectionAssert.AreEquivalent failed. Expected:<{expected.Length}>. Actual:<{actual.Length}>. {message}"); // TODO: Not sure what the actual message displays here...
             }
         }
     }
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
index 291d768851a..af9ee372ebc 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
@@ -120,4 +120,7 @@
   <data name="abc" xml:space="preserve">
     <value>ABCDEF</value>
   </data>
+  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+    <value>ItalicsOverride</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 5d4f2ab6393..8b08d562ea9 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -204,6 +204,11 @@
   <ItemGroup>
     <PRIResource Include="Strings\en-us\Resources.resw" />
   </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="..\UnitTests.UWP\Strings\fr\Resources.resw">
+      <Link>Strings\fr\Resources.resw</Link>
+    </PRIResource>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
index fb59c2ca320..f63729c29d8 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -2,10 +2,17 @@
 // 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.Linq;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Windows.Globalization;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Markup;
 
 namespace UnitTests.XamlIslands.UWPApp
 {
@@ -40,5 +47,95 @@ public void StringExtensions_GetLocalizedWithResourcePath()
             var str = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
             Assert.AreEqual("Ok", str);
         }
+
+        /// <summary>
+        /// Tests the general ability to look-up a resource from the UI control as a base-case.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [TestMethod]
+        public async Task Test_TextToolbar_Localization_Retrieve()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            {
+                var treeRoot = XamlReader.Load(
+@"<Page
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+
+    <controls:TextToolbar x:Name=""TextToolbarControl"">
+    </controls:TextToolbar>
+
+</Page>") as FrameworkElement;
+
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+
+                var toolbar = treeRoot.FindChildByName("TextToolbarControl") as TextToolbar;
+
+                Assert.IsNotNull(toolbar, "Could not find TextToolbar in tree.");
+
+                var commonButtons = new CommonButtons(toolbar);
+                var boldButton = commonButtons.Bold;
+
+                Assert.IsNotNull(boldButton, "Bold Button not found.");
+
+                Assert.AreEqual("Bold", boldButton.ToolTip, "Label doesn't match expected default value.");
+            });
+        }
+
+        /// <summary>
+        /// Tests the ability to override the resource lookup for a toolkit component in the app resource dictionary.
+        /// See Link:Strings/en-us/Resources.resw
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [TestMethod]
+        public async Task Test_TextToolbar_Localization_Override()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            {
+                var commonButtons = new CommonButtons(new TextToolbar());
+                var italicsButton = commonButtons.Italics;
+
+                Assert.IsNotNull(italicsButton, "Italics Button not found.");
+
+                Assert.AreEqual("ItalicsOverride", italicsButton.ToolTip, "Label doesn't match expected default value.");
+            });
+        }
+
+        /// <summary>
+        /// Tests the ability to have different overrides in different languages.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        [TestMethod]
+        public async Task Test_TextToolbar_Localization_Override_Fr()
+        {
+            await App.Dispatcher.ExecuteOnUIThreadAsync(async () =>
+            {
+                // Just double-check we've got the right environment setup in our tests.
+                //// Note: This seems to fail on XAML Islands, but the rest of the test works fine...?
+                ////CollectionAssert.AreEquivalent(new string[] { "en-US", "fr" }, ApplicationLanguages.ManifestLanguages.ToArray(), "Missing locales for test");
+
+                // Override the default language for this test only (we'll set it back after).
+                var defaultLanguage = ApplicationLanguages.PrimaryLanguageOverride;
+                ApplicationLanguages.PrimaryLanguageOverride = "fr";
+
+                // Need to add a delay for release mode as otherwise the language switch doesn't kickover quick enough
+                // This should be sufficient as we're just using this as a test-harness.
+                await Task.Delay(3000);
+
+                var commonButtons = new CommonButtons(new TextToolbar());
+                var italicsButton = commonButtons.Italics;
+
+                // Note: When running locally if the test somehow fails before the default is reset, then
+                // the tests will be in a bad state as PrimaryLanguageOverride is persisted.
+                // To fix this, uninstall the UnitTests UWP app and run the tests again.
+                ApplicationLanguages.PrimaryLanguageOverride = defaultLanguage;
+
+                // Check for expected values.
+                Assert.IsNotNull(italicsButton, "Italics Button not found.");
+
+                Assert.AreEqual("ItalicsFr", italicsButton.ToolTip, "Label doesn't match expected default value.");
+            });
+        }
     }
 }
\ No newline at end of file

From 4b6baa01936eca9c8461de3655fd52d0004f4a28 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 9 Sep 2020 01:30:09 +0200
Subject: [PATCH 469/595] Updated external reference in XML docs

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

diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
index eabce3cbd90..47094ce5686 100644
--- a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
+++ b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
@@ -112,7 +112,7 @@ public static bool HasLookupFlag(uint table, int x, int min = 0)
         /// <returns>Whether <paramref name="value"/> has any bytes set to 0.</returns>
         /// <remarks>
         /// This method contains no branches.
-        /// For more info, see <see href="https://graphics.stanford.edu/~seander/bithacks.html"/>.
+        /// For more background on this subject, see <see href="https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord"/>.
         /// </remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -142,7 +142,7 @@ public static bool HasZeroByte(ulong value)
         /// <returns>Whether <paramref name="value"/> has any bytes set to <paramref name="target"/>.</returns>
         /// <remarks>
         /// This method contains no branches.
-        /// For more info, see <see href="https://graphics.stanford.edu/~seander/bithacks.html"/>.
+        /// For more info, see <see href="https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord"/>.
         /// </remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

From 45e1329012ed9a5b52d5c3d4608f02d3ac0b5ce6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 9 Sep 2020 13:30:36 +0200
Subject: [PATCH 470/595] Added XML docs about FixedSizePriorityMap

---
 Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 79322cb2f8f..757b9b5fdb5 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -311,6 +311,15 @@ public void Reset()
         /// <summary>
         /// A configurable map containing a group of cached <see cref="string"/> instances.
         /// </summary>
+        /// <remarks>
+        /// Instances of this type are stored in an array within <see cref="StringPool"/> and they are
+        /// always accessed by reference - essentially as if this type had been a class. The type is
+        /// also private, so there's no risk for users to directly access it and accidentally copy an
+        /// instance, which would lead to bugs due to values becoming out of sync with the internal state
+        /// (that is, because instances would be copied by value, so primitive fields would not be shared).
+        /// The reason why we're using a struct here is to remove an indirection level and improve cache
+        /// locality when accessing individual buckets from the methods in the <see cref="StringPool"/> type.
+        /// </remarks>
         private struct FixedSizePriorityMap
         {
             /// <summary>

From 84b22bb264c2d778683ff067ac9fff4c55f64ccc Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 9 Sep 2020 14:14:12 -0700
Subject: [PATCH 471/595] Update
 UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs

---
 UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
index 12734c569e6..fca5bc08d60 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Linq;
-using Windows.UI.Xaml;
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {

From 60ceab58d38630f7bac11181cca5b0d462c28987 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 9 Sep 2020 17:46:10 -0700
Subject: [PATCH 472/595] Updated test app package name.

---
 UITests/UITests.Tests.Shared/Tests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 5531a81c448..08e23025f6e 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -49,7 +49,7 @@ public static TestApplicationInfo WinUICsUWPSampleApp
                 }
 
                 return new TestApplicationInfo(
-                    "3568ebdf-5b6b-4ddd-bb17-462d614ba50f",
+                    "UITests.App",
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
                     "UITests.App",

From 25f0c9fa4af1d6b47a10494f3e969aa285eeab26 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 10 Sep 2020 09:23:35 -0700
Subject: [PATCH 473/595] Move About.txt info to the ThirdPartyNotice file
 instead.

---
 Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt | 7 -------
 ThirdPartyNotices.txt                                | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt
deleted file mode 100644
index e622ac23939..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/About.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-This project began as an independent open source project called Universal Markdown. It was originally created by Quinn Damerell
-and Paul Bartrum for use in Baconit, an open source reddit UWP app.
-
-The goal of this project was to make a universal markdown renderer control that's easy to use but is also very efficient. This 
-control is intended to be used in virtualized lists, so the performance needs to be great. Thanks to a lot of hard work from Paul,
-the control supports the full markdown syntax and is very performant.
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a076d882249..359e4249972 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -9,6 +9,7 @@ This project incorporates components from the projects listed below. The origina
 2.	MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
 3.	lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from.
 4.  PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.
+5.  QuinnDamerell/UniversalMarkdown (https://github.com/QuinnDamerell/UniversalMarkdown) contributed by Quinn Damerell and Paul Bartrum for the MarkdownTextBlock control, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/772.
 
 %% PedroLamas/DeferredEvents NOTICES AND INFORMATION BEGIN HERE
 =========================================

From 93456ae0b72dbf51eda4ebe2b3380062af019ddd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 10 Sep 2020 19:33:14 +0200
Subject: [PATCH 474/595] Added tests for correct recipients

---
 .../Mvvm/Test_Messenger.Request.cs            | 33 ++++++++++++++++---
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 12 ++++++-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index e47855a3c0f..9a4329e06d3 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -19,9 +19,12 @@ public void Test_Messenger_RequestMessage_Ok()
         {
             var messenger = new Messenger();
             var recipient = new object();
+            object test = null;
 
             void Receive(object recipient, NumberRequestMessage m)
             {
+                test = recipient;
+
                 Assert.IsFalse(m.HasReceivedResponse);
 
                 m.Reply(42);
@@ -33,6 +36,7 @@ void Receive(object recipient, NumberRequestMessage m)
 
             int result = messenger.Send<NumberRequestMessage>();
 
+            Assert.AreSame(test, recipient);
             Assert.AreEqual(result, 42);
         }
 
@@ -181,11 +185,28 @@ public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies()
             object
                 recipient1 = new object(),
                 recipient2 = new object(),
-                recipient3 = new object();
+                recipient3 = new object(),
+                r1 = null,
+                r2 = null,
+                r3 = null;
 
-            void Receive1(object recipient, NumbersCollectionRequestMessage m) => m.Reply(1);
-            void Receive2(object recipient, NumbersCollectionRequestMessage m) => m.Reply(2);
-            void Receive3(object recipient, NumbersCollectionRequestMessage m) => m.Reply(3);
+            void Receive1(object recipient, NumbersCollectionRequestMessage m)
+            {
+                r1 = recipient;
+                m.Reply(1);
+            }
+
+            void Receive2(object recipient, NumbersCollectionRequestMessage m)
+            {
+                r2 = recipient;
+                m.Reply(2);
+            }
+
+            void Receive3(object recipient, NumbersCollectionRequestMessage m)
+            {
+                r3 = recipient;
+                m.Reply(3);
+            }
 
             messenger.Register<NumbersCollectionRequestMessage>(recipient1, Receive1);
             messenger.Register<NumbersCollectionRequestMessage>(recipient2, Receive2);
@@ -198,6 +219,10 @@ public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies()
                 responses.Add(response);
             }
 
+            Assert.AreSame(r1, recipient1);
+            Assert.AreSame(r2, recipient2);
+            Assert.AreSame(r3, recipient3);
+
             CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3 });
         }
 
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 41b073e3f81..9e83f85ab4b 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -115,22 +115,32 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
 
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
+            object recipient = null;
             string result = null;
-            Messenger.Default.Register<MessageA>(a, (r, m) => result = m.Text);
+
+            Messenger.Default.Register<MessageA>(a, (r, m) =>
+            {
+                recipient = r;
+                result = m.Text;
+            });
 
             Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
 
             Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
+            Assert.AreSame(recipient, a);
             Assert.AreEqual(result, nameof(MessageA));
 
             Messenger.Default.Unregister<MessageA>(a);
 
             Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
 
+            recipient = null;
             result = null;
+
             Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
 
+            Assert.IsNull(recipient);
             Assert.IsNull(result);
         }
 

From 05c7d48dd3c21bf75cb7e623f52826a45ed76d70 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 10 Sep 2020 12:59:59 -0700
Subject: [PATCH 475/595] Added headers.

---
 UITests/UITests.App/App.xaml.cs                | 6 +++++-
 UITests/UITests.App/MainPage.xaml.cs           | 6 +++++-
 UITests/UITests.App/Properties/AssemblyInfo.cs | 6 +++++-
 UITests/UITests.Tests.MSTest/MSTestInterop.cs  | 6 +++++-
 UITests/UITests.Tests.Shared/TestAssembly.cs   | 6 +++++-
 UITests/UITests.Tests.Shared/Tests.cs          | 6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/UITests/UITests.App/App.xaml.cs b/UITests/UITests.App/App.xaml.cs
index 122c982d299..23f5035b6d5 100644
--- a/UITests/UITests.App/App.xaml.cs
+++ b/UITests/UITests.App/App.xaml.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 Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI.Xaml;
diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
index 6fdbe7037a1..b44c1291f46 100644
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -1,4 +1,8 @@
-namespace UITests.App
+// 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 UITests.App
 {
     public sealed partial class MainPage
     {
diff --git a/UITests/UITests.App/Properties/AssemblyInfo.cs b/UITests/UITests.App/Properties/AssemblyInfo.cs
index bce71eb399d..37fb4eb8906 100644
--- a/UITests/UITests.App/Properties/AssemblyInfo.cs
+++ b/UITests/UITests.App/Properties/AssemblyInfo.cs
@@ -1,4 +1,8 @@
-using System.Reflection;
+// 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.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/UITests/UITests.Tests.MSTest/MSTestInterop.cs b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
index d09124f8478..dc1740ba15e 100644
--- a/UITests/UITests.Tests.MSTest/MSTestInterop.cs
+++ b/UITests/UITests.Tests.MSTest/MSTestInterop.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 Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index b0d9a3a5333..9a4fe7bc31b 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -1,4 +1,8 @@
-#if USING_TAEF
+// 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.
+
+#if USING_TAEF
 using WEX.TestExecution.Markup;
 #else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 08e23025f6e..d2a627fd650 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.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.IO;
 using System.Linq;
 using System.Reflection;

From 4b977759be14082e808c7b4c5664cfaa96066170 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 10 Sep 2020 14:32:34 -0700
Subject: [PATCH 476/595] Added correct Nuget package source.

---
 nuget.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuget.config b/nuget.config
index e7c966d12cc..b4b25a69292 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,6 +3,6 @@
 	<packageSources>
 		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 		<add key="MyGet" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" protocolVersion="3" />
-    <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/index.json" />
+    <add key="MUX-Shared" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Shared/nuget/v3/index.json" />
   </packageSources>
 </configuration>
\ No newline at end of file

From 77ed6e8bfdd9e129d2dfb350cbe8e0f673be0c08 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 11 Sep 2020 17:38:21 +0200
Subject: [PATCH 477/595] Removed unnecessary List<T> allocation

---
 .../ComponentModel/ObservableValidator.cs     | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 1bfbc4d3549..a634d43c280 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -86,24 +86,32 @@ protected bool ValidateProperty(object? value, [CallerMemberName] string? proper
                 ThrowArgumentNullExceptionForNullPropertyName();
             }
 
+            // Check if the property had already been previously validated, and if so retrieve
+            // the reusable list of validation errors from the errors dictionary. This list is
+            // used to add new validation errors below, if any are produced by the validator.
+            // If the property isn't present in the dictionary, add it now to avoid allocations.
+            if (!this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors))
+            {
+                propertyErrors = new List<ValidationResult>();
+
+                this.errors.Add(propertyName!, propertyErrors);
+            }
+
             bool errorsChanged = false;
 
             // Clear the errors for the specified property, if any
-            if (this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors) &&
-                propertyErrors.Count > 0)
+            if (propertyErrors.Count > 0)
             {
                 propertyErrors.Clear();
 
                 errorsChanged = true;
             }
 
-            List<ValidationResult> results = new List<ValidationResult>();
-
-            // Validate the property
+            // Validate the property, by adding new errors to the existing list
             bool isValid = Validator.TryValidateProperty(
                 value,
                 new ValidationContext(this, null, null) { MemberName = propertyName },
-                results);
+                propertyErrors);
 
             // Update the state and/or the errors for the property
             if (isValid)
@@ -120,20 +128,6 @@ protected bool ValidateProperty(object? value, [CallerMemberName] string? proper
                     this.totalErrors++;
                 }
 
-                // We can avoid the repeated dictionary lookup if we just check the result of the previous
-                // one here. If the retrieved errors collection is null, we can log the ones produced by
-                // the validation we just performed. We also don't need to create a new list and add them
-                // to that, as we can directly set the resulting list as value in the mapping. If the
-                // property already had some other logged errors instead, we can add the new ones as a range.
-                if (propertyErrors is null)
-                {
-                    this.errors.Add(propertyName!, results);
-                }
-                else
-                {
-                    propertyErrors.AddRange(results);
-                }
-
                 errorsChanged = true;
             }
 

From 4a5402cbcb902b98bbf0c71d777cabd079a5ce7a Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 10 Sep 2020 16:52:54 -0700
Subject: [PATCH 478/595] Added UITests to build pipeline

---
 .gitignore                                    |  5 ++-
 UITests/UITests.App/UITests.App.csproj        |  4 ++-
 .../UITests.Tests.MSTest.csproj               |  2 +-
 .../UITests.Tests.TAEF.csproj                 |  2 +-
 Windows Community Toolkit.sln                 | 25 +++------------
 azure-pipelines.yml                           |  7 ++++
 build/build.cake                              | 32 +++++++++++++------
 7 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e9d1eddb81..ff0d29ff653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -227,4 +227,7 @@ msbuild.binlog
 !/build/tools/packages.config
 
 # Generated file from .ttinclude
-**/Generated/TypeInfo.g.cs
\ No newline at end of file
+**/Generated/TypeInfo.g.cs
+
+# TAEF Log output
+WexLogFileOutput
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 985e9a95b55..4f72f9f1867 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -28,6 +28,8 @@
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
+  <Target Name="Pack">
+  </Target>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
@@ -163,7 +165,7 @@
       <Version>6.2.10</Version>
     </PackageReference>
     <PackageReference Include="MUXAppTestHelpers">
-      <Version>0.0.2</Version>
+      <Version>0.0.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index c26ed1a8861..8ead9dfb768 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.2" />
+    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index f1b5a545547..a6fc3f6dfae 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.2" />
+    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.3" />
     <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
     <PackageReference Include="runtime.win-x86.microsoft.netcore.app" Version="2.1.0" GeneratePathProperty="true" />
   </ItemGroup>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index cf34fb27261..3b52ddba802 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -139,6 +139,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.MSTest", "UIT
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITests\UITests.Tests.TAEF\UITests.Tests.TAEF.csproj", "{C8182EF0-77FB-4B43-A588-C71748A309C7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}
+	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}"
 EndProject
@@ -787,7 +790,6 @@ Global
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.ActiveCfg = Debug|Win32
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.Build.0 = Debug|Win32
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|Any CPU.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|Any CPU.Build.0 = Release|Win32
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.ActiveCfg = Release|ARM
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.Build.0 = Release|ARM
 		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM64.ActiveCfg = Release|ARM64
@@ -1157,21 +1159,12 @@ Global
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.ActiveCfg = Release|x64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.Build.0 = Release|x64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.Deploy.0 = Release|x64
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.ActiveCfg = Release|ARM
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.Build.0 = Release|ARM
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.Deploy.0 = Release|ARM
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.ActiveCfg = Release|ARM64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.Build.0 = Release|ARM64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.Deploy.0 = Release|ARM64
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.ActiveCfg = Release|x64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.Build.0 = Release|x64
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.Deploy.0 = Release|x64
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.ActiveCfg = Release|x86
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.Build.0 = Release|x86
-		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.Deploy.0 = Release|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM
@@ -1195,15 +1188,10 @@ Global
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.ActiveCfg = Debug|Any CPU
-		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.ActiveCfg = Debug|Any CPU
-		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.Build.0 = Debug|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -1225,15 +1213,10 @@ Global
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.ActiveCfg = Debug|Any CPU
-		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.ActiveCfg = Debug|Any CPU
-		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.Build.0 = Debug|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM.ActiveCfg = Release|Any CPU
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76470fb759b..a80e5b04721 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,6 +54,13 @@ steps:
   displayName: Publish Test Results
   condition: succeededOrFailed()
 
+- task: PublishPipelineArtifact@1
+  displayName: Publish Test WexLogFileOutput
+  inputs:
+    targetPath: .\build\WexLogFileOutput
+    artifactName: WexLogFileOutput
+  condition: succeededOrFailed()
+
 - task: PowerShell@2
   displayName: Authenticode Sign Packages
   inputs:
diff --git a/build/build.cake b/build/build.cake
index 51d5ed13ee7..9167a6a262f 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -35,6 +35,8 @@ var toolsDir = buildDir + "/tools";
 var binDir = baseDir + "/bin";
 var nupkgDir = binDir + "/nupkg";
 
+var taefBinDir = baseDir + "/UITests/UITests.Tests.TAEF/bin/Release/netcoreapp2.1";
+
 var styler = toolsDir + "/XamlStyler.Console/tools/xstyler.exe";
 var stylerFile = baseDir + "/settings.xamlstyler";
 
@@ -277,21 +279,23 @@ Task("Test")
 	.Description("Runs all Tests")
     .Does(() =>
 {
-	var vswhere = VSWhereLatest(new VSWhereLatestSettings
-	{
-		IncludePrerelease = false
-	});
+    Information("\nRunning Unit Tests");
+    var vswhere = VSWhereLatest(new VSWhereLatestSettings
+    {
+        IncludePrerelease = false
+    });
 
-	var testSettings = new VSTestSettings
-	{
-	    ToolPath = vswhere + "/Common7/IDE/CommonExtensions/Microsoft/TestWindow/vstest.console.exe",
-		TestAdapterPath = getMSTestAdapterPath(),
+    var testSettings = new VSTestSettings
+    {
+        ToolPath = vswhere + "/Common7/IDE/CommonExtensions/Microsoft/TestWindow/vstest.console.exe",
+        TestAdapterPath = getMSTestAdapterPath(),
         ArgumentCustomization = arg => arg.Append("/logger:trx;LogFileName=VsTestResultsUwp.trx /framework:FrameworkUap10"),
-	};
+    };
 
-	VSTest(baseDir + "/**/Release/**/UnitTests.*.appxrecipe", testSettings);
+    VSTest(baseDir + "/**/Release/**/UnitTests.*.appxrecipe", testSettings);
 }).DoesForEach(GetFiles(baseDir + "/**/UnitTests.*.NetCore.csproj"), (file) => 
 {
+    Information("\nRunning NetCore Unit Tests");
     var testSettings = new DotNetCoreTestSettings
 	{
 		Configuration = "Release",
@@ -301,6 +305,14 @@ Task("Test")
 		ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"),
 	};
     DotNetCoreTest(file.FullPath, testSettings);
+}).Does(() =>
+{
+    Information("\nRunning TAEF Interaction Tests");
+    var result = StartProcess(taefBinDir + "/TE.exe", taefBinDir + "/UITests.Tests.TAEF.dll /screenCaptureOnError");
+    if (result != 0)
+    {
+        throw new InvalidOperationException("TAEF Tests failed!");
+    }
 }).DeferOnError();
 
 

From 363a3cf25a4f01e6ebd927912b0bf83d436d55fd Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 11 Sep 2020 11:53:43 -0700
Subject: [PATCH 479/595] Switched from TAEF to MSTest for UI Tests

---
 azure-pipelines.yml |  7 -------
 build/build.cake    | 30 +++++++++++++++++-------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a80e5b04721..76470fb759b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,13 +54,6 @@ steps:
   displayName: Publish Test Results
   condition: succeededOrFailed()
 
-- task: PublishPipelineArtifact@1
-  displayName: Publish Test WexLogFileOutput
-  inputs:
-    targetPath: .\build\WexLogFileOutput
-    artifactName: WexLogFileOutput
-  condition: succeededOrFailed()
-
 - task: PowerShell@2
   displayName: Authenticode Sign Packages
   inputs:
diff --git a/build/build.cake b/build/build.cake
index 9167a6a262f..0155ea4516b 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -297,22 +297,26 @@ Task("Test")
 {
     Information("\nRunning NetCore Unit Tests");
     var testSettings = new DotNetCoreTestSettings
-	{
-		Configuration = "Release",
-		NoBuild = true,
-		Logger = "trx;LogFilePrefix=VsTestResults",
-		Verbosity = DotNetCoreVerbosity.Normal,
-		ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"),
-	};
+    {
+        Configuration = "Release",
+        NoBuild = true,
+        Logger = "trx;LogFilePrefix=VsTestResults",
+        Verbosity = DotNetCoreVerbosity.Normal,
+        ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"),
+    };
     DotNetCoreTest(file.FullPath, testSettings);
-}).Does(() =>
+}).DoesForEach(GetFiles(baseDir + "/**/UITests.*.MSTest.csproj"), (file) => 
 {
-    Information("\nRunning TAEF Interaction Tests");
-    var result = StartProcess(taefBinDir + "/TE.exe", taefBinDir + "/UITests.Tests.TAEF.dll /screenCaptureOnError");
-    if (result != 0)
+    Information("\nRunning UI Interaction Tests");
+
+    var testSettings = new DotNetCoreTestSettings
     {
-        throw new InvalidOperationException("TAEF Tests failed!");
-    }
+        Configuration = "Release",
+        NoBuild = true,
+        Logger = "trx;LogFilePrefix=VsTestResults",
+        Verbosity = DotNetCoreVerbosity.Normal
+    };
+    DotNetCoreTest(file.FullPath, testSettings);
 }).DeferOnError();
 
 

From f09c90985401b887c7bcd1fb5518db7aec168fc8 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 11 Sep 2020 15:44:44 -0400
Subject: [PATCH 480/595] Namespace no longer in this project or any other in
 this solution.

---
 Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index 1db59a5b434..fe8cc6a9931 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -5,9 +5,6 @@
     <Title>Windows Community Toolkit .NET Standard Services</Title>
     <Description>
       This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit.
-      
-      Namespace:
-      - Facebook: Album, DataConfig, DataHost, OAuthTokens, Permissions, Photo, Picture, PictureData, PlatformImageSource, Post, RequestSource, Service.
     </Description>
     <PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
 

From a13fe1f48a844ab60af5872cf1ccf1cacac44505 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 11 Sep 2020 16:11:46 -0700
Subject: [PATCH 481/595] Updated UI tests to net core 3.1.

---
 .../UITests.Tests.MSTest.csproj                   |  8 +++++---
 UITests/UITests.Tests.Shared/TestAssembly.cs      |  2 +-
 UITests/UITests.Tests.Shared/Tests.cs             |  4 +++-
 UITests/UITests.Tests.TAEF/MainClass.cs           | 15 +++++++++++++++
 .../UITests.Tests.TAEF/UITests.Tests.TAEF.csproj  | 11 +++++------
 5 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 UITests/UITests.Tests.TAEF/MainClass.cs

diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 8ead9dfb768..9f1b8ae8a7f 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -3,14 +3,16 @@
 
   <PropertyGroup>
 
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
+    <TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
+    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <LangVersion>8.0</LangVersion>
 
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PlatformTarget>x86</PlatformTarget>
+    <OutputType>Exe</OutputType>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index 9a4fe7bc31b..6b78746ffcd 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -17,7 +17,7 @@ namespace UITests.Tests
     public class TestAssembly
     {
         [AssemblyInitialize]
-        [TestProperty("CoreClrProfile", ".NETCoreApp2.1")]
+        [TestProperty("CoreClrProfile", ".")]
         [TestProperty("RunFixtureAs:Assembly", "ElevatedUserOrSystem")]
         public static void AssemblyInitialize(TestContext testContext)
         {
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index d2a627fd650..89d77831eed 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -28,7 +28,9 @@ public static TestApplicationInfo WinUICsUWPSampleApp
             get
             {
                 string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.FullName, "UITests.App");
+                string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App");
+
+                Log.Comment($"Base Appx Search Directory = \"{baseDirectory}\"");
 
                 var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs" };
                 var files = Directory.GetFiles(baseDirectory, "*.appx", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
diff --git a/UITests/UITests.Tests.TAEF/MainClass.cs b/UITests/UITests.Tests.TAEF/MainClass.cs
new file mode 100644
index 00000000000..77d69d0e392
--- /dev/null
+++ b/UITests/UITests.Tests.TAEF/MainClass.cs
@@ -0,0 +1,15 @@
+// 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 UITests.Tests.TAEF
+{
+    public static class MainClass
+    {
+        public static void Main()
+        {
+            // Empty main just to force the compiler to copy the DotNet Runtime on the folder as the output (since OutputType = Exe).
+            // The .exe is unused, but we do use the dll generated by this compilation
+        }
+    }
+}
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index a6fc3f6dfae..733b3fd080e 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -2,15 +2,18 @@
 
   <PropertyGroup>
 
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
     <LangVersion>8.0</LangVersion>
 
     <TaefRootDirectory>$(PkgTAEF_Redist_Wlk)\build\Binaries\x86\CoreClr\</TaefRootDirectory>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PlatformTarget>x86</PlatformTarget>
     <DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
+    <OutputType>Exe</OutputType>
+    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,13 +38,9 @@
   <ItemGroup>
     <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.3" />
     <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
-    <PackageReference Include="runtime.win-x86.microsoft.netcore.app" Version="2.1.0" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(Pkgruntime_win-x86_microsoft_netcore_app)\runtimes\win-x86\lib\netcoreapp2.1\*" Link=".NETCoreApp2.1\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(Pkgruntime_win-x86_microsoft_netcore_app)\runtimes\win-x86\native\*" Link=".NETCoreApp2.1\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
-
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>

From b0f2edd2e3ae157c58a0dd94fa92bd9b99cf1732 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 02:32:18 +0200
Subject: [PATCH 482/595] Fixed accidental O(logn) to O(n) lookup slowdown

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index c93d12430f3..82bc094ea38 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -394,8 +394,6 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 recipientsRef = ref recipients[0];
 
                 // Copy the handlers to the local collection.
-                // Both types being enumerate expose a struct enumerator,
-                // so we're not actually allocating the enumerator here.
                 // The array is oversized at this point, since it also includes
                 // handlers for different tokens. We can reuse the same variable
                 // to count the number of matching handlers to invoke later on.
@@ -407,20 +405,14 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 while (mappingEnumerator.MoveNext())
                 {
                     object recipient = mappingEnumerator.Key.Target;
-                    var pairsEnumerator = mappingEnumerator.Value.GetEnumerator();
 
-                    while (pairsEnumerator.MoveNext())
+                    // Pick the target handler, if the token is a match for the recipient
+                    if (mappingEnumerator.Value.TryGetValue(token, out object? handler))
                     {
-                        // Only select the ones with a matching token
-                        if (pairsEnumerator.Key.Equals(token))
-                        {
-                            // We spend quite a bit of time in these two busy loops as we go through all the
-                            // existing mappings and registrations to find the handlers we're interested in.
-                            // We can manually offset here to skip the bounds checks in this inner loop when
-                            // indexing the array (the size is already verified and guaranteed to be enough).
-                            Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)i) = pairsEnumerator.Value;
-                            Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)i++) = recipient;
-                        }
+                        // We can manually offset here to skip the bounds checks in this inner loop when
+                        // indexing the array (the size is already verified and guaranteed to be enough).
+                        Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)i) = handler!;
+                        Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)i++) = recipient;
                     }
                 }
             }

From 89efbea051e85489350d46cd61c4c814d152b517 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 02:40:33 +0200
Subject: [PATCH 483/595] Small code refactoring and improvements

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 82bc094ea38..6f6bf62a047 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -131,9 +131,6 @@ public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken
                 // Treat the input delegate as if it was covariant (see comments below in the Send method)
                 registeredHandler = handler;
 
-                // Update the total counter for handlers for the current type parameters
-                mapping.TotalHandlersCount++;
-
                 // Make sure this registration map is tracked for the current recipient
                 ref HashSet<IMapping>? set = ref this.recipientsMap.GetOrAddValueRef(key);
 
@@ -171,8 +168,6 @@ public void UnregisterAll(object recipient)
                         // The handlers map is the IDictionary<TToken, TMessage> instance for the mapping.
                         int handlersCount = Unsafe.As<IDictionarySlim>(handlersMap).Count;
 
-                        mapping.TotalHandlersCount -= handlersCount;
-
                         if (mapping.Count == 0)
                         {
                             // Maps here are really of type Mapping<,> and with unknown type arguments.
@@ -259,15 +254,6 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                     // for the current message type (unknown from here).
                     if (holder.Remove(token))
                     {
-                        // As above, we need to update the total number of registered handlers for the map.
-                        // In this case we also know that the current TToken type parameter is of interest
-                        // for the current method, as we're only unsubscribing handlers using that token.
-                        // This is because we're already working on the final <TToken, TMessage> mapping,
-                        // which associates a single handler with a given token, for a given recipient.
-                        // This means that we don't have to retrieve the count to subtract in this case,
-                        // we're just removing a single handler at a time. So, we just decrement the total.
-                        Unsafe.As<IMapping>(map).TotalHandlersCount--;
-
                         if (holder.Count == 0)
                         {
                             // If the map is empty, remove the recipient entirely from its container
@@ -335,9 +321,6 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                 // Remove the target handler
                 if (dictionary!.Remove(token))
                 {
-                    // Decrement the total count, as above
-                    mapping.TotalHandlersCount--;
-
                     // If the map is empty, it means that the current recipient has no remaining
                     // registered handlers for the current <TMessage, TToken> combination, regardless,
                     // of the specific token value (ie. the channel used to receive messages of that type).
@@ -376,12 +359,18 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 // Check whether there are any registered recipients
                 _ = TryGetMapping(out Mapping<TMessage, TToken>? mapping);
 
-                // We need to make a local copy of the currently registered handlers,
-                // since users might try to unregister (or register) new handlers from
-                // inside one of the currently existing handlers. We can use memory pooling
-                // to reuse arrays, to minimize the average memory usage. In practice,
-                // we usually just need to pay the small overhead of copying the items.
-                int totalHandlersCount = mapping?.TotalHandlersCount ?? 0;
+                // We need to make a local copy of the currently registered handlers, since users might
+                // try to unregister (or register) new handlers from inside one of the currently existing
+                // handlers. We can use memory pooling to reuse arrays, to minimize the average memory
+                // usage. In practice, we usually just need to pay the small overhead of copying the items.
+                // The current mapping contains all the currently registered recipients and handlers for
+                // the <TMessage, TToken> combination in use. In the worst case scenario, all recipients
+                // will have a registered handler with a token matching the input one, meaning that we could
+                // have at worst a number of pending handlers to invoke equal to the total number of recipient
+                // in the mapping. This relies on the fact that tokens are unique, and that there is only
+                // one handler associated with a given token. We can use this upper bound as the requested
+                // size for each array rented from the pool, which guarantees that we'll have enough space.
+                int totalHandlersCount = mapping?.Count ?? 0;
 
                 if (totalHandlersCount == 0)
                 {
@@ -541,9 +530,6 @@ public Mapping()
 
             /// <inheritdoc/>
             public Type2 TypeArguments { get; }
-
-            /// <inheritdoc/>
-            public int TotalHandlersCount { get; set; }
         }
 
         /// <summary>
@@ -556,11 +542,6 @@ private interface IMapping : IDictionarySlim<Recipient>
             /// Gets the <see cref="Type2"/> instance representing the current type arguments.
             /// </summary>
             Type2 TypeArguments { get; }
-
-            /// <summary>
-            /// Gets or sets the total number of handlers in the current instance.
-            /// </summary>
-            int TotalHandlersCount { get; set; }
         }
 
         /// <summary>

From cf515e6cbabf16a25084886528aff77a6a5b87dd Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 15:34:07 +0200
Subject: [PATCH 484/595] Added WeakRefMessenger type

---
 .../DictionarySlim{TKey,TValue}.cs            |   2 +-
 .../IDictionarySlim{TKey}.cs                  |   9 +-
 .../Messaging/WeakRefMessenger.cs             | 484 ++++++++++++++++++
 3 files changed, 493 insertions(+), 2 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index ab4706de5f7..b171a8a17be 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -130,7 +130,7 @@ public void Clear()
             this.entries = InitialEntries;
         }
 
-        /// <inheritdoc cref="Dictionary{TKey,TValue}.ContainsKey"/>
+        /// <inheritdoc/>
         public bool ContainsKey(TKey key)
         {
             Entry[] entries = this.entries;
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 7de2505148a..efb201ffbc0 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -13,12 +13,19 @@ namespace Microsoft.Collections.Extensions
     internal interface IDictionarySlim<in TKey> : IDictionarySlim
         where TKey : IEquatable<TKey>
     {
+        /// <summary>
+        /// Checks whether or not the dictionary contains a pair with a specified key.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <returns>Whether or not the key was present in the dictionary.</returns>
+        public bool ContainsKey(TKey key);
+
         /// <summary>
         /// Tries to remove a value with a specified key.
         /// </summary>
         /// <param name="key">The key of the value to remove.</param>
         /// <param name="result">The removed value, if it was present.</param>
-        /// <returns>.Whether or not the key was present.</returns>
+        /// <returns>Whether or not the key was present.</returns>
         bool TryRemove(TKey key, out object? result);
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
new file mode 100644
index 00000000000..91ed0800868
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -0,0 +1,484 @@
+// 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.
+
+#if NETSTANDARD2_1
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Collections.Extensions;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging
+{
+    /// <summary>
+    /// A class providing a reference implementation for the <see cref="IMessenger"/> interface.
+    /// </summary>
+    /// <remarks>
+    /// This <see cref="IMessenger"/> implementation uses weak references to track the registered
+    /// recipients, so it is not necessary to manually unregister them when they're no longer needed.
+    /// </remarks>
+    public sealed class WeakRefMessenger : IMessenger
+    {
+        // The WeakRefMessenger class uses the following logic to link stored instances together:
+        // --------------------------------------------------------------------------------------------------------
+        //                          DictionarySlim<TToken, MessageHandler<TRecipient, TMessage>> mapping
+        //                                           /                                   /          /
+        //                      ___(Type2.TToken)___/                                   /          /
+        //                     /_________________(Type2.TMessage)______________________/          /
+        //                    /                                       ___________________________/
+        //                   /                                       /
+        // DictionarySlim<Type2, ConditionalWeakTable<object, IDictionarySlim>> recipientsMap;
+        // --------------------------------------------------------------------------------------------------------
+        // Just like in the strong reference variant, each pair of message and token types is used as a key in the
+        // recipients map. In this case, the values in the dictionary are ConditionalWeakTable<,> instances, that
+        // link each registered recipient to a map of currently registered handlers, through a weak reference.
+        // The value in each conditional table is Dictionary<TToken, MessageHandler<TRecipient, TMessage>>, using
+        // the same unsafe cast as before to allow the generic handler delegates to be invoked without knowing
+        // what type each recipient was registered with, and without the need to use reflection.
+
+        /// <summary>
+        /// The map of currently registered recipients for all message types.
+        /// </summary>
+        private readonly DictionarySlim<Type2, ConditionalWeakTable<object, IDictionarySlim>> recipientsMap
+            = new DictionarySlim<Type2, ConditionalWeakTable<object, IDictionarySlim>>();
+
+        /// <summary>
+        /// Gets the default <see cref="WeakRefMessenger"/> instance.
+        /// </summary>
+        public static WeakRefMessenger Default { get; } = new WeakRefMessenger();
+
+        /// <inheritdoc/>
+        public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            lock (this.recipientsMap)
+            {
+                Type2 type2 = new Type2(typeof(TMessage), typeof(TToken));
+
+                // Get the conditional table associated with the target recipient, for the current pair
+                // of token and message types. If it exists, check if there is a matching token.
+                return
+                    this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table) &&
+                    table!.TryGetValue(recipient, out IDictionarySlim mapping) &&
+                    Unsafe.As<IDictionarySlim<TToken>>(mapping).ContainsKey(token);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken token, MessageHandler<TRecipient, TMessage> handler)
+            where TRecipient : class
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            lock (this.recipientsMap)
+            {
+                Type2 type2 = new Type2(typeof(TMessage), typeof(TToken));
+
+                // Get the conditional table for the pair of type arguments, or create it if it doesn't exist
+                ref ConditionalWeakTable<object, IDictionarySlim>? mapping = ref this.recipientsMap.GetOrAddValueRef(type2);
+
+                mapping ??= new ConditionalWeakTable<object, IDictionarySlim>();
+
+                // Get or create the handlers dictionary for the target recipient
+                var map = Unsafe.As<DictionarySlim<TToken, object>>(mapping.GetValue(recipient, _ => new DictionarySlim<TToken, object>()));
+
+                // Add the new registration entry
+                ref object? registeredHandler = ref map.GetOrAddValueRef(token);
+
+                if (!(registeredHandler is null))
+                {
+                    ThrowInvalidOperationExceptionForDuplicateRegistration();
+                }
+
+                // Store the input handler
+                registeredHandler = handler;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void UnregisterAll(object recipient)
+        {
+            lock (this.recipientsMap)
+            {
+                var enumerator = this.recipientsMap.GetEnumerator();
+
+                // Traverse all the existing conditional tables and remove all the ones
+                // with the target recipient as key. We don't perform a cleanup here,
+                // as that is responsability of a separate method defined below.
+                while (enumerator.MoveNext())
+                {
+                    enumerator.Value.Remove(recipient);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void UnregisterAll<TToken>(object recipient, TToken token)
+            where TToken : IEquatable<TToken>
+        {
+            lock (this.recipientsMap)
+            {
+                var enumerator = this.recipientsMap.GetEnumerator();
+
+                // Same as above, with the difference being that this time we only go through
+                // the conditional tables having a matching token type as key, and that we
+                // only try to remove handlers with a matching token, if any.
+                while (enumerator.MoveNext())
+                {
+                    if (enumerator.Key.TToken == typeof(TToken) &&
+                        enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
+                    {
+                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Unregister<TMessage, TToken>(object recipient, TToken token)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            lock (this.recipientsMap)
+            {
+                var type2 = new Type2(typeof(TMessage), typeof(TToken));
+                var enumerator = this.recipientsMap.GetEnumerator();
+
+                // Traverse all the existing token and message pairs matching the current type
+                // arguments, and remove all the handlers with a matching token, as above.
+                while (enumerator.MoveNext())
+                {
+                    if (enumerator.Key.Equals(type2) &&
+                        enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
+                    {
+                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
+            where TMessage : class
+            where TToken : IEquatable<TToken>
+        {
+            ArrayPoolBufferWriter<object> recipients;
+            ArrayPoolBufferWriter<object> handlers;
+
+            lock (this.recipientsMap)
+            {
+                Type2 type2 = new Type2(typeof(TMessage), typeof(TToken));
+
+                // Try to get the target table
+                if (!this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table))
+                {
+                    return message;
+                }
+
+                recipients = new ArrayPoolBufferWriter<object>();
+                handlers = new ArrayPoolBufferWriter<object>();
+
+                // We need a local, temporary copy of all the pending recipients and handlers to
+                // invoke, to avoid issues with handlers unregistering from messages while we're
+                // holding the lock. To do this, we can just traverse the conditional table in use
+                // to enumerate all the existing recipients for the token and message types pair
+                // corresponding to the generic arguments for this invocation, and then track the
+                // handlers with a matching token, and their corresponding recipients.
+                foreach (KeyValuePair<object, IDictionarySlim> pair in table!)
+                {
+                    var map = Unsafe.As<DictionarySlim<TToken, object>>(pair.Value);
+
+                    if (map.TryGetValue(token, out object? handler))
+                    {
+                        recipients.Add(pair.Key);
+                        handlers.Add(handler!);
+                    }
+                }
+            }
+
+            try
+            {
+                ReadOnlySpan<object>
+                    recipientsSpan = recipients.Span,
+                    handlersSpan = handlers.Span;
+                int handlersCount = recipients.Count;
+
+                for (int i = 0; i < handlersCount; i++)
+                {
+                    // Just like in the other messenger, here we need an unsafe cast to be able to
+                    // invoke a generic delegate with a contravariant input argument, with a less
+                    // derived reference, without reflection. This is guaranteed to work by how the
+                    // messenger tracks registered recipients and their associated handlers, so the
+                    // type conversion will always be valid (the recipients are the rigth instances).
+                    Unsafe.As<MessageHandler<object, TMessage>>(handlersSpan[i])(recipientsSpan![i], message);
+                }
+            }
+            finally
+            {
+                recipients.Dispose();
+                handlers.Dispose();
+            }
+
+            return message;
+        }
+
+        /// <inheritdoc/>
+        void IMessenger.Cleanup()
+        {
+            lock (this.recipientsMap)
+            {
+                using ArrayPoolBufferWriter<Type2> type2s = new ArrayPoolBufferWriter<Type2>();
+                using ArrayPoolBufferWriter<object> emptyRecipients = new ArrayPoolBufferWriter<object>();
+
+                var enumerator = this.recipientsMap.GetEnumerator();
+
+                // First, we go through all the currently registered pairs of token and message types.
+                // These represents all the combinations of generic arguments with at least one registered
+                // handler, with the exception of those with recipients that have already been collected.
+                while (enumerator.MoveNext())
+                {
+                    emptyRecipients.Reset();
+
+                    bool hasAtLeastOneHandler = false;
+
+                    // Go through the currently alive recipients to look for those with no handlers left. We track
+                    // the ones we find to remove them outside of the loop (can't modify during enumeration).
+                    foreach (KeyValuePair<object, IDictionarySlim> pair in enumerator.Value)
+                    {
+                        if (pair.Value.Count == 0)
+                        {
+                            emptyRecipients.Add(pair.Key);
+                        }
+                        else
+                        {
+                            hasAtLeastOneHandler = true;
+                        }
+                    }
+
+                    // Remove the handler maps for recipients that are still alive but with no handlers
+                    foreach (object recipient in emptyRecipients.Span)
+                    {
+                        enumerator.Value.Remove(recipient);
+                    }
+
+                    // Track the type combinations with no recipients or handlers left
+                    if (!hasAtLeastOneHandler)
+                    {
+                        type2s.Add(enumerator.Key);
+                    }
+                }
+
+                // Remove all the mappings with no handlers left
+                foreach (Type2 key in type2s.Span)
+                {
+                    this.recipientsMap.Remove(key);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Reset()
+        {
+            lock (this.recipientsMap)
+            {
+                this.recipientsMap.Clear();
+            }
+        }
+
+        /// <summary>
+        /// A simple buffer writer implementation using pooled arrays.
+        /// </summary>
+        /// <typeparam name="T">The type of items to store in the list.</typeparam>
+        public sealed class ArrayPoolBufferWriter<T> : IDisposable
+        {
+            /// <summary>
+            /// The default buffer size to use to expand empty arrays.
+            /// </summary>
+            private const int DefaultInitialBufferSize = 128;
+
+            /// <summary>
+            /// The underlying <typeparamref name="T"/> array.
+            /// </summary>
+            private T[] array;
+
+            /// <summary>
+            /// The starting offset within <see cref="array"/>.
+            /// </summary>
+            private int index;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
+            /// </summary>
+            public ArrayPoolBufferWriter()
+            {
+                this.array = ArrayPool<T>.Shared.Rent(DefaultInitialBufferSize);
+                this.index = 0;
+            }
+
+            /// <summary>
+            /// Gets a <see cref="ReadOnlySpan{T}"/> with the current items.
+            /// </summary>
+            public ReadOnlySpan<T> Span
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    T[] array = this.array;
+
+                    if (this.index > 0)
+                    {
+                        return MemoryMarshal.CreateReadOnlySpan(ref array[0], this.index);
+                    }
+
+                    return default;
+                }
+            }
+
+            /// <summary>
+            /// Gets the current number of items.
+            /// </summary>
+            public int Count
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get => this.index;
+            }
+
+            /// <summary>
+            /// Adds a new item to the current collection.
+            /// </summary>
+            /// <param name="item">The item to add.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void Add(T item)
+            {
+                if (this.index == this.array.Length)
+                {
+                    ResizeBuffer();
+                }
+
+                this.array[this.index++] = item;
+            }
+
+            /// <summary>
+            /// Resets the underlying array and the stored items.
+            /// </summary>
+            public void Reset()
+            {
+                Array.Clear(this.array, 0, this.index);
+
+                this.index = 0;
+            }
+
+            /// <summary>
+            /// Resizes <see cref="array"/> when there is no space left for new items.
+            /// </summary>
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private void ResizeBuffer()
+            {
+                T[] rent = ArrayPool<T>.Shared.Rent(this.index << 2);
+
+                Array.Copy(this.array, 0, rent, 0, this.index);
+                Array.Clear(this.array, 0, this.index);
+
+                ArrayPool<T>.Shared.Return(this.array);
+
+                this.array = rent;
+            }
+
+            /// <inheritdoc/>
+            public void Dispose()
+            {
+                Array.Clear(this.array, 0, this.index);
+
+                ArrayPool<T>.Shared.Return(this.array);
+            }
+        }
+
+        /// <summary>
+        /// A simple type representing an immutable pair of types.
+        /// </summary>
+        /// <remarks>
+        /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> as it's faster in its
+        /// <see cref="GetHashCode"/> and <see cref="IEquatable{T}.Equals(T)"/> methods, and because
+        /// unlike a value tuple it exposes its fields as immutable. Additionally, the
+        /// <see cref="TMessage"/> and <see cref="TToken"/> fields provide additional clarity reading
+        /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
+        /// </remarks>
+        private readonly struct Type2 : IEquatable<Type2>
+        {
+            /// <summary>
+            /// The type of registered message.
+            /// </summary>
+            public readonly Type TMessage;
+
+            /// <summary>
+            /// The type of registration token.
+            /// </summary>
+            public readonly Type TToken;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Type2"/> struct.
+            /// </summary>
+            /// <param name="tMessage">The type of registered message.</param>
+            /// <param name="tToken">The type of registration token.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Type2(Type tMessage, Type tToken)
+            {
+                TMessage = tMessage;
+                TToken = tToken;
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Equals(Type2 other)
+            {
+                // We can't just use reference equality, as that's technically not guaranteed
+                // to work and might fail in very rare cases (eg. with type forwarding between
+                // different assemblies). Instead, we can use the == operator to compare for
+                // equality, which still avoids the callvirt overhead of calling Type.Equals,
+                // and is also implemented as a JIT intrinsic on runtimes such as .NET Core.
+                return
+                    TMessage == other.TMessage &&
+                    TToken == other.TToken;
+            }
+
+            /// <inheritdoc/>
+            public override bool Equals(object? obj)
+            {
+                return obj is Type2 other && Equals(other);
+            }
+
+            /// <inheritdoc/>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    // To combine the two hashes, we can simply use the fast djb2 hash algorithm.
+                    // This is not a problem in this case since we already know that the base
+                    // RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution.
+                    int hash = RuntimeHelpers.GetHashCode(TMessage);
+
+                    hash = (hash << 5) + hash;
+
+                    hash += RuntimeHelpers.GetHashCode(TToken);
+
+                    return hash;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
+        /// </summary>
+        private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
+        {
+            throw new InvalidOperationException("The target recipient has already subscribed to the target message");
+        }
+    }
+}
+
+#endif

From 5840ad0559e9f544d140217c65b303c79e707ce8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 15:48:12 +0200
Subject: [PATCH 485/595] Added support for multiple messenger types to tests

---
 .../Mvvm/Test_Messenger.Request.cs            |  55 ++++----
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 124 ++++++++++--------
 .../Mvvm/Test_ObservableRecipient.cs          |  30 ++++-
 3 files changed, 128 insertions(+), 81 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index 9a4329e06d3..e1f99621b29 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -15,9 +15,10 @@ public partial class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RequestMessage_Ok()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RequestMessage_Ok(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
             object test = null;
 
@@ -42,20 +43,22 @@ void Receive(object recipient, NumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
+        [DataRow(typeof(Messenger))]
         [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_Messenger_RequestMessage_Fail_NoReply()
+        public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
 
             int result = messenger.Send<NumberRequestMessage>();
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
+        [DataRow(typeof(Messenger))]
         [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_Messenger_RequestMessage_Fail_MultipleReplies()
+        public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             void Receive(object recipient, NumberRequestMessage m)
@@ -75,9 +78,10 @@ public class NumberRequestMessage : RequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync()
+        [DataRow(typeof(Messenger))]
+        public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             void Receive(object recipient, AsyncNumberRequestMessage m)
@@ -98,9 +102,10 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public async Task Test_Messenger_AsyncRequestMessage_Ok_Async()
+        [DataRow(typeof(Messenger))]
+        public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             async Task<int> GetNumberAsync()
@@ -128,20 +133,22 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
+        [DataRow(typeof(Messenger))]
         [ExpectedException(typeof(InvalidOperationException))]
-        public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply()
+        public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
 
             int result = await messenger.Send<AsyncNumberRequestMessage>();
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
+        [DataRow(typeof(Messenger))]
         [ExpectedException(typeof(InvalidOperationException))]
-        public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies()
+        public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             void Receive(object recipient, AsyncNumberRequestMessage m)
@@ -161,9 +168,10 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             void Receive(object recipient, NumbersCollectionRequestMessage m)
@@ -179,9 +187,10 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             object
                 recipient1 = new object(),
                 recipient2 = new object(),
@@ -232,9 +241,10 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies()
+        [DataRow(typeof(Messenger))]
+        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
@@ -250,9 +260,10 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies()
+        [DataRow(typeof(Messenger))]
+        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             object
                 recipient1 = new object(),
                 recipient2 = new object(),
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 9e83f85ab4b..bbbba617720 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -13,9 +13,10 @@ public partial class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithMessageType()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Unregister<MessageA>(recipient);
@@ -23,9 +24,10 @@ public void Test_Messenger_UnregisterRecipientWithMessageType()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
@@ -33,9 +35,10 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.UnregisterAll(recipient, nameof(MessageA));
@@ -43,9 +46,10 @@ public void Test_Messenger_UnregisterRecipientWithToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_UnregisterRecipientWithRecipient()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.UnregisterAll(recipient);
@@ -53,9 +57,10 @@ public void Test_Messenger_UnregisterRecipientWithRecipient()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA>(recipient, (r, m) => { });
@@ -67,9 +72,10 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
@@ -81,9 +87,10 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
@@ -95,9 +102,10 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
@@ -109,36 +117,38 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
         {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             object a = new object();
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
 
             object recipient = null;
             string result = null;
 
-            Messenger.Default.Register<MessageA>(a, (r, m) =>
+            messenger.Register<MessageA>(a, (r, m) =>
             {
                 recipient = r;
                 result = m.Text;
             });
 
-            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(a));
 
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
+            messenger.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.AreSame(recipient, a);
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Default.Unregister<MessageA>(a);
+            messenger.Unregister<MessageA>(a);
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
 
             recipient = null;
             result = null;
 
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
+            messenger.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.IsNull(recipient);
             Assert.IsNull(result);
@@ -146,63 +156,68 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
         {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             object a = new object();
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Default.Register<MessageA>(a, (r, m) => result = m.Text);
+            messenger.Register<MessageA>(a, (r, m) => result = m.Text);
 
-            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(a));
 
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
+            messenger.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Default.UnregisterAll(a);
+            messenger.UnregisterAll(a);
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
 
             result = null;
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) });
+            messenger.Send(new MessageA { Text = nameof(MessageA) });
 
             Assert.IsNull(result);
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
         {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             object a = new object();
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA>(a));
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
 
             string result = null;
-            Messenger.Default.Register<MessageA, string>(a, nameof(MessageA), (r, m) => result = m.Text);
+            messenger.Register<MessageA, string>(a, nameof(MessageA), (r, m) => result = m.Text);
 
-            Assert.IsTrue(Messenger.Default.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+            Assert.IsTrue(messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
 
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+            messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
 
             Assert.AreEqual(result, nameof(MessageA));
 
-            Messenger.Default.Unregister<MessageA, string>(a, nameof(MessageA));
+            messenger.Unregister<MessageA, string>(a, nameof(MessageA));
 
-            Assert.IsFalse(Messenger.Default.IsRegistered<MessageA, string>(a, nameof(MessageA)));
+            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(a, nameof(MessageA)));
 
             result = null;
-            Messenger.Default.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
+            messenger.Send(new MessageA { Text = nameof(MessageA) }, nameof(MessageA));
 
             Assert.IsNull(result);
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_DuplicateRegistrationWithMessageType()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA>(recipient, (r, m) => { });
@@ -215,9 +230,10 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new object();
 
             messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
@@ -230,9 +246,10 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IRecipient_NoMessages()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IRecipient_NoMessages(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new RecipientWithNoMessages();
 
             messenger.RegisterAll(recipient);
@@ -243,9 +260,10 @@ public void Test_Messenger_IRecipient_NoMessages()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IRecipient_SomeMessages_NoToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new RecipientWithSomeMessages();
 
             messenger.RegisterAll(recipient);
@@ -274,9 +292,10 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_IRecipient_SomeMessages_WithToken()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new RecipientWithSomeMessages();
             var token = nameof(Test_Messenger_IRecipient_SomeMessages_WithToken);
 
@@ -309,9 +328,10 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_Messenger_RegisterWithTypeParameter()
+        [DataRow(typeof(Messenger))]
+        public void Test_Messenger_RegisterWithTypeParameter(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var recipient = new RecipientWithNoMessages { Number = 42 };
 
             int number = 0;
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index 76ff145d86f..a67a52b2344 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.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 Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
@@ -14,9 +15,11 @@ public class Test_ObservableRecipient
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableRecipient_Activation()
+        [DataRow(typeof(Messenger))]
+        public void Test_ObservableRecipient_Activation(Type type)
         {
-            var viewmodel = new SomeRecipient<int>();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+            var viewmodel = new SomeRecipient<int>(messenger);
 
             Assert.IsFalse(viewmodel.IsActivatedCheck);
 
@@ -33,7 +36,18 @@ public void Test_ObservableRecipient_Activation()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableRecipient_Defaults()
+        [DataRow(typeof(Messenger))]
+        public void Test_ObservableRecipient_IsSame(Type type)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+            var viewmodel = new SomeRecipient<int>(messenger);
+
+            Assert.AreSame(viewmodel.CurrentMessenger, messenger);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservableRecipient_Default()
         {
             var viewmodel = new SomeRecipient<int>();
 
@@ -42,9 +56,10 @@ public void Test_ObservableRecipient_Defaults()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableRecipient_Injection()
+        [DataRow(typeof(Messenger))]
+        public void Test_ObservableRecipient_Injection(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var viewmodel = new SomeRecipient<int>(messenger);
 
             Assert.AreSame(viewmodel.CurrentMessenger, messenger);
@@ -52,9 +67,10 @@ public void Test_ObservableRecipient_Injection()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableRecipient_Broadcast()
+        [DataRow(typeof(Messenger))]
+        public void Test_ObservableRecipient_Broadcast(Type type)
         {
-            var messenger = new Messenger();
+            var messenger = (IMessenger)Activator.CreateInstance(type);
             var viewmodel = new SomeRecipient<int>(messenger);
 
             PropertyChangedMessage<int> message = null;

From d68f9d2ccd26d7340623a2e5179e13dc09afc787 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 15:54:25 +0200
Subject: [PATCH 486/595] Enabled tests for WeakRefMessenger

---
 .../Mvvm/Test_Messenger.Request.cs            | 33 ++++++++++++
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 51 +++++++++++++++++++
 .../Mvvm/Test_ObservableRecipient.cs          | 12 +++++
 3 files changed, 96 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index e1f99621b29..0d3c9b48d60 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -16,6 +16,9 @@ public partial class Test_Messenger
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RequestMessage_Ok(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -44,6 +47,9 @@ void Receive(object recipient, NumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         {
@@ -55,6 +61,9 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -79,6 +88,9 @@ public class NumberRequestMessage : RequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -103,6 +115,9 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -134,6 +149,9 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         {
@@ -145,6 +163,9 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -169,6 +190,9 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -188,6 +212,9 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -242,6 +269,9 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -261,6 +291,9 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index bbbba617720..a429baa7552 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -14,6 +14,9 @@ public partial class Test_Messenger
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -25,6 +28,9 @@ public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -36,6 +42,9 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -47,6 +56,9 @@ public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -58,6 +70,9 @@ public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -73,6 +88,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type ty
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -88,6 +106,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -103,6 +124,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -118,6 +142,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -157,6 +184,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -186,6 +216,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -215,6 +248,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -231,6 +267,9 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -247,6 +286,9 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type typ
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IRecipient_NoMessages(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -261,6 +303,9 @@ public void Test_Messenger_IRecipient_NoMessages(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -293,6 +338,9 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -329,6 +377,9 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_Messenger_RegisterWithTypeParameter(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index a67a52b2344..be41663f116 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -16,6 +16,9 @@ public class Test_ObservableRecipient
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_ObservableRecipient_Activation(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -37,6 +40,9 @@ public void Test_ObservableRecipient_Activation(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_ObservableRecipient_IsSame(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -57,6 +63,9 @@ public void Test_ObservableRecipient_Default()
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_ObservableRecipient_Injection(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -68,6 +77,9 @@ public void Test_ObservableRecipient_Injection(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
+#if NETCOREAPP3_1
+        [DataRow(typeof(WeakRefMessenger))]
+#endif
         public void Test_ObservableRecipient_Broadcast(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);

From 78bbd6e094916ffdbfbaebdeec78b279d97795e4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 16:47:30 +0200
Subject: [PATCH 487/595] Removed leftover code no longer needed

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 6f6bf62a047..20ed40b52ab 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -156,18 +156,8 @@ public void UnregisterAll(object recipient)
                 // Removes all the lists of registered handlers for the recipient
                 foreach (IMapping mapping in set!)
                 {
-                    if (mapping.TryRemove(key, out object? handlersMap))
+                    if (mapping.TryRemove(key, out _))
                     {
-                        // If this branch is taken, it means the target recipient to unregister
-                        // had at least one registered handler for the current <TToken, TMessage>
-                        // pair of type parameters, which here is masked out by the IMapping interface.
-                        // Before removing the handlers, we need to retrieve the count of how many handlers
-                        // are being removed, in order to update the total counter for the mapping.
-                        // Just casting the dictionary to the base interface and accessing the Count
-                        // property directly gives us O(1) access time to retrieve this count.
-                        // The handlers map is the IDictionary<TToken, TMessage> instance for the mapping.
-                        int handlersCount = Unsafe.As<IDictionarySlim>(handlersMap).Count;
-
                         if (mapping.Count == 0)
                         {
                             // Maps here are really of type Mapping<,> and with unknown type arguments.

From 98095223b784fcf6efec297d5a77c6bad1d310ec Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 12 Sep 2020 17:38:18 +0200
Subject: [PATCH 488/595] Code refactoring, removed duplicate types

---
 .../ComponentModel/ObservableRecipient.cs     |  2 +-
 .../Messaging/IMessenger.cs                   |  4 +-
 ...rExtensions.cs => IMessengerExtensions.cs} |  7 +-
 .../DictionarySlim{TKey,TValue}.cs            |  0
 .../HashHelpers.cs                            |  0
 .../IDictionarySlim.cs                        |  0
 .../IDictionarySlim{TKey,TValue}.cs           |  0
 .../IDictionarySlim{TKey}.cs                  |  0
 .../Messaging/Internals/Type2.cs              | 79 +++++++++++++++++++
 .../Messaging/Internals/Unit.cs               | 31 ++++++++
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 79 +------------------
 .../Messaging/MessengerExtensions.Unit.cs     | 41 ----------
 .../Messaging/WeakRefMessenger.cs             | 75 +-----------------
 13 files changed, 121 insertions(+), 197 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{MessengerExtensions.cs => IMessengerExtensions.cs} (98%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ => Internals}/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ => Internals}/Microsoft.Collections.Extensions/HashHelpers.cs (100%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ => Internals}/Microsoft.Collections.Extensions/IDictionarySlim.cs (100%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ => Internals}/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs (100%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{ => Internals}/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs (100%)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
 delete mode 100644 Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index ca847383b87..81b87dffb90 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -79,7 +79,7 @@ public bool IsActive
         /// <remarks>
         /// The base implementation registers all messages for this recipients that have been declared
         /// explicitly through the <see cref="IRecipient{TMessage}"/> interface, using the default channel.
-        /// For more details on how this works, see the <see cref="MessengerExtensions.RegisterAll"/> method.
+        /// For more details on how this works, see the <see cref="IMessengerExtensions.RegisterAll"/> method.
         /// If you need more fine tuned control, want to register messages individually or just prefer
         /// the lambda-style syntax for message registration, override this method and register manually.
         /// </remarks>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
index 9968d79cb2c..2e41916e950 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
@@ -64,12 +64,12 @@ public delegate void MessageHandler<in TRecipient, in TMessage>(TRecipient recip
     /// Messenger.Default.Register(this, Receive);
     /// </code>
     /// The C# compiler will automatically convert that expression to a <see cref="MessageHandler{TRecipient,TMessage}"/> instance
-    /// compatible with <see cref="MessengerExtensions.Register{TRecipient,TMessage}(IMessenger,TRecipient,MessageHandler{TRecipient,TMessage})"/>.
+    /// compatible with <see cref="IMessengerExtensions.Register{TRecipient,TMessage}(IMessenger,TRecipient,MessageHandler{TRecipient,TMessage})"/>.
     /// This will also work if multiple overloads of that method are available, each handling a different
     /// message type: the C# compiler will automatically pick the right one for the current message type.
     /// It is also possible to register message handlers explicitly using the <see cref="IRecipient{TMessage}"/> interface.
     /// To do so, the recipient just needs to implement the interface and then call the
-    /// <see cref="MessengerExtensions.RegisterAll(IMessenger,object)"/> extension, which will automatically register
+    /// <see cref="IMessengerExtensions.RegisterAll(IMessenger,object)"/> extension, which will automatically register
     /// all the handlers that are declared by the recipient type. Registration for individual handlers is supported as well.
     /// </summary>
     public interface IMessenger
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
similarity index 98%
rename from Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
index 2a6a0383bec..72caa9fb7dd 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
@@ -8,19 +8,20 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using Microsoft.Toolkit.Mvvm.Messaging.Internals;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
     /// <summary>
     /// Extensions for the <see cref="IMessenger"/> type.
     /// </summary>
-    public static partial class MessengerExtensions
+    public static class IMessengerExtensions
     {
         /// <summary>
         /// A class that acts as a container to load the <see cref="MethodInfo"/> instance linked to
         /// the <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/> method.
         /// This class is needed to avoid forcing the initialization code in the static constructor to run as soon as
-        /// the <see cref="MessengerExtensions"/> type is referenced, even if that is done just to use methods
+        /// the <see cref="IMessengerExtensions"/> type is referenced, even if that is done just to use methods
         /// that do not actually require this <see cref="MethodInfo"/> instance to be available.
         /// We're effectively using this type to leverage the lazy loading of static constructors done by the runtime.
         /// </summary>
@@ -32,7 +33,7 @@ private static class MethodInfos
             static MethodInfos()
             {
                 RegisterIRecipient = (
-                    from methodInfo in typeof(MessengerExtensions).GetMethods()
+                    from methodInfo in typeof(IMessengerExtensions).GetMethods()
                     where methodInfo.Name == nameof(Register) &&
                           methodInfo.IsGenericMethod &&
                           methodInfo.GetGenericArguments().Length == 2
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/HashHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/HashHelpers.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/HashHelpers.cs
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim.cs
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
similarity index 100%
rename from Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
new file mode 100644
index 00000000000..0b254562e95
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
+{
+    /// <summary>
+    /// A simple type representing an immutable pair of types.
+    /// </summary>
+    /// <remarks>
+    /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> as it's faster in its
+    /// <see cref="GetHashCode"/> and <see cref="IEquatable{T}.Equals(T)"/> methods, and because
+    /// unlike a value tuple it exposes its fields as immutable. Additionally, the
+    /// <see cref="TMessage"/> and <see cref="TToken"/> fields provide additional clarity reading
+    /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
+    /// </remarks>
+    internal readonly struct Type2 : IEquatable<Type2>
+    {
+        /// <summary>
+        /// The type of registered message.
+        /// </summary>
+        public readonly Type TMessage;
+
+        /// <summary>
+        /// The type of registration token.
+        /// </summary>
+        public readonly Type TToken;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Type2"/> struct.
+        /// </summary>
+        /// <param name="tMessage">The type of registered message.</param>
+        /// <param name="tToken">The type of registration token.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Type2(Type tMessage, Type tToken)
+        {
+            TMessage = tMessage;
+            TToken = tToken;
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool Equals(Type2 other)
+        {
+            // We can't just use reference equality, as that's technically not guaranteed
+            // to work and might fail in very rare cases (eg. with type forwarding between
+            // different assemblies). Instead, we can use the == operator to compare for
+            // equality, which still avoids the callvirt overhead of calling Type.Equals,
+            // and is also implemented as a JIT intrinsic on runtimes such as .NET Core.
+            return
+                TMessage == other.TMessage &&
+                TToken == other.TToken;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            return obj is Type2 other && Equals(other);
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                // To combine the two hashes, we can simply use the fast djb2 hash algorithm.
+                // This is not a problem in this case since we already know that the base
+                // RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution.
+                int hash = RuntimeHelpers.GetHashCode(TMessage);
+
+                hash = (hash << 5) + hash;
+
+                hash += RuntimeHelpers.GetHashCode(TToken);
+
+                return hash;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
new file mode 100644
index 00000000000..5748643cf83
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
+{
+    /// <summary>
+    /// An empty type representing a generic token with no specific value.
+    /// </summary>
+    internal readonly struct Unit : IEquatable<Unit>
+    {
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool Equals(Unit other)
+        {
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            return obj is Unit;
+        }
+
+        /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public override int GetHashCode()
+        {
+            return 0;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 6f6bf62a047..3a7bed003e7 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Microsoft.Collections.Extensions;
+using Microsoft.Toolkit.Mvvm.Messaging.Internals;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -30,8 +31,8 @@ public sealed class Messenger : IMessenger
         //                    | /                       /                                            \
         // DictionarySlim<Recipient, DictionarySlim<TToken, MessageHandler<TRecipient, TMessage>>> mapping = Mapping<TMessage, TToken>
         //                                            /                                   /          /
-        //                      ___(Type2.tToken)____/                                   /          /
-        //                     /________________(Type2.tMessage)________________________/          /
+        //                      ___(Type2.TToken)____/                                   /          /
+        //                     /________________(Type2.TMessage)________________________/          /
         //                    /       ____________________________________________________________/
         //                   /       /
         // DictionarySlim<Type2, IMapping> typesMap;
@@ -593,80 +594,6 @@ public override int GetHashCode()
             }
         }
 
-        /// <summary>
-        /// A simple type representing an immutable pair of types.
-        /// </summary>
-        /// <remarks>
-        /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> as it's faster in its
-        /// <see cref="GetHashCode"/> and <see cref="IEquatable{T}.Equals(T)"/> methods, and because
-        /// unlike a value tuple it exposes its fields as immutable. Additionally, the
-        /// <see cref="tMessage"/> and <see cref="tToken"/> fields provide additional clarity reading
-        /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
-        /// </remarks>
-        private readonly struct Type2 : IEquatable<Type2>
-        {
-            /// <summary>
-            /// The type of registered message.
-            /// </summary>
-            private readonly Type tMessage;
-
-            /// <summary>
-            /// The type of registration token.
-            /// </summary>
-            private readonly Type tToken;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Type2"/> struct.
-            /// </summary>
-            /// <param name="tMessage">The type of registered message.</param>
-            /// <param name="tToken">The type of registration token.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Type2(Type tMessage, Type tToken)
-            {
-                this.tMessage = tMessage;
-                this.tToken = tToken;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Type2 other)
-            {
-                // We can't just use reference equality, as that's technically not guaranteed
-                // to work and might fail in very rare cases (eg. with type forwarding between
-                // different assemblies). Instead, we can use the == operator to compare for
-                // equality, which still avoids the callvirt overhead of calling Type.Equals,
-                // and is also implemented as a JIT intrinsic on runtimes such as .NET Core.
-                return
-                    this.tMessage == other.tMessage &&
-                    this.tToken == other.tToken;
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj)
-            {
-                return obj is Type2 other && Equals(other);
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    // To combine the two hashes, we can simply use the fast djb2 hash algorithm.
-                    // This is not a problem in this case since we already know that the base
-                    // RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution.
-                    int hash = RuntimeHelpers.GetHashCode(this.tMessage);
-
-                    hash = (hash << 5) + hash;
-
-                    hash += RuntimeHelpers.GetHashCode(this.tToken);
-
-                    return hash;
-                }
-            }
-        }
-
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
         /// </summary>
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
deleted file mode 100644
index 67dfbc1c7ea..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/MessengerExtensions.Unit.cs
+++ /dev/null
@@ -1,41 +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 System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Messaging
-{
-    /// <summary>
-    /// Extensions for the <see cref="IMessenger"/> type.
-    /// </summary>
-    public static partial class MessengerExtensions
-    {
-        /// <summary>
-        /// An empty type representing a generic token with no specific value.
-        /// </summary>
-        private readonly struct Unit : IEquatable<Unit>
-        {
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Unit other)
-            {
-                return true;
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj)
-            {
-                return obj is Unit;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public override int GetHashCode()
-            {
-                return 0;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 91ed0800868..643038edeeb 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -10,6 +10,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.Collections.Extensions;
+using Microsoft.Toolkit.Mvvm.Messaging.Internals;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -397,80 +398,6 @@ public void Dispose()
             }
         }
 
-        /// <summary>
-        /// A simple type representing an immutable pair of types.
-        /// </summary>
-        /// <remarks>
-        /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> as it's faster in its
-        /// <see cref="GetHashCode"/> and <see cref="IEquatable{T}.Equals(T)"/> methods, and because
-        /// unlike a value tuple it exposes its fields as immutable. Additionally, the
-        /// <see cref="TMessage"/> and <see cref="TToken"/> fields provide additional clarity reading
-        /// the code compared to <see cref="ValueTuple{T1,T2}.Item1"/> and <see cref="ValueTuple{T1,T2}.Item2"/>.
-        /// </remarks>
-        private readonly struct Type2 : IEquatable<Type2>
-        {
-            /// <summary>
-            /// The type of registered message.
-            /// </summary>
-            public readonly Type TMessage;
-
-            /// <summary>
-            /// The type of registration token.
-            /// </summary>
-            public readonly Type TToken;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Type2"/> struct.
-            /// </summary>
-            /// <param name="tMessage">The type of registered message.</param>
-            /// <param name="tToken">The type of registration token.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Type2(Type tMessage, Type tToken)
-            {
-                TMessage = tMessage;
-                TToken = tToken;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Type2 other)
-            {
-                // We can't just use reference equality, as that's technically not guaranteed
-                // to work and might fail in very rare cases (eg. with type forwarding between
-                // different assemblies). Instead, we can use the == operator to compare for
-                // equality, which still avoids the callvirt overhead of calling Type.Equals,
-                // and is also implemented as a JIT intrinsic on runtimes such as .NET Core.
-                return
-                    TMessage == other.TMessage &&
-                    TToken == other.TToken;
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj)
-            {
-                return obj is Type2 other && Equals(other);
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    // To combine the two hashes, we can simply use the fast djb2 hash algorithm.
-                    // This is not a problem in this case since we already know that the base
-                    // RuntimeHelpers.GetHashCode method is providing hashes with a good enough distribution.
-                    int hash = RuntimeHelpers.GetHashCode(TMessage);
-
-                    hash = (hash << 5) + hash;
-
-                    hash += RuntimeHelpers.GetHashCode(TToken);
-
-                    return hash;
-                }
-            }
-        }
-
         /// <summary>
         /// Throws an <see cref="InvalidOperationException"/> when trying to add a duplicate handler.
         /// </summary>

From c6553d1f41482c27e7ef6a2b53246e0eee77d8f2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 13 Sep 2020 12:55:56 +0200
Subject: [PATCH 489/595] Removed some unnecessary bounds checks

---
 Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 643038edeeb..04125dbb2ef 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -206,16 +206,15 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 ReadOnlySpan<object>
                     recipientsSpan = recipients.Span,
                     handlersSpan = handlers.Span;
-                int handlersCount = recipients.Count;
 
-                for (int i = 0; i < handlersCount; i++)
+                for (int i = 0; i < recipientsSpan.Length; i++)
                 {
                     // Just like in the other messenger, here we need an unsafe cast to be able to
                     // invoke a generic delegate with a contravariant input argument, with a less
                     // derived reference, without reflection. This is guaranteed to work by how the
                     // messenger tracks registered recipients and their associated handlers, so the
                     // type conversion will always be valid (the recipients are the rigth instances).
-                    Unsafe.As<MessageHandler<object, TMessage>>(handlersSpan[i])(recipientsSpan![i], message);
+                    Unsafe.As<MessageHandler<object, TMessage>>(handlersSpan[i])(recipientsSpan[i], message);
                 }
             }
             finally

From 6f0f7c3ac0b1c6c927465773f1cb9f8c1b41a076 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 13 Sep 2020 13:06:01 +0200
Subject: [PATCH 490/595] Minor code refactoring

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 54 +++++++++----------
 .../DictionarySlim{TKey,TValue}.cs            |  7 ---
 .../IDictionarySlim{TKey}.cs                  |  9 +---
 3 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index 20ed40b52ab..af3e60e17ad 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -168,13 +168,13 @@ public void UnregisterAll(object recipient)
                             // dictionary (a hashed collection) only costs O(1) in the best case, while
                             // if we had tried to iterate the whole dictionary every time we would have
                             // paid an O(n) minimum cost for each single remove operation.
-                            this.typesMap.Remove(mapping.TypeArguments);
+                            this.typesMap.TryRemove(mapping.TypeArguments, out _);
                         }
                     }
                 }
 
                 // Remove the associated set in the recipients map
-                this.recipientsMap.Remove(key);
+                this.recipientsMap.TryRemove(key, out _);
             }
         }
 
@@ -242,26 +242,24 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
 
                     // Try to remove the registered handler for the input token,
                     // for the current message type (unknown from here).
-                    if (holder.Remove(token))
+                    if (holder.TryRemove(token, out _) &&
+                        holder.Count == 0)
                     {
-                        if (holder.Count == 0)
-                        {
-                            // If the map is empty, remove the recipient entirely from its container
-                            map.Remove(key);
+                        // If the map is empty, remove the recipient entirely from its container
+                        map.TryRemove(key, out _);
 
-                            if (map.Count == 0)
+                        if (map.Count == 0)
+                        {
+                            // If no handlers are left at all for the recipient, across all
+                            // message types and token types, remove the set of mappings
+                            // entirely for the current recipient, and lost the strong
+                            // reference to it as well. This is the same situation that
+                            // would've been achieved by just calling UnregisterAll(recipient).
+                            set.Remove(Unsafe.As<IMapping>(map));
+
+                            if (set.Count == 0)
                             {
-                                // If no handlers are left at all for the recipient, across all
-                                // message types and token types, remove the set of mappings
-                                // entirely for the current recipient, and lost the strong
-                                // reference to it as well. This is the same situation that
-                                // would've been achieved by just calling UnregisterAll(recipient).
-                                set.Remove(Unsafe.As<IMapping>(map));
-
-                                if (set.Count == 0)
-                                {
-                                    this.recipientsMap.Remove(key);
-                                }
+                                this.recipientsMap.TryRemove(key, out _);
                             }
                         }
                     }
@@ -309,25 +307,23 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                 }
 
                 // Remove the target handler
-                if (dictionary!.Remove(token))
+                if (dictionary!.TryRemove(token, out _) &&
+                    dictionary.Count == 0)
                 {
                     // If the map is empty, it means that the current recipient has no remaining
                     // registered handlers for the current <TMessage, TToken> combination, regardless,
                     // of the specific token value (ie. the channel used to receive messages of that type).
                     // We can remove the map entirely from this container, and remove the link to the map itself
                     // to the current mapping between existing registered recipients (or entire recipients too).
-                    if (dictionary.Count == 0)
-                    {
-                        mapping.Remove(key);
+                    mapping.TryRemove(key, out _);
 
-                        HashSet<IMapping> set = this.recipientsMap[key];
+                    HashSet<IMapping> set = this.recipientsMap[key];
 
-                        set.Remove(mapping);
+                    set.Remove(mapping);
 
-                        if (set.Count == 0)
-                        {
-                            this.recipientsMap.Remove(key);
-                        }
+                    if (set.Count == 0)
+                    {
+                        this.recipientsMap.TryRemove(key, out _);
                     }
                 }
             }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index ab4706de5f7..a117912073b 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -218,13 +218,6 @@ public bool TryRemove(TKey key, out object? result)
             return false;
         }
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool Remove(TKey key)
-        {
-            return TryRemove(key, out _);
-        }
-
         /// <summary>
         /// Gets the value for the specified key, or, if the key is not present,
         /// adds an entry and returns the value by ref. This makes it possible to
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 7de2505148a..04b2fcdf358 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -14,18 +14,11 @@ internal interface IDictionarySlim<in TKey> : IDictionarySlim
         where TKey : IEquatable<TKey>
     {
         /// <summary>
-        /// Tries to remove a value with a specified key.
+        /// Tries to remove a value with a specified key, if present.
         /// </summary>
         /// <param name="key">The key of the value to remove.</param>
         /// <param name="result">The removed value, if it was present.</param>
         /// <returns>.Whether or not the key was present.</returns>
         bool TryRemove(TKey key, out object? result);
-
-        /// <summary>
-        /// Removes an item from the dictionary with the specified key, if present.
-        /// </summary>
-        /// <param name="key">The key of the item to remove.</param>
-        /// <returns>Whether or not an item was removed.</returns>
-        bool Remove(TKey key);
     }
 }

From 9d8cff68e295ab513776919090de15d181cc9012 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 13 Sep 2020 20:51:37 +0200
Subject: [PATCH 491/595] Fixed a merge error, minor code refactoring

---
 .../DictionarySlim{TKey,TValue}.cs            | 19 +++++++++++++++++--
 .../IDictionarySlim{TKey}.cs                  | 10 +---------
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs |  6 +++---
 .../Messaging/WeakRefMessenger.cs             |  8 ++++----
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
index 1eecd25f275..11012a1e350 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
@@ -130,7 +130,11 @@ public void Clear()
             this.entries = InitialEntries;
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Checks whether or not the dictionary contains a pair with a specified key.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <returns>Whether or not the key was present in the dictionary.</returns>
         public bool ContainsKey(TKey key)
         {
             Entry[] entries = this.entries;
@@ -176,7 +180,18 @@ public bool TryGetValue(TKey key, out TValue? value)
         }
 
         /// <inheritdoc/>
-        public bool TryRemove(TKey key, out object? result)
+        public bool TryRemove(TKey key)
+        {
+            return TryRemove(key, out _);
+        }
+
+        /// <summary>
+        /// Tries to remove a value with a specified key, if present.
+        /// </summary>
+        /// <param name="key">The key of the value to remove.</param>
+        /// <param name="result">The removed value, if it was present.</param>
+        /// <returns>Whether or not the key was present.</returns>
+        public bool TryRemove(TKey key, out TValue? result)
         {
             Entry[] entries = this.entries;
             int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
index 30d4677360a..eeb4fa75f60 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
@@ -13,19 +13,11 @@ namespace Microsoft.Collections.Extensions
     internal interface IDictionarySlim<in TKey> : IDictionarySlim
         where TKey : IEquatable<TKey>
     {
-        /// <summary>
-        /// Checks whether or not the dictionary contains a pair with a specified key.
-        /// </summary>
-        /// <param name="key">The key to look for.</param>
-        /// <returns>Whether or not the key was present in the dictionary.</returns>
-        public bool ContainsKey(TKey key);
-
         /// <summary>
         /// Tries to remove a value with a specified key, if present.
         /// </summary>
         /// <param name="key">The key of the value to remove.</param>
-        /// <param name="result">The removed value, if it was present.</param>
         /// <returns>Whether or not the key was present.</returns>
-        bool TryRemove(TKey key, out object? result);
+        bool TryRemove(TKey key);
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index dac82acc0c1..eb993b0731d 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -157,7 +157,7 @@ public void UnregisterAll(object recipient)
                 // Removes all the lists of registered handlers for the recipient
                 foreach (IMapping mapping in set!)
                 {
-                    if (mapping.TryRemove(key, out _))
+                    if (mapping.TryRemove(key))
                     {
                         if (mapping.Count == 0)
                         {
@@ -243,11 +243,11 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
 
                     // Try to remove the registered handler for the input token,
                     // for the current message type (unknown from here).
-                    if (holder.TryRemove(token, out _) &&
+                    if (holder.TryRemove(token) &&
                         holder.Count == 0)
                     {
                         // If the map is empty, remove the recipient entirely from its container
-                        map.TryRemove(key, out _);
+                        map.TryRemove(key);
 
                         if (map.Count == 0)
                         {
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 04125dbb2ef..13d9d3dd4a1 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -65,7 +65,7 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
                 return
                     this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table) &&
                     table!.TryGetValue(recipient, out IDictionarySlim mapping) &&
-                    Unsafe.As<IDictionarySlim<TToken>>(mapping).ContainsKey(token);
+                    Unsafe.As<DictionarySlim<TToken, object>>(mapping).ContainsKey(token);
             }
         }
 
@@ -133,7 +133,7 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                     if (enumerator.Key.TToken == typeof(TToken) &&
                         enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
                     {
-                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                        Unsafe.As<DictionarySlim<TToken, object>>(mapping).TryRemove(token, out _);
                     }
                 }
             }
@@ -156,7 +156,7 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
                     if (enumerator.Key.Equals(type2) &&
                         enumerator.Value.TryGetValue(recipient, out IDictionarySlim mapping))
                     {
-                        Unsafe.As<IDictionarySlim<TToken>>(mapping).TryRemove(token, out _);
+                        Unsafe.As<DictionarySlim<TToken, object>>(mapping).TryRemove(token, out _);
                     }
                 }
             }
@@ -275,7 +275,7 @@ void IMessenger.Cleanup()
                 // Remove all the mappings with no handlers left
                 foreach (Type2 key in type2s.Span)
                 {
-                    this.recipientsMap.Remove(key);
+                    this.recipientsMap.TryRemove(key, out _);
                 }
             }
         }

From 15a0c3b59ec6a57cf34a25a6609a1caf31942b61 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 00:15:28 +0200
Subject: [PATCH 492/595] Minor code tweaks

---
 .../Messaging/WeakRefMessenger.cs                 | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 13d9d3dd4a1..fa7091e3a5e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -8,7 +8,6 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using Microsoft.Collections.Extensions;
 using Microsoft.Toolkit.Mvvm.Messaging.Internals;
 
@@ -293,7 +292,7 @@ public void Reset()
         /// A simple buffer writer implementation using pooled arrays.
         /// </summary>
         /// <typeparam name="T">The type of items to store in the list.</typeparam>
-        public sealed class ArrayPoolBufferWriter<T> : IDisposable
+        private sealed class ArrayPoolBufferWriter<T> : IDisposable
         {
             /// <summary>
             /// The default buffer size to use to expand empty arrays.
@@ -325,17 +324,7 @@ public ArrayPoolBufferWriter()
             public ReadOnlySpan<T> Span
             {
                 [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-                    T[] array = this.array;
-
-                    if (this.index > 0)
-                    {
-                        return MemoryMarshal.CreateReadOnlySpan(ref array[0], this.index);
-                    }
-
-                    return default;
-                }
+                get => this.array.AsSpan(0, this.index);
             }
 
             /// <summary>

From 1cf168b3929d25d298654fc7622afb6873fae834 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 00:39:26 +0200
Subject: [PATCH 493/595] Backported weak messenger to .NET Standard 2.0

---
 .../Messaging/WeakRefMessenger.cs             | 103 ++++++++++++++++--
 1 file changed, 92 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index fa7091e3a5e..974d17e3e4e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -2,14 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD2_1
-
 using System;
 using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
 using Microsoft.Toolkit.Mvvm.Messaging.Internals;
+#if NETSTANDARD2_1
+using RecipientsTable = System.Runtime.CompilerServices.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
+#else
+using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.WeakRefMessenger.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
+#endif
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
 {
@@ -42,8 +45,7 @@ public sealed class WeakRefMessenger : IMessenger
         /// <summary>
         /// The map of currently registered recipients for all message types.
         /// </summary>
-        private readonly DictionarySlim<Type2, ConditionalWeakTable<object, IDictionarySlim>> recipientsMap
-            = new DictionarySlim<Type2, ConditionalWeakTable<object, IDictionarySlim>>();
+        private readonly DictionarySlim<Type2, RecipientsTable> recipientsMap = new DictionarySlim<Type2, RecipientsTable>();
 
         /// <summary>
         /// Gets the default <see cref="WeakRefMessenger"/> instance.
@@ -62,8 +64,8 @@ public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
                 // Get the conditional table associated with the target recipient, for the current pair
                 // of token and message types. If it exists, check if there is a matching token.
                 return
-                    this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table) &&
-                    table!.TryGetValue(recipient, out IDictionarySlim mapping) &&
+                    this.recipientsMap.TryGetValue(type2, out RecipientsTable? table) &&
+                    table!.TryGetValue(recipient, out IDictionarySlim? mapping) &&
                     Unsafe.As<DictionarySlim<TToken, object>>(mapping).ContainsKey(token);
             }
         }
@@ -79,9 +81,9 @@ public void Register<TRecipient, TMessage, TToken>(TRecipient recipient, TToken
                 Type2 type2 = new Type2(typeof(TMessage), typeof(TToken));
 
                 // Get the conditional table for the pair of type arguments, or create it if it doesn't exist
-                ref ConditionalWeakTable<object, IDictionarySlim>? mapping = ref this.recipientsMap.GetOrAddValueRef(type2);
+                ref RecipientsTable? mapping = ref this.recipientsMap.GetOrAddValueRef(type2);
 
-                mapping ??= new ConditionalWeakTable<object, IDictionarySlim>();
+                mapping ??= new RecipientsTable();
 
                 // Get or create the handlers dictionary for the target recipient
                 var map = Unsafe.As<DictionarySlim<TToken, object>>(mapping.GetValue(recipient, _ => new DictionarySlim<TToken, object>()));
@@ -174,7 +176,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                 Type2 type2 = new Type2(typeof(TMessage), typeof(TToken));
 
                 // Try to get the target table
-                if (!this.recipientsMap.TryGetValue(type2, out ConditionalWeakTable<object, IDictionarySlim>? table))
+                if (!this.recipientsMap.TryGetValue(type2, out RecipientsTable? table))
                 {
                     return message;
                 }
@@ -288,6 +290,87 @@ public void Reset()
             }
         }
 
+#if !NETSTANDARD2_1
+        /// <summary>
+        /// A wrapper for <see cref="System.Runtime.CompilerServices.ConditionalWeakTable{TKey,TValue}"/>
+        /// that backports the enumerable support to .NET Standard 2.0 through an auxiliary list.
+        /// </summary>
+        /// <typeparam name="TKey">Tke key of items to store in the table.</typeparam>
+        /// <typeparam name="TValue">The values to store in the table.</typeparam>
+        internal sealed class ConditionalWeakTable<TKey, TValue>
+            where TKey : class
+            where TValue : class?
+        {
+            /// <summary>
+            /// The underlying <see cref="System.Runtime.CompilerServices.ConditionalWeakTable{TKey,TValue}"/> instance.
+            /// </summary>
+            private readonly System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> table;
+
+            /// <summary>
+            /// A supporting linked list to store keys in <see cref="table"/>. This is needed to expose
+            /// the ability to enumerate existing keys when there is no support for that in the BCL.
+            /// </summary>
+            private readonly LinkedList<WeakReference<TKey>> keys;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="ConditionalWeakTable{TKey, TValue}"/> class.
+            /// </summary>
+            public ConditionalWeakTable()
+            {
+                this.table = new System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue>();
+                this.keys = new LinkedList<WeakReference<TKey>>();
+            }
+
+            /// <inheritdoc cref="System.Runtime.CompilerServices.ConditionalWeakTable{TKey,TValue}.TryGetValue"/>
+            public bool TryGetValue(TKey key, out TValue value)
+            {
+                return this.table.TryGetValue(key, out value);
+            }
+
+            /// <inheritdoc cref="System.Runtime.CompilerServices.ConditionalWeakTable{TKey,TValue}.GetValue"/>
+            public TValue GetValue(TKey key, System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue>.CreateValueCallback createValueCallback)
+            {
+                // Get or create the value. When this method returns, the key will be present in the table
+                TValue value = this.table.GetValue(key, createValueCallback);
+
+                // Check if the list of keys contains the given key.
+                // If it does, we can just stop here and return the result.
+                foreach (WeakReference<TKey> node in this.keys)
+                {
+                    if (node.TryGetTarget(out TKey? target) &&
+                        ReferenceEquals(target, key))
+                    {
+                        return value;
+                    }
+                }
+
+                // Add the key to the list of weak references to track it
+                this.keys.AddFirst(new WeakReference<TKey>(key));
+
+                return value;
+            }
+
+            /// <inheritdoc cref="System.Runtime.CompilerServices.ConditionalWeakTable{TKey,TValue}.Remove"/>
+            public bool Remove(TKey key)
+            {
+                return this.table.Remove(key);
+            }
+
+            /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
+            public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+            {
+                foreach (WeakReference<TKey> node in this.keys)
+                {
+                    if (node.TryGetTarget(out TKey? target) &&
+                        this.table.TryGetValue(target, out TValue value))
+                    {
+                        yield return new KeyValuePair<TKey, TValue>(target, value);
+                    }
+                }
+            }
+        }
+#endif
+
         /// <summary>
         /// A simple buffer writer implementation using pooled arrays.
         /// </summary>
@@ -395,5 +478,3 @@ private static void ThrowInvalidOperationExceptionForDuplicateRegistration()
         }
     }
 }
-
-#endif

From 9e7f12adb9b6d8d475dc97ad5b671162f5be41a1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 00:43:51 +0200
Subject: [PATCH 494/595] Enabled weak messenger tests on .NET Standard 2.0

---
 .../Mvvm/Test_Messenger.Request.cs            | 22 ------------
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 34 -------------------
 .../Mvvm/Test_ObservableRecipient.cs          |  8 -----
 3 files changed, 64 deletions(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index 0d3c9b48d60..6d116009a1f 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -16,9 +16,7 @@ public partial class Test_Messenger
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RequestMessage_Ok(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -47,9 +45,7 @@ void Receive(object recipient, NumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         {
@@ -61,9 +57,7 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -88,9 +82,7 @@ public class NumberRequestMessage : RequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -115,9 +107,7 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -149,9 +139,7 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         {
@@ -163,9 +151,7 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -190,9 +176,7 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -212,9 +196,7 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -269,9 +251,7 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -291,9 +271,7 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index a429baa7552..7ed62e3bc00 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -14,9 +14,7 @@ public partial class Test_Messenger
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -28,9 +26,7 @@ public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -42,9 +38,7 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -56,9 +50,7 @@ public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -70,9 +62,7 @@ public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -88,9 +78,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type ty
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -106,9 +94,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -124,9 +110,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -142,9 +126,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -184,9 +166,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -216,9 +196,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -248,9 +226,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -267,9 +243,7 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -286,9 +260,7 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type typ
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IRecipient_NoMessages(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -303,9 +275,7 @@ public void Test_Messenger_IRecipient_NoMessages(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -338,9 +308,7 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -377,9 +345,7 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_Messenger_RegisterWithTypeParameter(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index be41663f116..5a3c91505b5 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -16,9 +16,7 @@ public class Test_ObservableRecipient
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_ObservableRecipient_Activation(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -40,9 +38,7 @@ public void Test_ObservableRecipient_Activation(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_ObservableRecipient_IsSame(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -63,9 +59,7 @@ public void Test_ObservableRecipient_Default()
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_ObservableRecipient_Injection(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -77,9 +71,7 @@ public void Test_ObservableRecipient_Injection(Type type)
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(Messenger))]
-#if NETCOREAPP3_1
         [DataRow(typeof(WeakRefMessenger))]
-#endif
         public void Test_ObservableRecipient_Broadcast(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);

From 8212a9580d2b4cf97842f78a5ee6e2327c0c3e0c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 01:09:29 +0200
Subject: [PATCH 495/595] Improved cleanup on .NET Standard 2.0 polyfill

---
 .../Messaging/WeakRefMessenger.cs             | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 974d17e3e4e..136966dacd2 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -271,6 +271,11 @@ void IMessenger.Cleanup()
                     {
                         type2s.Add(enumerator.Key);
                     }
+
+#if !NETSTANDARD2_1
+                    // Do the cleanup for the list of keys that are weakly tracked too
+                    enumerator.Value.Cleanup();
+#endif
                 }
 
                 // Remove all the mappings with no handlers left
@@ -368,6 +373,25 @@ public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
                     }
                 }
             }
+
+            /// <summary>
+            /// Trims the list of tracked <typeparamref name="TKey"/> instances.
+            /// </summary>
+            public void Cleanup()
+            {
+                for (LinkedListNode<WeakReference<TKey>>? node = this.keys.First; !(node is null);)
+                {
+                    LinkedListNode<WeakReference<TKey>>? next = node.Next;
+
+                    // Remove all the nodes with a target that has been collected
+                    if (!node.Value.TryGetTarget(out _))
+                    {
+                        this.keys.Remove(node);
+                    }
+
+                    node = next;
+                }
+            }
         }
 #endif
 

From 0e9e7dbd8a5575583474ab49a58f087e88ac496d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 01:17:48 +0200
Subject: [PATCH 496/595] Removed explicit interface implementation

---
 Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 136966dacd2..92caa1f216f 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -228,7 +228,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
         }
 
         /// <inheritdoc/>
-        void IMessenger.Cleanup()
+        public void Cleanup()
         {
             lock (this.recipientsMap)
             {

From 72a2236fe87b7c646065bfe9f95e32d8b897a84e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 12:58:46 +0200
Subject: [PATCH 497/595] Minor code refactoring

---
 Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
index eb993b0731d..bf7d01932a2 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
@@ -157,20 +157,18 @@ public void UnregisterAll(object recipient)
                 // Removes all the lists of registered handlers for the recipient
                 foreach (IMapping mapping in set!)
                 {
-                    if (mapping.TryRemove(key))
+                    if (mapping.TryRemove(key) &&
+                        mapping.Count == 0)
                     {
-                        if (mapping.Count == 0)
-                        {
-                            // Maps here are really of type Mapping<,> and with unknown type arguments.
-                            // If after removing the current recipient a given map becomes empty, it means
-                            // that there are no registered recipients at all for a given pair of message
-                            // and token types. In that case, we also remove the map from the types map.
-                            // The reason for keeping a key in each mapping is that removing items from a
-                            // dictionary (a hashed collection) only costs O(1) in the best case, while
-                            // if we had tried to iterate the whole dictionary every time we would have
-                            // paid an O(n) minimum cost for each single remove operation.
-                            this.typesMap.TryRemove(mapping.TypeArguments, out _);
-                        }
+                        // Maps here are really of type Mapping<,> and with unknown type arguments.
+                        // If after removing the current recipient a given map becomes empty, it means
+                        // that there are no registered recipients at all for a given pair of message
+                        // and token types. In that case, we also remove the map from the types map.
+                        // The reason for keeping a key in each mapping is that removing items from a
+                        // dictionary (a hashed collection) only costs O(1) in the best case, while
+                        // if we had tried to iterate the whole dictionary every time we would have
+                        // paid an O(n) minimum cost for each single remove operation.
+                        this.typesMap.TryRemove(mapping.TypeArguments, out _);
                     }
                 }
 
@@ -249,19 +247,16 @@ public void UnregisterAll<TToken>(object recipient, TToken token)
                         // If the map is empty, remove the recipient entirely from its container
                         map.TryRemove(key);
 
-                        if (map.Count == 0)
+                        // If no handlers are left at all for the recipient, across all
+                        // message types and token types, remove the set of mappings
+                        // entirely for the current recipient, and lost the strong
+                        // reference to it as well. This is the same situation that
+                        // would've been achieved by just calling UnregisterAll(recipient).
+                        if (map.Count == 0 &&
+                            set.Remove(Unsafe.As<IMapping>(map)) &&
+                            set.Count == 0)
                         {
-                            // If no handlers are left at all for the recipient, across all
-                            // message types and token types, remove the set of mappings
-                            // entirely for the current recipient, and lost the strong
-                            // reference to it as well. This is the same situation that
-                            // would've been achieved by just calling UnregisterAll(recipient).
-                            set.Remove(Unsafe.As<IMapping>(map));
-
-                            if (set.Count == 0)
-                            {
-                                this.recipientsMap.TryRemove(key, out _);
-                            }
+                            this.recipientsMap.TryRemove(key, out _);
                         }
                     }
                 }
@@ -320,9 +315,8 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
 
                     HashSet<IMapping> set = this.recipientsMap[key];
 
-                    set.Remove(mapping);
-
-                    if (set.Count == 0)
+                    if (set.Remove(mapping) &&
+                        set.Count == 0)
                     {
                         this.recipientsMap.TryRemove(key, out _);
                     }

From f583a66548f04618bc14145884f7d41b0a6bf649 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 13:03:17 +0200
Subject: [PATCH 498/595] Added auto trimming to CVT<,> polyfill

---
 .../Messaging/WeakRefMessenger.cs             | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index 92caa1f216f..fd020b4c1be 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -271,11 +271,6 @@ public void Cleanup()
                     {
                         type2s.Add(enumerator.Key);
                     }
-
-#if !NETSTANDARD2_1
-                    // Do the cleanup for the list of keys that are weakly tracked too
-                    enumerator.Value.Cleanup();
-#endif
                 }
 
                 // Remove all the mappings with no handlers left
@@ -363,29 +358,20 @@ public bool Remove(TKey key)
 
             /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
             public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-            {
-                foreach (WeakReference<TKey> node in this.keys)
-                {
-                    if (node.TryGetTarget(out TKey? target) &&
-                        this.table.TryGetValue(target, out TValue value))
-                    {
-                        yield return new KeyValuePair<TKey, TValue>(target, value);
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Trims the list of tracked <typeparamref name="TKey"/> instances.
-            /// </summary>
-            public void Cleanup()
             {
                 for (LinkedListNode<WeakReference<TKey>>? node = this.keys.First; !(node is null);)
                 {
                     LinkedListNode<WeakReference<TKey>>? next = node.Next;
 
-                    // Remove all the nodes with a target that has been collected
-                    if (!node.Value.TryGetTarget(out _))
+                    // Get the key and value for the current node
+                    if (node.Value.TryGetTarget(out TKey? target) &&
+                        this.table.TryGetValue(target!, out TValue value))
+                    {
+                        yield return new KeyValuePair<TKey, TValue>(target, value);
+                    }
+                    else
                     {
+                        // If the current key has been collected, trim the list
                         this.keys.Remove(node);
                     }
 

From 8c17b0af7157ae0bc4c1e2169c0c96cb26afe3b1 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 13:51:33 +0200
Subject: [PATCH 499/595] Added recipient garbage collect test

---
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 7ed62e3bc00..08f843c2e08 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -360,6 +360,36 @@ public void Test_Messenger_RegisterWithTypeParameter(Type type)
             Assert.AreEqual(number, 42);
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(Messenger), false)]
+        [DataRow(typeof(WeakRefMessenger), true)]
+        public void Test_Messenger_Collect_Test(Type type, bool isWeak)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+
+            WeakReference weakRecipient;
+
+            void Test()
+            {
+                var recipient = new RecipientWithNoMessages { Number = 42 };
+                weakRecipient = new WeakReference(recipient);
+
+                messenger.Register<MessageA>(recipient, (r, m) => { });
+
+                Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+                Assert.IsTrue(weakRecipient.IsAlive);
+
+                GC.KeepAlive(recipient);
+            }
+
+            Test();
+
+            GC.Collect();
+
+            Assert.AreEqual(!isWeak, weakRecipient.IsAlive);
+        }
+
         public sealed class RecipientWithNoMessages
         {
             public int Number { get; set; }

From d7f3f5b1e5b6bf3b2d6358f720669cc903136a83 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 11 Sep 2020 14:46:19 -0700
Subject: [PATCH 500/595] Increased build timeout.

---
 azure-pipelines.yml | 100 +++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76470fb759b..da1643e6abc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,61 +12,65 @@ pool:
 variables: 
   BuildConfiguration: Release
 
-steps:
-- task: BatchScript@1
-  inputs:
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
-    arguments: -no_logo
-    modifyEnvironment: true
-  displayName: Setup Environment Variables
+jobs:
+- job: ToolkitBuild
+  timeoutInMinutes: 120
   
-- task: NuGetToolInstaller@0
-  displayName: Use NuGet 5.6.0
-  inputs:
-    versionSpec: 5.6.0
+  steps:
+  - task: BatchScript@1
+    inputs:
+      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+      arguments: -no_logo
+      modifyEnvironment: true
+    displayName: Setup Environment Variables
 
-- task: DotNetCoreCLI@2  
-  inputs:
-    command: custom
-    custom: tool
-    arguments: install --tool-path . nbgv
-  displayName: Install NBGV tool
+  - task: NuGetToolInstaller@0
+    displayName: Use NuGet 5.6.0
+    inputs:
+      versionSpec: 5.6.0
 
-- script: nbgv cloud
-  displayName: Set Version
+  - task: DotNetCoreCLI@2  
+    inputs:
+      command: custom
+      custom: tool
+      arguments: install --tool-path . nbgv
+    displayName: Install NBGV tool
 
-#- powershell: .\build\Install-WindowsSdkISO.ps1 18362
-#  displayName: Insider SDK
+  - script: nbgv cloud
+    displayName: Set Version
 
-- powershell: .\build\build.ps1 -target=Build
-  displayName: Build
+  #- powershell: .\build\Install-WindowsSdkISO.ps1 18362
+  #  displayName: Insider SDK
 
-- powershell: .\build\build.ps1 -target=Test
-  displayName: Test
+  - powershell: .\build\build.ps1 -target=Build
+    displayName: Build
 
-- powershell: .\build\build.ps1 -target=Package
-  displayName: Package
+  - powershell: .\build\build.ps1 -target=Test
+    displayName: Test
 
-- task: PublishTestResults@2
-  inputs:
-    testResultsFormat: 'VSTest'
-    testResultsFiles: '**/VsTestResults*.trx'
-  displayName: Publish Test Results
-  condition: succeededOrFailed()
+  - powershell: .\build\build.ps1 -target=Package
+    displayName: Package
 
-- task: PowerShell@2
-  displayName: Authenticode Sign Packages
-  inputs:
-    filePath: build/Sign-Package.ps1
-  env:
-    SignClientUser: $(SignClientUser)
-    SignClientSecret: $(SignClientSecret)
-    ArtifactDirectory: bin\nupkg
-  condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: 'VSTest'
+      testResultsFiles: '**/VsTestResults*.trx'
+    displayName: Publish Test Results
+    condition: succeededOrFailed()
 
-- task: PublishBuildArtifacts@1
-  displayName: Publish Package Artifacts
-  inputs:
-    pathToPublish: .\bin\nupkg
-    artifactType: container
-    artifactName: Packages
+  - task: PowerShell@2
+    displayName: Authenticode Sign Packages
+    inputs:
+      filePath: build/Sign-Package.ps1
+    env:
+      SignClientUser: $(SignClientUser)
+      SignClientSecret: $(SignClientSecret)
+      ArtifactDirectory: bin\nupkg
+    condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Package Artifacts
+    inputs:
+      pathToPublish: .\bin\nupkg
+      artifactType: container
+      artifactName: Packages

From 603e9d8612491eeb17e3440afbc62f8c0b88bf79 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 19:15:33 +0200
Subject: [PATCH 501/595] Removed unnecessary property

---
 Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
index fd020b4c1be..1ed74093c38 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
@@ -420,15 +420,6 @@ public ReadOnlySpan<T> Span
                 get => this.array.AsSpan(0, this.index);
             }
 
-            /// <summary>
-            /// Gets the current number of items.
-            /// </summary>
-            public int Count
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get => this.index;
-            }
-
             /// <summary>
             /// Adds a new item to the current collection.
             /// </summary>

From 2613c566281e9158e5bde2c3b3033b69794677ec Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 19:28:59 +0200
Subject: [PATCH 502/595] Improved test coverage

---
 .../Mvvm/Test_AsyncRelayCommand{T}.cs         | 141 ++++++++++++++++++
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 127 +++++++++++++++-
 .../Mvvm/Test_RelayCommand{T}.cs              |  20 ++-
 .../UnitTests.Shared.projitems                |   1 +
 4 files changed, 285 insertions(+), 4 deletions(-)
 create mode 100644 UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs
new file mode 100644
index 00000000000..bf6320fa083
--- /dev/null
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs
@@ -0,0 +1,141 @@
+// 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.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Mvvm
+{
+    [TestClass]
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Generic type")]
+    public class Test_AsyncRelayCommandOfT
+    {
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public async Task Test_AsyncRelayCommandOfT_AlwaysEnabled()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand<string>(async s =>
+            {
+                await Task.Delay(1000);
+                ticks = int.Parse(s);
+                await Task.Delay(1000);
+            });
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute("1"));
+
+            (object, EventArgs) args = default;
+
+            command.CanExecuteChanged += (s, e) => args = (s, e);
+
+            command.NotifyCanExecuteChanged();
+
+            Assert.AreSame(args.Item1, command);
+            Assert.AreSame(args.Item2, EventArgs.Empty);
+
+            Assert.IsNull(command.ExecutionTask);
+            Assert.IsFalse(command.IsRunning);
+
+            Task task = command.ExecuteAsync((object)"42");
+
+            Assert.IsNotNull(command.ExecutionTask);
+            Assert.AreSame(command.ExecutionTask, task);
+            Assert.IsTrue(command.IsRunning);
+
+            await task;
+
+            Assert.IsFalse(command.IsRunning);
+
+            Assert.AreEqual(ticks, 42);
+
+            command.Execute("2");
+
+            await command.ExecutionTask!;
+
+            Assert.AreEqual(ticks, 2);
+
+            Assert.ThrowsException<InvalidCastException>(() => command.Execute(new object()));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_AsyncRelayCommandOfT_WithCanExecuteFunctionTrue()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand<string>(
+                s =>
+            {
+                ticks = int.Parse(s);
+                return Task.CompletedTask;
+            }, s => true);
+
+            Assert.IsTrue(command.CanExecute(null));
+            Assert.IsTrue(command.CanExecute("1"));
+
+            command.Execute("42");
+
+            Assert.AreEqual(ticks, 42);
+
+            command.Execute("2");
+
+            Assert.AreEqual(ticks, 2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_AsyncRelayCommandOfT_WithCanExecuteFunctionFalse()
+        {
+            int ticks = 0;
+
+            var command = new AsyncRelayCommand<string>(
+                s =>
+            {
+                ticks = int.Parse(s);
+                return Task.CompletedTask;
+            }, s => false);
+
+            Assert.IsFalse(command.CanExecute(null));
+            Assert.IsFalse(command.CanExecute("1"));
+
+            command.Execute("2");
+
+            Assert.AreEqual(ticks, 0);
+
+            command.Execute("42");
+
+            Assert.AreEqual(ticks, 0);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_AsyncRelayCommandOfT_NullWithValueType()
+        {
+            int n = 0;
+
+            var command = new AsyncRelayCommand<int>(i =>
+            {
+                n = i;
+                return Task.CompletedTask;
+            });
+
+            // Special case for null value types
+            Assert.IsTrue(command.CanExecute(null));
+
+            command = new AsyncRelayCommand<int>(
+                i =>
+            {
+                n = i;
+                return Task.CompletedTask;
+            }, i => i > 0);
+
+            Assert.ThrowsException<NullReferenceException>(() => command.CanExecute(null));
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 08f843c2e08..2b20d0f9ab5 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Linq;
+using System.Reflection;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -390,13 +392,134 @@ void Test()
             Assert.AreEqual(!isWeak, weakRecipient.IsAlive);
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(Messenger))]
+        [DataRow(typeof(WeakRefMessenger))]
+        public void Test_Messenger_Reset(Type type)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+            var recipient = new RecipientWithSomeMessages();
+
+            messenger.RegisterAll(recipient);
+
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient));
+
+            messenger.Reset();
+
+            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
+            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(Messenger))]
+        [DataRow(typeof(WeakRefMessenger))]
+        public void Test_Messenger_Default(Type type)
+        {
+            PropertyInfo defaultInfo = type.GetProperty("Default");
+
+            var default1 = defaultInfo!.GetValue(null);
+            var default2 = defaultInfo!.GetValue(null);
+
+            Assert.IsNotNull(default1);
+            Assert.IsNotNull(default2);
+            Assert.AreSame(default1, default2);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(Messenger))]
+        [DataRow(typeof(WeakRefMessenger))]
+        public void Test_Messenger_Cleanup(Type type)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+            var recipient = new RecipientWithSomeMessages();
+
+            messenger.Register<MessageA>(recipient);
+
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+
+            void Test()
+            {
+                var recipient2 = new RecipientWithSomeMessages();
+
+                messenger.Register<MessageB>(recipient2);
+
+                Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient2));
+
+                GC.KeepAlive(recipient2);
+            }
+
+            Test();
+
+            GC.Collect();
+
+            // Here we just check that calling Cleanup doesn't alter the state
+            // of the messenger. This method shouldn't really do anything visible
+            // to consumers, it's just a way for messengers to compact their data.
+            messenger.Cleanup();
+
+            Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(Messenger))]
+        [DataRow(typeof(WeakRefMessenger))]
+        public void Test_Messenger_ManyRecipients(Type type)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+
+            void Test()
+            {
+                var recipients = Enumerable.Range(0, 512).Select(_ => new RecipientWithSomeMessages()).ToArray();
+
+                foreach (var recipient in recipients)
+                {
+                    messenger.RegisterAll(recipient);
+                }
+
+                foreach (var recipient in recipients)
+                {
+                    Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
+                    Assert.IsTrue(messenger.IsRegistered<MessageB>(recipient));
+                }
+
+                messenger.Send<MessageA>();
+                messenger.Send<MessageB>();
+                messenger.Send<MessageB>();
+
+                foreach (var recipient in recipients)
+                {
+                    Assert.AreEqual(recipient.As, 1);
+                    Assert.AreEqual(recipient.Bs, 2);
+                }
+
+                foreach (ref var recipient in recipients.AsSpan())
+                {
+                    recipient = null;
+                }
+            }
+
+            Test();
+
+            GC.Collect();
+
+            // Just invoke a final cleanup to improve coverage, this is unrelated to this test in particular
+            messenger.Cleanup();
+        }
+
         public sealed class RecipientWithNoMessages
         {
             public int Number { get; set; }
         }
 
-        public sealed class RecipientWithSomeMessages
-             : IRecipient<MessageA>, ICloneable, IRecipient<MessageB>
+        public sealed class RecipientWithSomeMessages :
+            IRecipient<MessageA>,
+            IRecipient<MessageB>,
+            ICloneable
         {
             public int As { get; private set; }
 
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
index d2e13e7ed21..1c606b4b884 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
@@ -35,7 +35,7 @@ public void Test_RelayCommandOfT_AlwaysEnabled()
             Assert.AreSame(args.Item1, command);
             Assert.AreSame(args.Item2, EventArgs.Empty);
 
-            command.Execute("Hello");
+            command.Execute((object)"Hello");
 
             Assert.AreEqual(text, "Hello");
 
@@ -57,7 +57,7 @@ public void Test_RelayCommand_WithCanExecuteFunction()
 
             Assert.ThrowsException<InvalidCastException>(() => command.CanExecute(new object()));
 
-            command.Execute("Hello");
+            command.Execute((object)"Hello");
 
             Assert.AreEqual(text, "Hello");
 
@@ -65,5 +65,21 @@ public void Test_RelayCommand_WithCanExecuteFunction()
 
             Assert.AreEqual(text, "Hello");
         }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_RelayCommand_NullWithValueType()
+        {
+            int n = 0;
+
+            var command = new RelayCommand<int>(i => n = i);
+
+            // Special case for null value types
+            Assert.IsTrue(command.CanExecute(null));
+
+            command = new RelayCommand<int>(i => n = i, i => i > 0);
+
+            Assert.ThrowsException<NullReferenceException>(() => command.CanExecute(null));
+        }
     }
 }
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
index 14147cede7e..bf9d2c9745f 100644
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
@@ -23,6 +23,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_TypeExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ValueTypeExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_AsyncRelayCommand{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Ioc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.Request.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_Messenger.cs" />

From 9b21cd0e30da9d3e4931af421410ac037a1fa104 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 22:43:03 +0200
Subject: [PATCH 503/595] Removed unnecessary code

---
 .../Buffers/StringPool.cs                     | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
index 757b9b5fdb5..d2a98ae8c94 100644
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -327,11 +327,6 @@ private struct FixedSizePriorityMap
             /// </summary>
             private const int EndOfList = -1;
 
-            /// <summary>
-            /// The index representing the negative offset for the start of the free list.
-            /// </summary>
-            private const int StartOfFreeList = -3;
-
             /// <summary>
             /// The array of 1-based indices for the <see cref="MapEntry"/> items stored in <see cref="mapEntries"/>.
             /// </summary>
@@ -352,11 +347,6 @@ private struct FixedSizePriorityMap
             /// </summary>
             private int count;
 
-            /// <summary>
-            /// The 1-based index for the start of the free list within <see cref="mapEntries"/>.
-            /// </summary>
-            private int freeList;
-
             /// <summary>
             /// The current incremental timestamp for the items stored in <see cref="heapEntries"/>.
             /// </summary>
@@ -414,7 +404,6 @@ public FixedSizePriorityMap(int capacity)
                 this.mapEntries = new MapEntry[capacity];
                 this.heapEntries = new HeapEntry[capacity];
                 this.count = 0;
-                this.freeList = EndOfList;
                 this.timestamp = 0;
             }
 
@@ -525,7 +514,6 @@ public void Reset()
                 this.mapEntries.AsSpan().Clear();
                 this.heapEntries.AsSpan().Clear();
                 this.count = 0;
-                this.freeList = EndOfList;
                 this.timestamp = 0;
             }
 
@@ -575,22 +563,11 @@ private unsafe void Insert(string value, int hashcode)
                 ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
                 int entryIndex, heapIndex;
 
-                // If the free list is not empty, get that map node and update the field
-                if (this.freeList != EndOfList)
-                {
-                    entryIndex = this.freeList;
-                    heapIndex = this.count;
-
-                    int nextIndex = Unsafe.Add(ref mapEntriesRef, (IntPtr)(void*)(uint)entryIndex).NextIndex;
-
-                    // Update the free list pointer: either to the next free node or to the invalid marker
-                    this.freeList = StartOfFreeList - nextIndex;
-                }
-                else if (this.count == this.mapEntries.Length)
+                // If the current map is full, first get the oldest value, which is
+                // always the first item in the heap. Then, free up a slot by
+                // removing that, and insert the new value in that empty location.
+                if (this.count == this.mapEntries.Length)
                 {
-                    // If the current map is full, first get the oldest value, which is
-                    // always the first item in the heap. Then, free up a slot by
-                    // removing that, and insert the new value in that empty location.
                     entryIndex = heapEntriesRef.MapIndex;
                     heapIndex = 0;
 
@@ -605,6 +582,7 @@ private unsafe void Insert(string value, int hashcode)
                 }
                 else
                 {
+                    // If the free list is not empty, get that map node and update the field
                     entryIndex = this.count;
                     heapIndex = this.count;
                 }

From 1739fb8195f2479772747328c2a755df6b987761 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 14 Sep 2020 22:51:06 +0200
Subject: [PATCH 504/595] Improved code coverage

---
 .../Buffers/Test_StringPool.cs                | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
index 8c1ff9a7436..b679609d40a 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Microsoft.Toolkit.HighPerformance.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -126,6 +127,40 @@ public void Test_StringPool_Add_Misc()
             Assert.AreSame(windowsCommunityToolkit, windowsCommunityToolkit2);
         }
 
+        [TestCategory("StringPool")]
+        [TestMethod]
+        public void Test_StringPool_Add_Overwrite()
+        {
+            var pool = new StringPool();
+
+            var today = DateTime.Today;
+
+            var text1 = ToStringNoInlining(today);
+
+            pool.Add(text1);
+
+            Assert.IsTrue(pool.TryGet(text1.AsSpan(), out string? result));
+
+            Assert.AreSame(text1, result);
+
+            var text2 = ToStringNoInlining(today);
+
+            pool.Add(text2);
+
+            Assert.IsTrue(pool.TryGet(text2.AsSpan(), out result));
+
+            Assert.AreNotSame(text1, result);
+            Assert.AreSame(text2, result);
+        }
+
+        // Separate method just to ensure the JIT can't optimize things away
+        // and make the test fail because different string instances are interned
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static string ToStringNoInlining(object obj)
+        {
+            return obj.ToString();
+        }
+
         [TestCategory("StringPool")]
         [TestMethod]
         public void Test_StringPool_GetOrAdd_String_Empty()

From 99f18d638847122f3b225c05f29c83bd1b649b8c Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 14 Sep 2020 14:49:36 -0700
Subject: [PATCH 505/595] Timeout tests.

---
 UITests/UITests.App/UITests.App.csproj | 70 ++++++++++++++++++++++++++
 azure-pipelines.yml                    |  3 +-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 4f72f9f1867..4222962d2a1 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -171,6 +171,76 @@
   <ItemGroup>
     <None Include="UITests.App.pfx" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj">
+      <Project>{7e30d48c-4cd8-47be-b557-10a20391dcc4}</Project>
+      <Name>Microsoft.Toolkit.HighPerformance</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj">
+      <Project>{d82ae6e1-e612-434e-acb2-363ee48738d3}</Project>
+      <Name>Microsoft.Toolkit.Mvvm</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
+      <Project>{42ca4935-54be-42ea-ac19-992378c08de6}</Project>
+      <Name>Microsoft.Toolkit.Parsers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Services\Microsoft.Toolkit.Services.csproj">
+      <Project>{34398053-fc70-4243-84f9-f355defff66d}</Project>
+      <Name>Microsoft.Toolkit.Services</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
+      <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
+      <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.csproj">
+      <Project>{e7697922-9555-4cfb-aee0-c5f4d657e559}</Project>
+      <Name>Microsoft.Toolkit.Uwp.DeveloperTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj">
+      <Project>{a5e98964-45b1-442d-a07a-298a3221d81e}</Project>
+      <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Notifications\Microsoft.Toolkit.Uwp.Notifications.csproj">
+      <Project>{97ee849b-403c-490e-80ed-d19d7cc153fd}</Project>
+      <Name>Microsoft.Toolkit.Uwp.Notifications</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj">
+      <Project>{b24a296c-b3eb-4e06-a64e-74ac2d1acc91}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Animations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj">
+      <Project>{daeb9cec-c817-33b2-74b2-bc379380db72}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj">
+      <Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj">
+      <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+      <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj">
+      <Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Media</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj">
+      <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
+      <Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
+      <Name>Microsoft.Toolkit.Uwp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
+      <Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
+      <Name>Microsoft.Toolkit</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index da1643e6abc..cd54edb8644 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -47,6 +47,7 @@ jobs:
 
   - powershell: .\build\build.ps1 -target=Test
     displayName: Test
+    timeoutInMinutes: 15
 
   - powershell: .\build\build.ps1 -target=Package
     displayName: Package
@@ -56,7 +57,7 @@ jobs:
       testResultsFormat: 'VSTest'
       testResultsFiles: '**/VsTestResults*.trx'
     displayName: Publish Test Results
-    condition: succeededOrFailed()
+    condition: always()
 
   - task: PowerShell@2
     displayName: Authenticode Sign Packages

From d8854e09453382a084dcfe56e7f65190e367f8f6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 15 Sep 2020 20:28:11 +0200
Subject: [PATCH 506/595] Renamed messenger types

---
 .../ComponentModel/ObservableRecipient.cs     |  4 +-
 ...ssenger.cs => StrongReferenceMessenger.cs} |  8 +-
 ...Messenger.cs => WeakReferenceMessenger.cs} | 10 +--
 UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs   |  2 +-
 .../Mvvm/Test_Messenger.Request.cs            | 44 +++++-----
 .../UnitTests.Shared/Mvvm/Test_Messenger.cs   | 88 +++++++++----------
 .../Mvvm/Test_ObservableRecipient.cs          | 18 ++--
 7 files changed, 87 insertions(+), 87 deletions(-)
 rename Microsoft.Toolkit.Mvvm/Messaging/{Messenger.cs => StrongReferenceMessenger.cs} (98%)
 rename Microsoft.Toolkit.Mvvm/Messaging/{WeakRefMessenger.cs => WeakReferenceMessenger.cs} (98%)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index 81b87dffb90..85c178cfa7e 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -26,11 +26,11 @@ public abstract class ObservableRecipient : ObservableObject
         /// Initializes a new instance of the <see cref="ObservableRecipient"/> class.
         /// </summary>
         /// <remarks>
-        /// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/> instance
+        /// This constructor will produce an instance that will use the <see cref="WeakReferenceMessenger.Default"/> instance
         /// to perform requested operations. It will also be available locally through the <see cref="Messenger"/> property.
         /// </remarks>
         protected ObservableRecipient()
-            : this(Messaging.Messenger.Default)
+            : this(WeakReferenceMessenger.Default)
         {
         }
 
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
similarity index 98%
rename from Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
index bf7d01932a2..5f4d5dccdec 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
@@ -19,9 +19,9 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// This <see cref="IMessenger"/> implementation uses strong references to track the registered
     /// recipients, so it is necessary to manually unregister them when they're no longer needed.
     /// </remarks>
-    public sealed class Messenger : IMessenger
+    public sealed class StrongReferenceMessenger : IMessenger
     {
-        // The Messenger class uses the following logic to link stored instances together:
+        // This messenger uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
         // DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
         //                    |                   \________________[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
@@ -84,9 +84,9 @@ public sealed class Messenger : IMessenger
         private readonly DictionarySlim<Type2, IMapping> typesMap = new DictionarySlim<Type2, IMapping>();
 
         /// <summary>
-        /// Gets the default <see cref="Messenger"/> instance.
+        /// Gets the default <see cref="StrongReferenceMessenger"/> instance.
         /// </summary>
-        public static Messenger Default { get; } = new Messenger();
+        public static StrongReferenceMessenger Default { get; } = new StrongReferenceMessenger();
 
         /// <inheritdoc/>
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
similarity index 98%
rename from Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
rename to Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
index 1ed74093c38..0a3a8717c0e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
@@ -11,7 +11,7 @@
 #if NETSTANDARD2_1
 using RecipientsTable = System.Runtime.CompilerServices.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
 #else
-using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.WeakRefMessenger.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
+using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.WeakReferenceMessenger.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
 #endif
 
 namespace Microsoft.Toolkit.Mvvm.Messaging
@@ -23,9 +23,9 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
     /// This <see cref="IMessenger"/> implementation uses weak references to track the registered
     /// recipients, so it is not necessary to manually unregister them when they're no longer needed.
     /// </remarks>
-    public sealed class WeakRefMessenger : IMessenger
+    public sealed class WeakReferenceMessenger : IMessenger
     {
-        // The WeakRefMessenger class uses the following logic to link stored instances together:
+        // This messenger uses the following logic to link stored instances together:
         // --------------------------------------------------------------------------------------------------------
         //                          DictionarySlim<TToken, MessageHandler<TRecipient, TMessage>> mapping
         //                                           /                                   /          /
@@ -48,9 +48,9 @@ public sealed class WeakRefMessenger : IMessenger
         private readonly DictionarySlim<Type2, RecipientsTable> recipientsMap = new DictionarySlim<Type2, RecipientsTable>();
 
         /// <summary>
-        /// Gets the default <see cref="WeakRefMessenger"/> instance.
+        /// Gets the default <see cref="WeakReferenceMessenger"/> instance.
         /// </summary>
-        public static WeakRefMessenger Default { get; } = new WeakRefMessenger();
+        public static WeakReferenceMessenger Default { get; } = new WeakReferenceMessenger();
 
         /// <inheritdoc/>
         public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
index 44fbf61301e..5dc0bd92230 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs
@@ -62,7 +62,7 @@ public void Test_Ioc_LambdaInitialization_ConcreteType()
         public void Test_Ioc_LambdaInitialization_ConstructorInjection()
         {
             var ioc = new Ioc();
-            var messenger = new Messenger();
+            var messenger = new StrongReferenceMessenger();
 
             ioc.ConfigureServices(services =>
             {
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
index 6d116009a1f..24ef9067ff5 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
@@ -15,8 +15,8 @@ public partial class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RequestMessage_Ok(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -44,8 +44,8 @@ void Receive(object recipient, NumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
         {
@@ -56,8 +56,8 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         [ExpectedException(typeof(InvalidOperationException))]
         public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -81,8 +81,8 @@ public class NumberRequestMessage : RequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -106,8 +106,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -138,8 +138,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
         {
@@ -150,8 +150,8 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         [ExpectedException(typeof(InvalidOperationException))]
         public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
         {
@@ -175,8 +175,8 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -195,8 +195,8 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -250,8 +250,8 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -270,8 +270,8 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 2b20d0f9ab5..f0939b8859b 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -15,8 +15,8 @@ public partial class Test_Messenger
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -27,8 +27,8 @@ public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -39,8 +39,8 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_UnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -51,8 +51,8 @@ public void Test_Messenger_UnregisterRecipientWithToken(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -63,8 +63,8 @@ public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -79,8 +79,8 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type ty
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -95,8 +95,8 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -111,8 +111,8 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -127,8 +127,8 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -167,8 +167,8 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -197,8 +197,8 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -227,8 +227,8 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -244,8 +244,8 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -261,8 +261,8 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type typ
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IRecipient_NoMessages(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -276,8 +276,8 @@ public void Test_Messenger_IRecipient_NoMessages(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -309,8 +309,8 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -346,8 +346,8 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_RegisterWithTypeParameter(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -364,8 +364,8 @@ public void Test_Messenger_RegisterWithTypeParameter(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger), false)]
-        [DataRow(typeof(WeakRefMessenger), true)]
+        [DataRow(typeof(StrongReferenceMessenger), false)]
+        [DataRow(typeof(WeakReferenceMessenger), true)]
         public void Test_Messenger_Collect_Test(Type type, bool isWeak)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -394,8 +394,8 @@ void Test()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_Reset(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -414,8 +414,8 @@ public void Test_Messenger_Reset(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_Default(Type type)
         {
             PropertyInfo defaultInfo = type.GetProperty("Default");
@@ -430,8 +430,8 @@ public void Test_Messenger_Default(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_Cleanup(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -466,8 +466,8 @@ void Test()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_Messenger_ManyRecipients(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index 5a3c91505b5..5ef526ba758 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -15,8 +15,8 @@ public class Test_ObservableRecipient
     {
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_ObservableRecipient_Activation(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -37,8 +37,8 @@ public void Test_ObservableRecipient_Activation(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_ObservableRecipient_IsSame(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -53,13 +53,13 @@ public void Test_ObservableRecipient_Default()
         {
             var viewmodel = new SomeRecipient<int>();
 
-            Assert.AreSame(viewmodel.CurrentMessenger, Messenger.Default);
+            Assert.AreSame(viewmodel.CurrentMessenger, StrongReferenceMessenger.Default);
         }
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_ObservableRecipient_Injection(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -70,8 +70,8 @@ public void Test_ObservableRecipient_Injection(Type type)
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        [DataRow(typeof(Messenger))]
-        [DataRow(typeof(WeakRefMessenger))]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
         public void Test_ObservableRecipient_Broadcast(Type type)
         {
             var messenger = (IMessenger)Activator.CreateInstance(type);

From 2a3cf84de1a67f6cda10a669e7d1a2045806825c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 15 Sep 2020 21:22:51 +0200
Subject: [PATCH 507/595] Added missing file headers

---
 Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs | 6 +++++-
 Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
index 0b254562e95..411b8809ba6 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.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.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
index 5748643cf83..6f136210b34 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.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.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.Mvvm.Messaging.Internals

From 915fdc7e3b1a7fcd461e4bbdd924755016197216 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 15 Sep 2020 12:35:53 -0700
Subject: [PATCH 508/595] Fix infinite canvas json parsing regression.

---
 ...initeCanvasVirtualDrawingSurface.Render.cs |  21 ++--
 .../JsonConverters/Matrix3x2Converter.cs      |   7 ++
 .../Assets/Samples/InfiniteCanvasExport.json  | 102 ++++++++++++++++++
 .../Test_InfiniteCanvas_Regression.cs         |  43 ++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   2 +
 5 files changed, 168 insertions(+), 7 deletions(-)
 create mode 100644 UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
 create mode 100644 UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
index 269d7523312..bb9a7648252 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
@@ -81,7 +81,7 @@ internal string GetSerializedList()
             return JsonSerializer.Serialize(exportModel, GetJsonSerializerOptions());
         }
 
-        private JsonSerializerOptions GetJsonSerializerOptions()
+        private static JsonSerializerOptions GetJsonSerializerOptions()
         {
             var jsonSerializerOptions = new JsonSerializerOptions
             {
@@ -95,13 +95,8 @@ private JsonSerializerOptions GetJsonSerializerOptions()
             return jsonSerializerOptions;
         }
 
-        internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
+        internal static List<IDrawable> LoadJson(string json)
         {
-            _visibleList.Clear();
-            _drawableList.Clear();
-            _undoCommands.Clear();
-            _redoCommands.Clear();
-
             var token = JsonDocument.Parse(json);
             List<IDrawable> newList;
             if (token.RootElement.ValueKind == JsonValueKind.Array)
@@ -114,6 +109,18 @@ internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
                 newList = JsonSerializer.Deserialize<InkCanvasExportModel>(json, GetJsonSerializerOptions()).DrawableList;
             }
 
+            return newList;
+        }
+
+        internal void RenderFromJsonAndDraw(Rect viewPort, string json, float zoom)
+        {
+            _visibleList.Clear();
+            _drawableList.Clear();
+            _undoCommands.Clear();
+            _redoCommands.Clear();
+
+            var newList = LoadJson(json);
+
             foreach (var drawable in newList)
             {
                 _drawableList.Add(drawable);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
index c74e26889bb..3fbbd9211d9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
@@ -52,6 +52,13 @@ public override Matrix3x2 Read(ref Utf8JsonReader reader, Type typeToConvert, Js
                         case "M32":
                             matrix.M32 = reader.GetSingle();
                             break;
+                        case "IsIdentity":
+                            // Ignore, as it is readonly, and from v1
+                            break;
+                        case "Translation":
+                            var translation = JsonSerializer.Deserialize<Vector2>(ref reader);
+                            matrix.Translation = translation;
+                            break;
                     }
                 }
             }
diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
new file mode 100644
index 00000000000..08a856e87a9
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
@@ -0,0 +1,102 @@
+{
+  "DrawableList": [
+    {
+      "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls",
+      "SerializableStrokeList": [
+        {
+          "DrawingAttributes": {
+            "Color": {
+              "A": 255,
+              "R": 0,
+              "G": 0,
+              "B": 0
+            },
+            "FitToCurve": true,
+            "IgnorePressure": false,
+            "IgnoreTilt": true,
+            "Size": {
+              "Width": 4.0,
+              "Height": 4.0,
+              "IsEmpty": false
+            },
+            "PenTip": 0,
+            "PenTipTransform": {
+              "M11": 1.0,
+              "M12": 0.0,
+              "M21": 0.0,
+              "M22": 1.0,
+              "M31": 0.0,
+              "M32": 0.0,
+              "IsIdentity": true,
+              "Translation": {
+                "X": 0.0,
+                "Y": 0.0
+              }
+            },
+            "DrawAsHighlighter": false
+          },
+          "SerializableFinalPointList": [
+            {
+              "Position": {
+                "X": 103.97531127929688,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            },
+            {
+              "Position": {
+                "X": 103.80825805664063,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            },
+            {
+              "Position": {
+                "X": 103.41259002685547,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            }
+          ],
+          "SerializableDrawingAttributesKind": 0,
+          "SerializableDrawingAttributesPencilProperties": null,
+          "PointTransform": {
+            "M11": 1.0,
+            "M12": 0.0,
+            "M21": 0.0,
+            "M22": 1.0,
+            "M31": 0.0,
+            "M32": 0.0,
+            "IsIdentity": true,
+            "Translation": {
+              "X": 0.0,
+              "Y": 0.0
+            }
+          }
+        }
+      ],
+      "Bounds": {
+        "X": 69.949455261230469,
+        "Y": 28.069997787475586,
+        "Width": 1668.2589111328125,
+        "Height": 280.38735961914062,
+        "Left": 69.949455261230469,
+        "Top": 28.069997787475586,
+        "Right": 1738.2083740234375,
+        "Bottom": 308.45736694335938,
+        "IsEmpty": false
+      },
+      "IsActive": true
+    }
+  ],
+  "Version": 1
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
new file mode 100644
index 00000000000..5c52be75339
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
@@ -0,0 +1,43 @@
+// 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.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Windows.ApplicationModel.Core;
+using Windows.UI.Core;
+
+namespace UnitTests.UI.Controls
+{
+    [TestClass]
+    public class Test_InfiniteCanvas_Regression
+    {
+        [TestCategory("InfiniteCanvas")]
+        [TestMethod]
+        public async Task Test_InfiniteCanvas_LoadsV1File()
+        {
+            var taskSource = new TaskCompletionSource<object>();
+            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(
+                CoreDispatcherPriority.Normal, async () =>
+                {
+                    try
+                    {
+                        string json = await StorageFileHelper.ReadTextFromPackagedFileAsync(@"Assets\Samples\InfiniteCanvasExport.json");
+
+                        InfiniteCanvasVirtualDrawingSurface.LoadJson(json).Should().NotBeEmpty();
+
+                        taskSource.SetResult(null);
+                    }
+                    catch (Exception e)
+                    {
+                        taskSource.SetException(e);
+                    }
+                });
+            await taskSource.Task;
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 4f25839b00f..a9893fa92c0 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -180,6 +180,7 @@
     <Compile Include="PrivateType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helpers\Test_WeakEventListener.cs" />
+    <Compile Include="UI\Controls\Test_InfiniteCanvas_Regression.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_General.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_InterspersedCollection.cs" />
     <Compile Include="UI\Controls\Test_MasterDetailsView.cs" />
@@ -204,6 +205,7 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include=".editorconfig" />
+    <Content Include="Assets\Samples\InfiniteCanvasExport.json" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Samples\lorem.txt" />

From ff64983b2528ec690a0d90f309a86d0a70ba670f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 15 Sep 2020 22:08:27 +0200
Subject: [PATCH 509/595] Fixed unit test (changed type after refactoring)

---
 UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
index 5ef526ba758..e40776f4244 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
@@ -53,7 +53,7 @@ public void Test_ObservableRecipient_Default()
         {
             var viewmodel = new SomeRecipient<int>();
 
-            Assert.AreSame(viewmodel.CurrentMessenger, StrongReferenceMessenger.Default);
+            Assert.AreSame(viewmodel.CurrentMessenger, WeakReferenceMessenger.Default);
         }
 
         [TestCategory("Mvvm")]

From 89dafd15cfedeaf58de6c27ea2342dc4bb3a1a6f Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 15 Sep 2020 17:03:42 -0700
Subject: [PATCH 510/595] Fixed .Net Native compilation of System.Text.Json.

---
 .../Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
index 890b5155e78..140de69eea9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
@@ -2,5 +2,6 @@
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
   <Library Name="Microsoft.Toolkit.Uwp.UI.Controls">
     <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
+    <Type Name="System.Text.Json.ReflectionMemberAccessor" Dynamic="Required All"/>
   </Library>
 </Directives>

From 49e504d862d33e94039c4f673f0a96f65a014859 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 00:03:20 +0200
Subject: [PATCH 511/595] Added T[] and MemoryManager<T> owner types

---
 .../Streams/Sources/ArrayOwner.cs             | 64 ++++++++++++++++++
 .../Streams/Sources/Interfaces/ISpanOwner.cs  | 11 ++++
 .../Streams/Sources/MemoryManagerOwner.cs     | 65 +++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
 create mode 100644 Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
 create mode 100644 Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
new file mode 100644
index 00000000000..e86aa1f3dc6
--- /dev/null
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Toolkit.HighPerformance.Extensions;
+
+namespace Microsoft.Toolkit.HighPerformance.Streams
+{
+    /// <summary>
+    /// An <see cref="ISpanOwner"/> implementation wrapping an array.
+    /// </summary>
+    internal readonly struct ArrayOwner : ISpanOwner
+    {
+        /// <summary>
+        /// The wrapped <see cref="byte"/> array.
+        /// </summary>
+        private readonly byte[] array;
+
+        /// <summary>
+        /// The starting offset within <see cref="array"/>.
+        /// </summary>
+        private readonly int offset;
+
+        /// <summary>
+        /// The usable length within <see cref="array"/>.
+        /// </summary>
+        private readonly int length;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArrayOwner"/> struct.
+        /// </summary>
+        /// <param name="array">The wrapped <see cref="byte"/> array.</param>
+        /// <param name="offset">The starting offset within <paramref name="array"/>.</param>
+        /// <param name="length">The usable length within <paramref name="array"/>.</param>
+        public ArrayOwner(byte[] array, int offset, int length)
+        {
+            this.array = array;
+            this.offset = offset;
+            this.length = length;
+        }
+
+        /// <inheritdoc/>
+        public int Length
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => this.length;
+        }
+
+        /// <inheritdoc/>
+        public Span<byte> Span
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+#if SPAN_RUNTIME_SUPPORT
+                ref byte r0 = ref this.array.DangerousGetReferenceAt(this.offset);
+
+                return MemoryMarshal.CreateSpan(ref r0, this.length);
+#else
+                return this.array.AsSpan(this.offset, this.length);
+#endif
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
new file mode 100644
index 00000000000..a384bdc93c7
--- /dev/null
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Microsoft.Toolkit.HighPerformance.Streams
+{
+    internal interface ISpanOwner
+    {
+        int Length { get; }
+
+        Span<byte> Span { get; }
+    }
+}
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
new file mode 100644
index 00000000000..9821dda128e
--- /dev/null
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Toolkit.HighPerformance.Extensions;
+
+namespace Microsoft.Toolkit.HighPerformance.Streams
+{
+    /// <summary>
+    /// An <see cref="ISpanOwner"/> implementation wrapping a <see cref="MemoryManager{T}"/> of <see cref="byte"/> instance.
+    /// </summary>
+    internal readonly struct MemoryManagerOwner : ISpanOwner
+    {
+        /// <summary>
+        /// The wrapped <see cref="MemoryManager{T}"/> instance.
+        /// </summary>
+        private readonly MemoryManager<byte> memoryManager;
+
+        /// <summary>
+        /// The starting offset within <see cref="memoryManager"/>.
+        /// </summary>
+        private readonly int offset;
+
+        /// <summary>
+        /// The usable length within <see cref="memoryManager"/>.
+        /// </summary>
+        private readonly int length;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MemoryManagerOwner"/> struct.
+        /// </summary>
+        /// <param name="memoryManager">The wrapped <see cref="MemoryManager{T}"/> instance.</param>
+        /// <param name="offset">The starting offset within <paramref name="memoryManager"/>.</param>
+        /// <param name="length">The usable length within <paramref name="memoryManager"/>.</param>
+        public MemoryManagerOwner(MemoryManager<byte> memoryManager, int offset, int length)
+        {
+            this.memoryManager = memoryManager;
+            this.offset = offset;
+            this.length = length;
+        }
+
+        /// <inheritdoc/>
+        public int Length
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => this.length;
+        }
+
+        /// <inheritdoc/>
+        public Span<byte> Span
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+#if SPAN_RUNTIME_SUPPORT
+                ref byte r0 = ref this.memoryManager.GetSpan().DangerousGetReferenceAt(this.offset);
+
+                return MemoryMarshal.CreateSpan(ref r0, this.length);
+#else
+                return this.memoryManager.GetSpan();
+#endif
+            }
+        }
+    }
+}

From 20b7a950e556de64f80264bac58540b444bfc87a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 00:36:48 +0200
Subject: [PATCH 512/595] Switched MemoryStream to generic type

---
 .../Extensions/IMemoryOwnerExtensions.cs      |  10 +-
 .../Extensions/MemoryExtensions.cs            |   2 +-
 .../Extensions/ReadOnlyMemoryExtensions.cs    |   4 +-
 .../Streams/IMemoryOwnerStream.cs             |  23 +-
 .../Streams/MemoryStream.ThrowExceptions.cs   |  75 ++---
 .../Streams/MemoryStream.Validate.cs          |  26 +-
 .../Streams/MemoryStream.cs                   | 314 ++----------------
 ...d21.cs => MemoryStream{TSource}.Memory.cs} |  24 +-
 .../Streams/MemoryStream{TSource}.cs          | 305 +++++++++++++++++
 9 files changed, 411 insertions(+), 372 deletions(-)
 rename Microsoft.Toolkit.HighPerformance/Streams/{MemoryStream.NETStandard21.cs => MemoryStream{TSource}.Memory.cs} (80%)
 create mode 100644 Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
index fbcef472cb5..59b73fe8f84 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Streams;
+using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream;
 
 namespace Microsoft.Toolkit.HighPerformance.Extensions
 {
@@ -18,17 +18,17 @@ public static class IMemoryOwnerExtensions
         /// <summary>
         /// Returns a <see cref="Stream"/> wrapping the contents of the given <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.
         /// </summary>
-        /// <param name="memory">The input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.</param>
-        /// <returns>A <see cref="Stream"/> wrapping the data within <paramref name="memory"/>.</returns>
+        /// <param name="memoryOwner">The input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.</param>
+        /// <returns>A <see cref="Stream"/> wrapping the data within <paramref name="memoryOwner"/>.</returns>
         /// <remarks>
         /// The caller does not need to track the lifetime of the input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/>
         /// instance, as the returned <see cref="Stream"/> will take care of disposing that buffer when it is closed.
         /// </remarks>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Stream AsStream(this IMemoryOwner<byte> memory)
+        public static Stream AsStream(this IMemoryOwner<byte> memoryOwner)
         {
-            return new IMemoryOwnerStream(memory);
+            return MemoryStream.Create(memoryOwner);
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
index 8c1e053a186..3e215d88bcd 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
@@ -30,7 +30,7 @@ public static class MemoryExtensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Stream AsStream(this Memory<byte> memory)
         {
-            return new MemoryStream(memory);
+            return MemoryStream.Create(memory, true);
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
index 46101e3db89..89dcd00dc86 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.IO;
-using System.Runtime.CompilerServices;
 using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream;
 
 namespace Microsoft.Toolkit.HighPerformance.Extensions
@@ -27,10 +26,9 @@ public static class ReadOnlyMemoryExtensions
         /// as the returned <see cref="Stream"/> is in use, to avoid unexpected issues.
         /// </remarks>
         [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Stream AsStream(this ReadOnlyMemory<byte> memory)
         {
-            return new MemoryStream(memory);
+            return MemoryStream.Create(memory, false);
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.cs
index c9a0a428e4b..22bab320ac5 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.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.Buffers;
 using System.IO;
 
@@ -10,21 +11,25 @@ namespace Microsoft.Toolkit.HighPerformance.Streams
     /// <summary>
     /// A <see cref="Stream"/> implementation wrapping an <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.
     /// </summary>
-    internal sealed class IMemoryOwnerStream : MemoryStream
+    /// <typeparam name="TSource">The type of source to use for the underlying data.</typeparam>
+    internal sealed class IMemoryOwnerStream<TSource> : MemoryStream<TSource>
+        where TSource : struct, ISpanOwner
     {
         /// <summary>
-        /// The <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance currently in use.
+        /// The <see cref="IDisposable"/> instance currently in use.
         /// </summary>
-        private readonly IMemoryOwner<byte> memory;
+        private readonly IDisposable disposable;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="IMemoryOwnerStream"/> class.
+        /// Initializes a new instance of the <see cref="IMemoryOwnerStream{TSource}"/> class.
         /// </summary>
-        /// <param name="memory">The input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance to use.</param>
-        public IMemoryOwnerStream(IMemoryOwner<byte> memory)
-            : base(memory.Memory)
+        /// <param name="source">The input <typeparamref name="TSource"/> instance to use.</param>
+        /// <param name="isReadOnly">Indicates whether <paramref name="source"/> can be written to.</param>
+        /// <param name="disposable">The <see cref="IDisposable"/> instance currently in use.</param>
+        public IMemoryOwnerStream(TSource source, bool isReadOnly, IDisposable disposable)
+            : base(source, isReadOnly)
         {
-            this.memory = memory;
+            this.disposable = disposable;
         }
 
         /// <inheritdoc/>
@@ -32,7 +37,7 @@ protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
 
-            this.memory.Dispose();
+            this.disposable.Dispose();
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
index 1d44a481b50..a8a86483859 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
@@ -1,31 +1,49 @@
-// 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;
 using System.IO;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
     /// <summary>
-    /// A <see cref="Stream"/> implementation wrapping a <see cref="Memory{T}"/> or <see cref="ReadOnlyMemory{T}"/> instance.
+    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
     /// </summary>
-    internal partial class MemoryStream
+    internal static partial class MemoryStream
     {
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when trying to write too many bytes to the target stream.
+        /// </summary>
+        public static void ThrowArgumentExceptionForEndOfStreamOnWrite()
+        {
+            throw new ArgumentException("The current stream can't contain the requested input data.");
+        }
+
+        /// <summary>
+        /// Throws a <see cref="NotSupportedException"/> when trying to set the length of the stream.
+        /// </summary>
+        public static void ThrowNotSupportedExceptionForSetLength()
+        {
+            throw new NotSupportedException("Setting the length is not supported for this stream.");
+        }
+
+        /// <summary>
+        /// Throws an <see cref="ArgumentException"/> when using an invalid seek mode.
+        /// </summary>
+        /// <returns>Nothing, as this method throws unconditionally.</returns>
+        public static long ThrowArgumentExceptionForSeekOrigin()
+        {
+            throw new ArgumentException("The input seek mode is not valid.", "origin");
+        }
+
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when setting the <see cref="Stream.Position"/> property.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForPosition()
         {
-            throw new ArgumentOutOfRangeException(nameof(Position), "The value for the property was not in the valid range.");
+            throw new ArgumentOutOfRangeException(nameof(Stream.Position), "The value for the property was not in the valid range.");
         }
 
         /// <summary>
         /// Throws an <see cref="ArgumentNullException"/> when an input buffer is <see langword="null"/>.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentNullExceptionForBuffer()
         {
             throw new ArgumentNullException("buffer", "The buffer is null.");
@@ -34,7 +52,6 @@ private static void ThrowArgumentNullExceptionForBuffer()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForOffset()
         {
             throw new ArgumentOutOfRangeException("offset", "Offset can't be negative.");
@@ -43,7 +60,6 @@ private static void ThrowArgumentOutOfRangeExceptionForOffset()
         /// <summary>
         /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentOutOfRangeExceptionForCount()
         {
             throw new ArgumentOutOfRangeException("count", "Count can't be negative.");
@@ -52,7 +68,6 @@ private static void ThrowArgumentOutOfRangeExceptionForCount()
         /// <summary>
         /// Throws an <see cref="ArgumentException"/> when the sum of offset and count exceeds the length of the target buffer.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowArgumentExceptionForLength()
         {
             throw new ArgumentException("The sum of offset and count can't be larger than the buffer length.", "buffer");
@@ -61,47 +76,17 @@ private static void ThrowArgumentExceptionForLength()
         /// <summary>
         /// Throws a <see cref="NotSupportedException"/> when trying to write on a readonly stream.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowNotSupportedExceptionForCanWrite()
         {
             throw new NotSupportedException("The current stream doesn't support writing.");
         }
 
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when trying to write too many bytes to the target stream.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowArgumentExceptionForEndOfStreamOnWrite()
-        {
-            throw new ArgumentException("The current stream can't contain the requested input data.");
-        }
-
-        /// <summary>
-        /// Throws a <see cref="NotSupportedException"/> when trying to set the length of the stream.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowNotSupportedExceptionForSetLength()
-        {
-            throw new NotSupportedException("Setting the length is not supported for this stream.");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when using an invalid seek mode.
-        /// </summary>
-        /// <returns>Nothing, as this method throws unconditionally.</returns>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static long ThrowArgumentExceptionForSeekOrigin()
-        {
-            throw new ArgumentException("The input seek mode is not valid.", "origin");
-        }
-
         /// <summary>
         /// Throws an <see cref="ObjectDisposedException"/> when using a disposed <see cref="Stream"/> instance.
         /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowObjectDisposedException()
         {
-            throw new ObjectDisposedException(nameof(memory), "The current stream has already been disposed");
+            throw new ObjectDisposedException("source", "The current stream has already been disposed");
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
index 7f5cf07c29f..95f4bd538fb 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
@@ -1,16 +1,12 @@
-// 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.IO;
+using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
     /// <summary>
-    /// A <see cref="Stream"/> implementation wrapping a <see cref="System.Memory{T}"/> or <see cref="System.ReadOnlyMemory{T}"/> instance.
+    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
     /// </summary>
-    internal partial class MemoryStream
+    internal static partial class MemoryStream
     {
         /// <summary>
         /// Validates the <see cref="Stream.Position"/> argument.
@@ -18,7 +14,7 @@ internal partial class MemoryStream
         /// <param name="position">The new <see cref="Stream.Position"/> value being set.</param>
         /// <param name="length">The maximum length of the target <see cref="Stream"/>.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void ValidatePosition(long position, int length)
+        public static void ValidatePosition(long position, int length)
         {
             if ((ulong)position >= (ulong)length)
             {
@@ -33,7 +29,7 @@ private static void ValidatePosition(long position, int length)
         /// <param name="offset">The offset within <paramref name="buffer"/>.</param>
         /// <param name="count">The number of elements to process within <paramref name="buffer"/>.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void ValidateBuffer(byte[]? buffer, int offset, int count)
+        public static void ValidateBuffer(byte[]? buffer, int offset, int count)
         {
             if (buffer is null)
             {
@@ -57,24 +53,24 @@ private static void ValidateBuffer(byte[]? buffer, int offset, int count)
         }
 
         /// <summary>
-        /// Validates the <see cref="CanWrite"/> property.
+        /// Validates the <see cref="MemoryStream{TSource}.CanWrite"/> property.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ValidateCanWrite()
+        public static void ValidateCanWrite(bool canWrite)
         {
-            if (!CanWrite)
+            if (!canWrite)
             {
                 ThrowNotSupportedExceptionForCanWrite();
             }
         }
 
         /// <summary>
-        /// Validates that the current instance hasn't been disposed.
+        /// Validates that a given <see cref="Stream"/> instance hasn't been disposed.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ValidateDisposed()
+        public static void ValidateDisposed(bool disposed)
         {
-            if (this.disposed)
+            if (disposed)
             {
                 ThrowObjectDisposedException();
             }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
index e8682014721..f1607634641 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
@@ -1,315 +1,67 @@
-// 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;
+using System.Buffers;
+using System.Diagnostics.Contracts;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
     /// <summary>
-    /// A <see cref="Stream"/> implementation wrapping a <see cref="Memory{T}"/> or <see cref="ReadOnlyMemory{T}"/> instance.
+    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
     /// </summary>
-    /// <remarks>
-    /// This type is not marked as <see langword="sealed"/> so that it can be inherited by
-    /// <see cref="IMemoryOwnerStream"/>, which adds the <see cref="IDisposable"/> support for
-    /// the wrapped buffer. We're not worried about the performance penalty here caused by the JIT
-    /// not being able to resolve the <see langword="callvirt"/> instruction, as this type is
-    /// only exposed as a <see cref="Stream"/> anyway, so the generated code would be the same.
-    /// </remarks>
-    internal partial class MemoryStream : Stream
+    internal static partial class MemoryStream
     {
         /// <summary>
-        /// Indicates whether <see cref="memory"/> was actually a <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        private readonly bool isReadOnly;
-
-        /// <summary>
-        /// The <see cref="Memory{T}"/> instance currently in use.
-        /// </summary>
-        private Memory<byte> memory;
-
-        /// <summary>
-        /// The current position within <see cref="memory"/>.
-        /// </summary>
-        private int position;
-
-        /// <summary>
-        /// Indicates whether or not the current instance has been disposed
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryStream"/> class.
-        /// </summary>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to use.</param>
-        public MemoryStream(Memory<byte> memory)
-        {
-            this.memory = memory;
-            this.position = 0;
-            this.isReadOnly = false;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryStream"/> class.
+        /// Creates a new <see cref="Stream"/> from the input <see cref="ReadOnlyMemory{T}"/> of <see cref="byte"/> instance.
         /// </summary>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to use.</param>
-        public MemoryStream(ReadOnlyMemory<byte> memory)
-        {
-            this.memory = MemoryMarshal.AsMemory(memory);
-            this.position = 0;
-            this.isReadOnly = true;
-        }
-
-        /// <inheritdoc/>
-        public sealed override bool CanRead
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => !this.disposed;
-        }
-
-        /// <inheritdoc/>
-        public sealed override bool CanSeek
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => !this.disposed;
-        }
-
-        /// <inheritdoc/>
-        public sealed override bool CanWrite
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => !this.isReadOnly && !this.disposed;
-        }
-
-        /// <inheritdoc/>
-        public sealed override long Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                ValidateDisposed();
-
-                return this.memory.Length;
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override long Position
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                ValidateDisposed();
-
-                return this.position;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            set
-            {
-                ValidateDisposed();
-                ValidatePosition(value, this.memory.Length);
-
-                this.position = unchecked((int)value);
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            try
-            {
-                CopyTo(destination, bufferSize);
-
-                return Task.CompletedTask;
-            }
-            catch (OperationCanceledException e)
-            {
-                return Task.FromCanceled(e.CancellationToken);
-            }
-            catch (Exception e)
-            {
-                return Task.FromException(e);
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override void Flush()
-        {
-        }
-
-        /// <inheritdoc/>
-        public sealed override Task FlushAsync(CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public sealed override Task<int> ReadAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken)
+        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance.</param>
+        /// <param name="isReadOnly">Indicates whether or not <paramref name="memory"/> can be written to.</param>
+        /// <returns>A <see cref="Stream"/> wrapping the underlying data for <paramref name="memory"/>.</returns>
+        [Pure]
+        public static Stream Create(ReadOnlyMemory<byte> memory, bool isReadOnly)
         {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled<int>(cancellationToken);
-            }
-
-            try
-            {
-                int result = Read(buffer, offset, count);
-
-                return Task.FromResult(result);
-            }
-            catch (OperationCanceledException e)
-            {
-                return Task.FromCanceled<int>(e.CancellationToken);
-            }
-            catch (Exception e)
+            if (MemoryMarshal.TryGetArray(memory, out ArraySegment<byte> segment))
             {
-                return Task.FromException<int>(e);
-            }
-        }
+                var arraySpanSource = new ArrayOwner(segment.Array!, segment.Offset, segment.Count);
 
-        /// <inheritdoc/>
-        public sealed override Task WriteAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
+                return new MemoryStream<ArrayOwner>(arraySpanSource, isReadOnly);
             }
 
-            try
+            if (MemoryMarshal.TryGetMemoryManager<byte, MemoryManager<byte>>(memory, out var memoryManager, out int start, out int length))
             {
-                Write(buffer, offset, count);
+                MemoryManagerOwner memoryManagerSpanSource = new MemoryManagerOwner(memoryManager, start, length);
 
-                return Task.CompletedTask;
-            }
-            catch (OperationCanceledException e)
-            {
-                return Task.FromCanceled(e.CancellationToken);
+                return new MemoryStream<MemoryManagerOwner>(memoryManagerSpanSource, isReadOnly);
             }
-            catch (Exception e)
-            {
-                return Task.FromException(e);
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override long Seek(long offset, SeekOrigin origin)
-        {
-            ValidateDisposed();
-
-            long index = origin switch
-            {
-                SeekOrigin.Begin => offset,
-                SeekOrigin.Current => this.position + offset,
-                SeekOrigin.End => this.memory.Length + offset,
-                _ => ThrowArgumentExceptionForSeekOrigin()
-            };
-
-            ValidatePosition(index, this.memory.Length);
 
-            this.position = unchecked((int)index);
-
-            return index;
-        }
-
-        /// <inheritdoc/>
-        public sealed override void SetLength(long value)
-        {
-            ThrowNotSupportedExceptionForSetLength();
+            throw new NotImplementedException();
         }
 
-        /// <inheritdoc/>
-        public sealed override int Read(byte[]? buffer, int offset, int count)
-        {
-            ValidateDisposed();
-            ValidateBuffer(buffer, offset, count);
-
-            int
-                bytesAvailable = this.memory.Length - this.position,
-                bytesCopied = Math.Min(bytesAvailable, count);
-
-            Span<byte>
-                source = this.memory.Span.Slice(this.position, bytesCopied),
-                destination = buffer.AsSpan(offset, bytesCopied);
-
-            source.CopyTo(destination);
-
-            this.position += bytesCopied;
-
-            return bytesCopied;
-        }
-
-        /// <inheritdoc/>
-        public sealed override int ReadByte()
+        /// <summary>
+        /// Creates a new <see cref="Stream"/> from the input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.
+        /// </summary>
+        /// <param name="memoryOwner">The input <see cref="IMemoryOwner{T}"/> instance.</param>
+        /// <returns>A <see cref="Stream"/> wrapping the underlying data for <paramref name="memoryOwner"/>.</returns>
+        [Pure]
+        public static Stream Create(IMemoryOwner<byte> memoryOwner)
         {
-            ValidateDisposed();
+            Memory<byte> memory = memoryOwner.Memory;
 
-            if (this.position == this.memory.Length)
+            if (MemoryMarshal.TryGetArray(memory, out ArraySegment<byte> segment))
             {
-                return -1;
-            }
+                var arraySpanSource = new ArrayOwner(segment.Array!, segment.Offset, segment.Count);
 
-            return this.memory.Span[this.position++];
-        }
-
-        /// <inheritdoc/>
-        public sealed override void Write(byte[]? buffer, int offset, int count)
-        {
-            ValidateDisposed();
-            ValidateCanWrite();
-            ValidateBuffer(buffer, offset, count);
-
-            Span<byte>
-                source = buffer.AsSpan(offset, count),
-                destination = this.memory.Span.Slice(this.position);
-
-            if (!source.TryCopyTo(destination))
-            {
-                ThrowArgumentExceptionForEndOfStreamOnWrite();
+                return new IMemoryOwnerStream<ArrayOwner>(arraySpanSource, false, memoryOwner);
             }
 
-            this.position += source.Length;
-        }
-
-        /// <inheritdoc/>
-        public sealed override void WriteByte(byte value)
-        {
-            ValidateDisposed();
-            ValidateCanWrite();
-
-            if (this.position == this.memory.Length)
+            if (MemoryMarshal.TryGetMemoryManager<byte, MemoryManager<byte>>(memory, out var memoryManager, out int start, out int length))
             {
-                ThrowArgumentExceptionForEndOfStreamOnWrite();
-            }
+                MemoryManagerOwner memoryManagerSpanSource = new MemoryManagerOwner(memoryManager, start, length);
 
-            this.memory.Span[this.position++] = value;
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            if (this.disposed)
-            {
-                return;
+                return new IMemoryOwnerStream<MemoryManagerOwner>(memoryManagerSpanSource, false, memoryOwner);
             }
 
-            this.disposed = true;
-            this.memory = default;
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.NETStandard21.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs
similarity index 80%
rename from Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.NETStandard21.cs
rename to Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs
index e576b94d8bf..e8c9c6fd76e 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.NETStandard21.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs
@@ -11,17 +11,15 @@
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
-    /// <summary>
-    /// A <see cref="Stream"/> implementation wrapping a <see cref="Memory{T}"/> or <see cref="ReadOnlyMemory{T}"/> instance.
-    /// </summary>
-    internal partial class MemoryStream
+    /// <inheritdoc cref="MemoryStream{TSource}"/>
+    internal partial class MemoryStream<TSource>
     {
         /// <inheritdoc/>
         public sealed override void CopyTo(Stream destination, int bufferSize)
         {
-            ValidateDisposed();
+            MemoryStream.ValidateDisposed(this.disposed);
 
-            Span<byte> source = this.memory.Span.Slice(this.position);
+            Span<byte> source = this.source.Span.Slice(this.position);
 
             this.position += source.Length;
 
@@ -79,13 +77,13 @@ public sealed override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, Cancell
         /// <inheritdoc/>
         public sealed override int Read(Span<byte> buffer)
         {
-            ValidateDisposed();
+            MemoryStream.ValidateDisposed(this.disposed);
 
             int
-                bytesAvailable = this.memory.Length - this.position,
+                bytesAvailable = this.source.Length - this.position,
                 bytesCopied = Math.Min(bytesAvailable, buffer.Length);
 
-            Span<byte> source = this.memory.Span.Slice(this.position, bytesCopied);
+            Span<byte> source = this.source.Span.Slice(this.position, bytesCopied);
 
             source.CopyTo(buffer);
 
@@ -97,14 +95,14 @@ public sealed override int Read(Span<byte> buffer)
         /// <inheritdoc/>
         public sealed override void Write(ReadOnlySpan<byte> buffer)
         {
-            ValidateDisposed();
-            ValidateCanWrite();
+            MemoryStream.ValidateDisposed(this.disposed);
+            MemoryStream.ValidateCanWrite(CanWrite);
 
-            Span<byte> destination = this.memory.Span.Slice(this.position);
+            Span<byte> destination = this.source.Span.Slice(this.position);
 
             if (!buffer.TryCopyTo(destination))
             {
-                ThrowArgumentExceptionForEndOfStreamOnWrite();
+                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
             }
 
             this.position += buffer.Length;
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs
new file mode 100644
index 00000000000..b0dcd8bc908
--- /dev/null
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs
@@ -0,0 +1,305 @@
+// 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.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.HighPerformance.Streams
+{
+    /// <summary>
+    /// A <see cref="Stream"/> implementation wrapping a <see cref="Memory{T}"/> or <see cref="ReadOnlyMemory{T}"/> instance.
+    /// </summary>
+    /// <typeparam name="TSource">The type of source to use for the underlying data.</typeparam>
+    /// <remarks>
+    /// This type is not marked as <see langword="sealed"/> so that it can be inherited by
+    /// <see cref="IMemoryOwnerStream{TSource}"/>, which adds the <see cref="IDisposable"/> support for
+    /// the wrapped buffer. We're not worried about the performance penalty here caused by the JIT
+    /// not being able to resolve the <see langword="callvirt"/> instruction, as this type is
+    /// only exposed as a <see cref="Stream"/> anyway, so the generated code would be the same.
+    /// </remarks>
+    internal partial class MemoryStream<TSource> : Stream
+        where TSource : struct, ISpanOwner
+    {
+        /// <summary>
+        /// Indicates whether <see cref="source"/> can be written to.
+        /// </summary>
+        private readonly bool isReadOnly;
+
+        /// <summary>
+        /// The <typeparamref name="TSource"/> instance currently in use.
+        /// </summary>
+        private TSource source;
+
+        /// <summary>
+        /// The current position within <see cref="source"/>.
+        /// </summary>
+        private int position;
+
+        /// <summary>
+        /// Indicates whether or not the current instance has been disposed
+        /// </summary>
+        private bool disposed;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MemoryStream{TSource}"/> class.
+        /// </summary>
+        /// <param name="source">The input <typeparamref name="TSource"/> instance to use.</param>
+        /// <param name="isReadOnly">Indicates whether <paramref name="source"/> can be written to.</param>
+        public MemoryStream(TSource source, bool isReadOnly)
+        {
+            this.source = source;
+            this.isReadOnly = isReadOnly;
+        }
+
+        /// <inheritdoc/>
+        public sealed override bool CanRead
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => !this.disposed;
+        }
+
+        /// <inheritdoc/>
+        public sealed override bool CanSeek
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => !this.disposed;
+        }
+
+        /// <inheritdoc/>
+        public sealed override bool CanWrite
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => !this.isReadOnly && !this.disposed;
+        }
+
+        /// <inheritdoc/>
+        public sealed override long Length
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+                MemoryStream.ValidateDisposed(this.disposed);
+
+                return this.source.Length;
+            }
+        }
+
+        /// <inheritdoc/>
+        public sealed override long Position
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+                MemoryStream.ValidateDisposed(this.disposed);
+
+                return this.position;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            set
+            {
+                MemoryStream.ValidateDisposed(this.disposed);
+                MemoryStream.ValidatePosition(value, this.source.Length);
+
+                this.position = unchecked((int)value);
+            }
+        }
+
+        /// <inheritdoc/>
+        public sealed override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled(cancellationToken);
+            }
+
+            try
+            {
+                CopyTo(destination, bufferSize);
+
+                return Task.CompletedTask;
+            }
+            catch (OperationCanceledException e)
+            {
+                return Task.FromCanceled(e.CancellationToken);
+            }
+            catch (Exception e)
+            {
+                return Task.FromException(e);
+            }
+        }
+
+        /// <inheritdoc/>
+        public sealed override void Flush()
+        {
+        }
+
+        /// <inheritdoc/>
+        public sealed override Task FlushAsync(CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled(cancellationToken);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        /// <inheritdoc/>
+        public sealed override Task<int> ReadAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<int>(cancellationToken);
+            }
+
+            try
+            {
+                int result = Read(buffer, offset, count);
+
+                return Task.FromResult(result);
+            }
+            catch (OperationCanceledException e)
+            {
+                return Task.FromCanceled<int>(e.CancellationToken);
+            }
+            catch (Exception e)
+            {
+                return Task.FromException<int>(e);
+            }
+        }
+
+        /// <inheritdoc/>
+        public sealed override Task WriteAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled(cancellationToken);
+            }
+
+            try
+            {
+                Write(buffer, offset, count);
+
+                return Task.CompletedTask;
+            }
+            catch (OperationCanceledException e)
+            {
+                return Task.FromCanceled(e.CancellationToken);
+            }
+            catch (Exception e)
+            {
+                return Task.FromException(e);
+            }
+        }
+
+        /// <inheritdoc/>
+        public sealed override long Seek(long offset, SeekOrigin origin)
+        {
+            MemoryStream.ValidateDisposed(this.disposed);
+
+            long index = origin switch
+            {
+                SeekOrigin.Begin => offset,
+                SeekOrigin.Current => this.position + offset,
+                SeekOrigin.End => this.source.Length + offset,
+                _ => MemoryStream.ThrowArgumentExceptionForSeekOrigin()
+            };
+
+            MemoryStream.ValidatePosition(index, this.source.Length);
+
+            this.position = unchecked((int)index);
+
+            return index;
+        }
+
+        /// <inheritdoc/>
+        public sealed override void SetLength(long value)
+        {
+            MemoryStream.ThrowNotSupportedExceptionForSetLength();
+        }
+
+        /// <inheritdoc/>
+        public sealed override int Read(byte[]? buffer, int offset, int count)
+        {
+            MemoryStream.ValidateDisposed(this.disposed);
+            MemoryStream.ValidateBuffer(buffer, offset, count);
+
+            int
+                bytesAvailable = this.source.Length - this.position,
+                bytesCopied = Math.Min(bytesAvailable, count);
+
+            Span<byte>
+                source = this.source.Span.Slice(this.position, bytesCopied),
+                destination = buffer.AsSpan(offset, bytesCopied);
+
+            source.CopyTo(destination);
+
+            this.position += bytesCopied;
+
+            return bytesCopied;
+        }
+
+        /// <inheritdoc/>
+        public sealed override int ReadByte()
+        {
+            MemoryStream.ValidateDisposed(this.disposed);
+
+            if (this.position == this.source.Length)
+            {
+                return -1;
+            }
+
+            return this.source.Span[this.position++];
+        }
+
+        /// <inheritdoc/>
+        public sealed override void Write(byte[]? buffer, int offset, int count)
+        {
+            MemoryStream.ValidateDisposed(this.disposed);
+            MemoryStream.ValidateCanWrite(CanWrite);
+            MemoryStream.ValidateBuffer(buffer, offset, count);
+
+            Span<byte>
+                source = buffer.AsSpan(offset, count),
+                destination = this.source.Span.Slice(this.position);
+
+            if (!source.TryCopyTo(destination))
+            {
+                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
+            }
+
+            this.position += source.Length;
+        }
+
+        /// <inheritdoc/>
+        public sealed override void WriteByte(byte value)
+        {
+            MemoryStream.ValidateDisposed(this.disposed);
+            MemoryStream.ValidateCanWrite(CanWrite);
+
+            if (this.position == this.source.Length)
+            {
+                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
+            }
+
+            this.source.Span[this.position++] = value;
+        }
+
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
+        {
+            if (this.disposed)
+            {
+                return;
+            }
+
+            this.disposed = true;
+            this.source = default;
+        }
+    }
+}

From ad2951e4e7b6daa689a36d3cc774dcff36971fe3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 00:59:57 +0200
Subject: [PATCH 513/595] Added empty stream as fallback path

---
 .../Streams/MemoryStream.cs                              | 6 ++++--
 .../Streams/Sources/ArrayOwner.cs                        | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
index f1607634641..959d160beb7 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
@@ -34,7 +34,8 @@ public static Stream Create(ReadOnlyMemory<byte> memory, bool isReadOnly)
                 return new MemoryStream<MemoryManagerOwner>(memoryManagerSpanSource, isReadOnly);
             }
 
-            throw new NotImplementedException();
+            // Return an empty stream if the memory was empty
+            return new MemoryStream<ArrayOwner>(ArrayOwner.Empty, isReadOnly);
         }
 
         /// <summary>
@@ -61,7 +62,8 @@ public static Stream Create(IMemoryOwner<byte> memoryOwner)
                 return new IMemoryOwnerStream<MemoryManagerOwner>(memoryManagerSpanSource, false, memoryOwner);
             }
 
-            throw new NotImplementedException();
+            // Return an empty stream if the memory was empty
+            return new IMemoryOwnerStream<ArrayOwner>(ArrayOwner.Empty, false, memoryOwner);
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
index e86aa1f3dc6..e644c1da2a9 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
@@ -38,6 +38,15 @@ public ArrayOwner(byte[] array, int offset, int length)
             this.length = length;
         }
 
+        /// <summary>
+        /// Gets an empty <see cref="ArrayOwner"/> instance.
+        /// </summary>
+        public static ArrayOwner Empty
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => new ArrayOwner(Array.Empty<byte>(), 0, 0);
+        }
+
         /// <inheritdoc/>
         public int Length
         {

From aeb8fd54f006521ec8addef47bb0f486fd82e0e3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 01:13:38 +0200
Subject: [PATCH 514/595] Fixed inverted readonly setting for MemoryStream

---
 .../Extensions/MemoryExtensions.cs                              | 2 +-
 .../Extensions/ReadOnlyMemoryExtensions.cs                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
index 3e215d88bcd..44b496170f5 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
@@ -30,7 +30,7 @@ public static class MemoryExtensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Stream AsStream(this Memory<byte> memory)
         {
-            return MemoryStream.Create(memory, true);
+            return MemoryStream.Create(memory, false);
         }
     }
 }
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
index 89dcd00dc86..0639ae39c5f 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
@@ -28,7 +28,7 @@ public static class ReadOnlyMemoryExtensions
         [Pure]
         public static Stream AsStream(this ReadOnlyMemory<byte> memory)
         {
-            return MemoryStream.Create(memory, false);
+            return MemoryStream.Create(memory, true);
         }
     }
 }

From 045aeb7f5fe4d505de9bca34bf53990cc7c9e758 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 01:17:59 +0200
Subject: [PATCH 515/595] Added missing file headers

---
 .../Streams/MemoryStream.ThrowExceptions.cs                 | 6 +++++-
 .../Streams/MemoryStream.Validate.cs                        | 6 +++++-
 Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs   | 6 +++++-
 .../Streams/Sources/ArrayOwner.cs                           | 6 +++++-
 .../Streams/Sources/Interfaces/ISpanOwner.cs                | 6 +++++-
 .../Streams/Sources/MemoryManagerOwner.cs                   | 6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
index a8a86483859..cdfc24112d5 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.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.IO;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
index 95f4bd538fb..9cd0ff62936 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
@@ -1,4 +1,8 @@
-using System.IO;
+// 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.IO;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
index 959d160beb7..13872403bdf 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.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.Buffers;
 using System.Diagnostics.Contracts;
 using System.IO;
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
index e644c1da2a9..d2d2594b5b2 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.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.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.Toolkit.HighPerformance.Extensions;
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
index a384bdc93c7..b962cd48a3b 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.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;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
index 9821dda128e..82b07c19bbe 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.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.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

From 6efa7847c785ca4c0e23b5fc1b47230c0092d714 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 01:47:50 +0200
Subject: [PATCH 516/595] Fixed potential access violation with faulty
 MemoryManager<T>-s

---
 .../Streams/Sources/ArrayOwner.cs                  |  2 ++
 .../Streams/Sources/MemoryManagerOwner.cs          | 14 +++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
index d2d2594b5b2..8749ab7682e 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
@@ -4,8 +4,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
+#if SPAN_RUNTIME_SUPPORT
 using System.Runtime.InteropServices;
 using Microsoft.Toolkit.HighPerformance.Extensions;
+#endif
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
index 82b07c19bbe..f42eb7a1ac5 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
@@ -5,8 +5,6 @@
 using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Extensions;
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
@@ -56,13 +54,11 @@ public Span<byte> Span
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
-#if SPAN_RUNTIME_SUPPORT
-                ref byte r0 = ref this.memoryManager.GetSpan().DangerousGetReferenceAt(this.offset);
-
-                return MemoryMarshal.CreateSpan(ref r0, this.length);
-#else
-                return this.memoryManager.GetSpan();
-#endif
+                // We can't use the same trick we use for arrays to optimize the creation of
+                // the offset span, as otherwise a bugged MemoryManager<T> instance returning
+                // a span of an incorrect size could cause an access violation. Instead, we just
+                // get the span and then slice it, which will validate both offset and length.
+                return this.memoryManager.GetSpan().Slice(this.offset, this.length);
             }
         }
     }

From 832a3687cb27038143a2aeaad760446b4717583c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 23:14:11 +0200
Subject: [PATCH 517/595] Renamed file to match class name

---
 .../{IMemoryOwnerStream.cs => IMemoryOwnerStream{TSource}.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Microsoft.Toolkit.HighPerformance/Streams/{IMemoryOwnerStream.cs => IMemoryOwnerStream{TSource}.cs} (100%)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs
similarity index 100%
rename from Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream.cs
rename to Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs

From 5aa2dfa93bb4fd6e03e0eef181e1b14fbae4955e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 16 Sep 2020 23:19:33 +0200
Subject: [PATCH 518/595] Added missing XML comments

---
 .../Streams/Sources/Interfaces/ISpanOwner.cs             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
index b962cd48a3b..22fd2a77a18 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
@@ -6,10 +6,19 @@
 
 namespace Microsoft.Toolkit.HighPerformance.Streams
 {
+    /// <summary>
+    /// An interface for types acting as sources for <see cref="Span{T}"/> instances.
+    /// </summary>
     internal interface ISpanOwner
     {
+        /// <summary>
+        /// Gets the length of the underlying memory area.
+        /// </summary>
         int Length { get; }
 
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> instance wrapping the underlying memory area.
+        /// </summary>
         Span<byte> Span { get; }
     }
 }

From b32b68399d632d201bf4cd5c6741dd9b2dce47c9 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:05:49 -0700
Subject: [PATCH 519/595] Update to call Extension method for GetLocalized
 directly

---
 .../Formats/MarkDown/MarkDownButtonActions.cs  |  4 ++--
 .../Formats/MarkDown/MarkDownFormatter.cs      |  8 ++++----
 .../Formats/RichText/RichTextFormatter.cs      |  2 +-
 .../Common/CommonButtons.Events.cs             | 18 +++++++++---------
 .../XamlIslandsTest_StringExtensions.cs        |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
index f25f08f4f62..1d04d86a6ee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
@@ -44,8 +44,8 @@ public override void FormatLink(ToolbarButton button, string label, string forma
         {
             var select = Formatter.Selected;
             int originalStart = Formatter.Selected.StartPosition;
-            string urlLabel = StringExtensions.GetLocalized("TextToolbarStrings_UrlLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-            string labelLabel = StringExtensions.GetLocalized("TextToolbarStrings_LabelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string urlLabel = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string labelLabel = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
 
             // Replaces Selection of first Line only.
             if (select.Text.Contains("\r"))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
index 75a714e1424..63ad112fb73 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
@@ -55,7 +55,7 @@ public void StyleHeader(ToolbarButton button)
                 {
                     Content = new MarkdownTextBlock
                     {
-                        Text = val + StringExtensions.GetLocalized("TextToolbarStrings_HeaderLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        Text = val + "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         IsTextSelectionEnabled = false
                     },
                     Tag = val,
@@ -462,7 +462,7 @@ public override ButtonMap DefaultButtons
                 QuoteButton = new ToolbarButton
                 {
                     Name = QuoteElement,
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_QuoteLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Message },
                     Activation = FormatQuote
                 };
@@ -479,13 +479,13 @@ public override ButtonMap DefaultButtons
                     {
                         Name = HeadersElement,
                         Icon = new SymbolIcon { Symbol = Symbol.FontSize },
-                        ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_HeaderLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Activation = StyleHeader
                     },
                     new ToolbarButton
                     {
                         Name = CodeElement,
-                        ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_CodeLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "TextToolbarStrings_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Icon = new FontIcon { Glyph = "{}", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                         Activation = FormatCode
                     },
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
index 6e792a24fd4..21b3e741d04 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
@@ -120,7 +120,7 @@ public override ButtonMap DefaultButtons
                 StrikeButton = CommonButtons.Strikethrough;
                 Underline = new ToolbarButton
                 {
-                    ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_UnderlineLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "TextToolbarStrings_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Underline },
                     ShortcutKey = VirtualKey.U,
                     Activation = ((RichTextButtonActions)ButtonActions).FormatUnderline
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
index 89971602e55..2707f5ec61f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
@@ -54,13 +54,13 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var labelBox = new RichEditBox
             {
-                PlaceholderText = StringExtensions.GetLocalized("TextToolbarStrings_LabelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                PlaceholderText = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 Margin = new Thickness(0, 0, 0, 5),
                 AcceptsReturn = false
             };
             var linkBox = new TextBox
             {
-                PlaceholderText = StringExtensions.GetLocalized("TextToolbarStrings_UrlLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PlaceholderText = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
 
             CheckBox relativeBox = null;
@@ -78,7 +78,7 @@ public async void OpenLinkCreator(ToolbarButton button)
             {
                 relativeBox = new CheckBox
                 {
-                    Content = StringExtensions.GetLocalized("TextToolbarStrings_RelativeLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                    Content = "TextToolbarStrings_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
                 };
                 contentPanel.Children.Add(relativeBox);
             }
@@ -89,10 +89,10 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var contentDialog = new ContentDialog
             {
-                Title = StringExtensions.GetLocalized("TextToolbarStrings_CreateLinkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                Title = "TextToolbarStrings_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 Content = contentPanel,
-                PrimaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
-                SecondaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_CancelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PrimaryButtonText = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                SecondaryButtonText = "TextToolbarStrings_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
 
             if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
@@ -107,9 +107,9 @@ public async void OpenLinkCreator(ToolbarButton button)
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.None, out string labelText);
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.FormatRtf, out string formattedlabelText);
 
-                string linkInvalidLabel = StringExtensions.GetLocalized("TextToolbarStrings_LinkInvalidLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string okLabel = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string warningLabel = StringExtensions.GetLocalized("TextToolbarStrings_WarningLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string linkInvalidLabel = "TextToolbarStrings_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string okLabel = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string warningLabel = "TextToolbarStrings_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 string linkText = linkBox.Text.Trim();
 
                 if (string.IsNullOrWhiteSpace(linkText))
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
index f63729c29d8..0ad15dc5227 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -36,7 +36,7 @@ public async Task StringExtensions_GetLocalized()
             await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
             {
                 var xamlRoot = App.XamlRoot;
-                var str = StringExtensions.GetLocalized("abc", xamlRoot.UIContext);
+                var str = "abc".GetLocalized(xamlRoot.UIContext);
                 Assert.AreEqual("ABCDEF", str);
             });
         }
@@ -44,7 +44,7 @@ await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
         [TestMethod]
         public void StringExtensions_GetLocalizedWithResourcePath()
         {
-            var str = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            var str = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
             Assert.AreEqual("Ok", str);
         }
 

From fb0dbc7a06f27c4529b78235fa95be251f387d4c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 17 Sep 2020 01:20:35 +0200
Subject: [PATCH 520/595] Removed unnecessary constructor parameter

---
 .../Streams/IMemoryOwnerStream{TSource}.cs                  | 5 ++---
 Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs   | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs
index 22bab320ac5..2dfe66e215e 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs
@@ -24,10 +24,9 @@ internal sealed class IMemoryOwnerStream<TSource> : MemoryStream<TSource>
         /// Initializes a new instance of the <see cref="IMemoryOwnerStream{TSource}"/> class.
         /// </summary>
         /// <param name="source">The input <typeparamref name="TSource"/> instance to use.</param>
-        /// <param name="isReadOnly">Indicates whether <paramref name="source"/> can be written to.</param>
         /// <param name="disposable">The <see cref="IDisposable"/> instance currently in use.</param>
-        public IMemoryOwnerStream(TSource source, bool isReadOnly, IDisposable disposable)
-            : base(source, isReadOnly)
+        public IMemoryOwnerStream(TSource source, IDisposable disposable)
+            : base(source, false)
         {
             this.disposable = disposable;
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
index 13872403bdf..247fb3833ac 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
@@ -56,18 +56,18 @@ public static Stream Create(IMemoryOwner<byte> memoryOwner)
             {
                 var arraySpanSource = new ArrayOwner(segment.Array!, segment.Offset, segment.Count);
 
-                return new IMemoryOwnerStream<ArrayOwner>(arraySpanSource, false, memoryOwner);
+                return new IMemoryOwnerStream<ArrayOwner>(arraySpanSource, memoryOwner);
             }
 
             if (MemoryMarshal.TryGetMemoryManager<byte, MemoryManager<byte>>(memory, out var memoryManager, out int start, out int length))
             {
                 MemoryManagerOwner memoryManagerSpanSource = new MemoryManagerOwner(memoryManager, start, length);
 
-                return new IMemoryOwnerStream<MemoryManagerOwner>(memoryManagerSpanSource, false, memoryOwner);
+                return new IMemoryOwnerStream<MemoryManagerOwner>(memoryManagerSpanSource, memoryOwner);
             }
 
             // Return an empty stream if the memory was empty
-            return new IMemoryOwnerStream<ArrayOwner>(ArrayOwner.Empty, false, memoryOwner);
+            return new IMemoryOwnerStream<ArrayOwner>(ArrayOwner.Empty, memoryOwner);
         }
     }
 }

From bf15828b008384abf8007f45dde9c6330df0bb6f Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:26:34 -0700
Subject: [PATCH 521/595] Align all resources to use a common 'WCT_' prefix

---
 .../Formats/MarkDown/MarkDownButtonActions.cs |  4 +-
 .../Formats/MarkDown/MarkDownFormatter.cs     |  8 +--
 .../BladeView/BladeItem.cs                    |  4 +-
 .../GridSplitter/GridSplitter.cs              |  2 +-
 .../InAppNotification/InAppNotification.cs    |  2 +-
 .../InAppNotification/InAppNotification.xaml  |  2 +-
 .../Strings/en-US/Resources.resw              | 52 +++++++++----------
 .../Formats/RichText/RichTextFormatter.cs     |  2 +-
 .../Common/CommonButtons.Events.cs            | 18 +++----
 .../ToolbarItems/Common/CommonButtons.cs      | 12 ++---
 .../TokenizingTextBox/TokenizingTextBox.cs    |  6 +--
 .../Strings/en-us/Resources.resw              |  2 +-
 .../UnitTests.UWP/Strings/fr/Resources.resw   |  2 +-
 .../Strings/en-us/Resources.resw              |  2 +-
 .../XamlIslandsTest_StringExtensions.cs       |  2 +-
 15 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
index 1d04d86a6ee..087c6f54caa 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
@@ -44,8 +44,8 @@ public override void FormatLink(ToolbarButton button, string label, string forma
         {
             var select = Formatter.Selected;
             int originalStart = Formatter.Selected.StartPosition;
-            string urlLabel = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-            string labelLabel = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string urlLabel = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string labelLabel = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
 
             // Replaces Selection of first Line only.
             if (select.Text.Contains("\r"))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
index 63ad112fb73..def51acba52 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
@@ -55,7 +55,7 @@ public void StyleHeader(ToolbarButton button)
                 {
                     Content = new MarkdownTextBlock
                     {
-                        Text = val + "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        Text = val + "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         IsTextSelectionEnabled = false
                     },
                     Tag = val,
@@ -462,7 +462,7 @@ public override ButtonMap DefaultButtons
                 QuoteButton = new ToolbarButton
                 {
                     Name = QuoteElement,
-                    ToolTip = "TextToolbarStrings_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Message },
                     Activation = FormatQuote
                 };
@@ -479,13 +479,13 @@ public override ButtonMap DefaultButtons
                     {
                         Name = HeadersElement,
                         Icon = new SymbolIcon { Symbol = Symbol.FontSize },
-                        ToolTip = "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Activation = StyleHeader
                     },
                     new ToolbarButton
                     {
                         Name = CodeElement,
-                        ToolTip = "TextToolbarStrings_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "WCT_TextToolbar_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                         Icon = new FontIcon { Glyph = "{}", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                         Activation = FormatCode
                     },
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
index 4d9a49de7c0..79373541841 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
@@ -68,7 +68,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = "WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -84,7 +84,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = "WindowsCommunityToolkit_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
index 83c1654d3bd..facc3230bf7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = "WindowsCommunityToolkit_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
index 91e9f8434be..7f2fd97cbfc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
@@ -63,7 +63,7 @@ protected override void OnApplyTemplate()
             {
                 _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed;
                 _dismissButton.Click += DismissButton_Click;
-                AutomationProperties.SetName(_dismissButton, "WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
+                AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
             }
 
             if (_visualStateGroup != null)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
index 5277f9b09f9..01a49faa479 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
@@ -30,7 +30,7 @@
         <Setter Property="HorizontalOffset" Value="0" />
         <Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
         <!--  The setter value is localized using x:Uid but we still need to set it explicitly to avoid a compiler warning  -->
-        <Setter x:Uid="WindowsCommunityToolkit_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
+        <Setter x:Uid="WCT_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
         <Setter Property="AutomationProperties.LiveSetting" Value="Assertive" />
         <Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
     </Style>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
index d3b003e8b80..bcad38e26ee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
@@ -117,107 +117,107 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TextToolbarStrings_BoldLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_BoldLabel" xml:space="preserve">
     <value>Bold</value>
     <comment>Label for TextToolbar Control bold button.</comment>
   </data>
-  <data name="TextToolbarStrings_CancelLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_CancelLabel" xml:space="preserve">
     <value>Cancel</value>
     <comment>Label for TextToolbar Control Cancel message.</comment>
   </data>
-  <data name="TextToolbarStrings_CodeLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_CodeLabel" xml:space="preserve">
     <value>Code</value>
     <comment>Label for TextToolbar Control Code button.</comment>
   </data>
-  <data name="TextToolbarStrings_CreateLinkLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_CreateLinkLabel" xml:space="preserve">
     <value>Create Link</value>
     <comment>Label for TextToolbar Control Create Link button.</comment>
   </data>
-  <data name="TextToolbarStrings_EmptyTextLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_EmptyTextLabel" xml:space="preserve">
     <value>Empty Text</value>
     <comment>Label for TextToolbar Control Empty Text.</comment>
   </data>
-  <data name="TextToolbarStrings_HeaderLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_HeaderLabel" xml:space="preserve">
     <value>Header</value>
     <comment>Label for TextToolbar Control Header button.</comment>
   </data>
-  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_ItalicsLabel" xml:space="preserve">
     <value>Italics</value>
     <comment>Label for TextToolbar Control italics button.</comment>
   </data>
-  <data name="TextToolbarStrings_LabelLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_LabelLabel" xml:space="preserve">
     <value>Label</value>
     <comment>Label for TextToolbar Control Label button.</comment>
   </data>
-  <data name="TextToolbarStrings_LinkInvalidLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_LinkInvalidLabel" xml:space="preserve">
     <value>Link Invalid</value>
     <comment>Label for TextToolbar Control Link Invalid message.</comment>
   </data>
-  <data name="TextToolbarStrings_LinkLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_LinkLabel" xml:space="preserve">
     <value>Link</value>
     <comment>Label for TextToolbar Control Link button.</comment>
   </data>
-  <data name="TextToolbarStrings_ListLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_ListLabel" xml:space="preserve">
     <value>List</value>
     <comment>Label for TextToolbar Control List button.</comment>
   </data>
-  <data name="TextToolbarStrings_OkLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_OkLabel" xml:space="preserve">
     <value>Ok</value>
     <comment>Label for TextToolbar Control Ok message.</comment>
   </data>
-  <data name="TextToolbarStrings_OrderedListLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_OrderedListLabel" xml:space="preserve">
     <value>Ordered List</value>
     <comment>Label for TextToolbar Control Ordered List button.</comment>
   </data>
-  <data name="TextToolbarStrings_QuoteLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_QuoteLabel" xml:space="preserve">
     <value>Quote</value>
     <comment>Label for TextToolbar Control Quote button.</comment>
   </data>
-  <data name="TextToolbarStrings_RelativeLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_RelativeLabel" xml:space="preserve">
     <value>Relative</value>
     <comment>Label for TextToolbar Control Relative.</comment>
   </data>
-  <data name="TextToolbarStrings_StrikethroughLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_StrikethroughLabel" xml:space="preserve">
     <value>Strikethrough</value>
     <comment>Label for TextToolbar Control Strikethrough button.</comment>
   </data>
-  <data name="TextToolbarStrings_UnderlineLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_UnderlineLabel" xml:space="preserve">
     <value>Underline</value>
     <comment>Label for TextToolbar Control Underline button.</comment>
   </data>
-  <data name="TextToolbarStrings_UrlLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_UrlLabel" xml:space="preserve">
     <value>Url</value>
     <comment>Label for TextToolbar Control Url button.</comment>
   </data>
-  <data name="TextToolbarStrings_WarningLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_WarningLabel" xml:space="preserve">
     <value>Warning</value>
     <comment>Label for TextToolbar Control Warning message.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed" xml:space="preserve">
+  <data name="WCT_BladeView_ExpandButton_Collapsed" xml:space="preserve">
     <value>Collapse Blade</value>
     <comment>Narrator Resource for BladeView collapsed status</comment>
   </data>
-  <data name="WindowsCommunityToolkit_BladeView_ExpandButton_Expanded" xml:space="preserve">
+  <data name="WCT_BladeView_ExpandButton_Expanded" xml:space="preserve">
     <value>Expand Blade</value>
     <comment>Narrator Resource for BladeView expanded status</comment>
   </data>
-  <data name="WindowsCommunityToolkit_GridSplitter_AutomationName" xml:space="preserve">
+  <data name="WCT_GridSplitter_AutomationName" xml:space="preserve">
     <value>GridSplitter</value>
     <comment>Narrator Resource for GridSplitter control</comment>
   </data>
-  <data name="WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
+  <data name="WCT_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
     <value>Dismiss</value>
     <comment>The automation name for the dismiss button of the InAppNotification control.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_InAppNotification_LandmarkProperty.Value" xml:space="preserve">
+  <data name="WCT_InAppNotification_LandmarkProperty.Value" xml:space="preserve">
     <value>Notification</value>
     <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
+  <data name="WCT_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
     <value>Remove</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
   </data>
-  <data name="WindowsCommunityToolkit_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
+  <data name="WCT_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
     <value>Select All</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
   </data>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
index 21b3e741d04..9bf8ea673d4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
@@ -120,7 +120,7 @@ public override ButtonMap DefaultButtons
                 StrikeButton = CommonButtons.Strikethrough;
                 Underline = new ToolbarButton
                 {
-                    ToolTip = "TextToolbarStrings_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Underline },
                     ShortcutKey = VirtualKey.U,
                     Activation = ((RichTextButtonActions)ButtonActions).FormatUnderline
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
index 2707f5ec61f..68bc7b5314e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
@@ -54,13 +54,13 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var labelBox = new RichEditBox
             {
-                PlaceholderText = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                PlaceholderText = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 Margin = new Thickness(0, 0, 0, 5),
                 AcceptsReturn = false
             };
             var linkBox = new TextBox
             {
-                PlaceholderText = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PlaceholderText = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
 
             CheckBox relativeBox = null;
@@ -78,7 +78,7 @@ public async void OpenLinkCreator(ToolbarButton button)
             {
                 relativeBox = new CheckBox
                 {
-                    Content = "TextToolbarStrings_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                    Content = "WCT_TextToolbar_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
                 };
                 contentPanel.Children.Add(relativeBox);
             }
@@ -89,10 +89,10 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var contentDialog = new ContentDialog
             {
-                Title = "TextToolbarStrings_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                Title = "WCT_TextToolbar_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 Content = contentPanel,
-                PrimaryButtonText = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
-                SecondaryButtonText = "TextToolbarStrings_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PrimaryButtonText = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                SecondaryButtonText = "WCT_TextToolbar_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
 
             if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
@@ -107,9 +107,9 @@ public async void OpenLinkCreator(ToolbarButton button)
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.None, out string labelText);
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.FormatRtf, out string formattedlabelText);
 
-                string linkInvalidLabel = "TextToolbarStrings_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string okLabel = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string warningLabel = "TextToolbarStrings_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string linkInvalidLabel = "WCT_TextToolbar_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string okLabel = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string warningLabel = "WCT_TextToolbar_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
                 string linkText = linkBox.Text.Trim();
 
                 if (string.IsNullOrWhiteSpace(linkText))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
index be014b88284..19c782e14bc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
@@ -37,7 +37,7 @@ public ToolbarButton Bold
                 return new ToolbarButton
                 {
                     Name = TextToolbar.BoldElement,
-                    ToolTip = "TextToolbarStrings_BoldLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_BoldLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Bold },
                     ShortcutKey = VirtualKey.B,
                     Activation = MakeBold
@@ -55,7 +55,7 @@ public ToolbarButton Italics
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ItalicsElement,
-                    ToolTip = "TextToolbarStrings_ItalicsLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_ItalicsLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Italic },
                     ShortcutKey = VirtualKey.I,
                     Activation = MakeItalics
@@ -73,7 +73,7 @@ public ToolbarButton Strikethrough
                 return new ToolbarButton
                 {
                     Name = TextToolbar.StrikethoughElement,
-                    ToolTip = "TextToolbarStrings_StrikethroughLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_StrikethroughLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new FontIcon { Glyph = "\u0335a\u0335b\u0335c\u0335", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                     Activation = MakeStrike,
                     ShortcutKey = VirtualKey.Subtract,
@@ -92,7 +92,7 @@ public ToolbarButton Link
                 return new ToolbarButton
                 {
                     Name = TextToolbar.LinkElement,
-                    ToolTip = "TextToolbarStrings_LinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_LinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Link },
                     ShortcutKey = VirtualKey.K,
                     Activation = OpenLinkCreator,
@@ -111,7 +111,7 @@ public ToolbarButton List
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ListElement,
-                    ToolTip = "TextToolbarStrings_ListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_ListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Content = new TextToolbarSymbols.List(),
                     Activation = MakeList
                 };
@@ -128,7 +128,7 @@ public ToolbarButton OrderedList
                 return new ToolbarButton
                 {
                     Name = TextToolbar.OrderedElement,
-                    ToolTip = "TextToolbarStrings_OrderedListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_OrderedListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                     Content = new TextToolbarSymbols.NumberedList(),
                     Activation = MakeOList
                 };
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
index 67971826868..0b9576a565a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
@@ -185,7 +185,7 @@ protected override void OnApplyTemplate()
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WindowsCommunityToolkit_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
             var menuFlyout = new MenuFlyout();
@@ -349,7 +349,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var removeMenuItem = new MenuFlyoutItem
             {
-                Text = "WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
             removeMenuItem.Click += (s, e) => TokenizingTextBoxItem_ClearClicked(tokenitem, null);
 
@@ -361,7 +361,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WindowsCommunityToolkit_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
 
diff --git a/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
index 6ea6a7cb805..404a7e50ab7 100644
--- a/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
+++ b/UnitTests/UnitTests.UWP/Strings/en-us/Resources.resw
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_ItalicsLabel" xml:space="preserve">
     <value>ItalicsOverride</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
index aac8297adbd..813119439c2 100644
--- a/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
+++ b/UnitTests/UnitTests.UWP/Strings/fr/Resources.resw
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_ItalicsLabel" xml:space="preserve">
     <value>ItalicsFr</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
index af9ee372ebc..1e8b69afad1 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/Strings/en-us/Resources.resw
@@ -120,7 +120,7 @@
   <data name="abc" xml:space="preserve">
     <value>ABCDEF</value>
   </data>
-  <data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
+  <data name="WCT_TextToolbar_ItalicsLabel" xml:space="preserve">
     <value>ItalicsOverride</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
index 0ad15dc5227..fd81c47a93b 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -44,7 +44,7 @@ await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
         [TestMethod]
         public void StringExtensions_GetLocalizedWithResourcePath()
         {
-            var str = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            var str = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
             Assert.AreEqual("Ok", str);
         }
 

From bc141e152abb8c4513c80c52b6bf3d2c16827b0b Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 16 Sep 2020 17:29:14 -0700
Subject: [PATCH 522/595] Updated min and target SDKs and removed redundant
 conditional execution paths. Removed any WinJS reference.

---
 Directory.Build.props                         |   4 +-
 Directory.Build.targets                       |   5 +-
 GazeInputTest/GazeInputTest.csproj            |   2 +-
 .../Microsoft.Toolkit.Services.csproj         |   8 +-
 .../BluetoothLEHelper/BluetoothLEHelper.cs    |  12 -
 .../Microsoft.Toolkit.Uwp.Connectivity.csproj |   2 +-
 ...icrosoft.Toolkit.Uwp.DeveloperTools.csproj |   2 +-
 ....Toolkit.UWP.Input.GazeInteraction.vcxproj |   2 +-
 ...oolkit.Uwp.Notifications.JavaScript.csproj |  24 --
 ...olkit.Uwp.Notifications.JavaScript.targets |  11 -
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |   4 +-
 Microsoft.Toolkit.Uwp.Notifications/readme.md |  14 +-
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   7 +-
 .../Models/Sample.cs                          |  15 -
 .../Pages/SampleController.xaml               |   6 -
 .../Pages/SampleController.xaml.cs            |  16 --
 .../BluetoothLEHelperCode.bind                |  26 +-
 .../BluetoothLEHelperPage.xaml                | 147 +++++-----
 .../BluetoothLEHelperPage.xaml.cs             |  18 --
 .../DropShadowPanel/DropShadowPanelPage.xaml  |  17 +-
 .../DropShadowPanelPage.xaml.cs               |  13 -
 .../SamplePages/ImageEx/ImageExPage.xaml.cs   |  25 +-
 .../SamplePages/Light/LightBehaviorPage.xaml  |   8 -
 .../Light/LightBehaviorPage.xaml.cs           |   5 -
 .../LiveTile/LiveTileCodeJavaScript.bind      | 138 ---------
 .../SamplePages/TextToolbar/TextToolbar.bind  |   3 +-
 .../Toast/ToastCodeJavaScript.bind            |  53 ----
 .../ViewExtensions/ViewExtensionsCode.bind    |   6 +-
 .../ViewExtensions/ViewExtensionsPage.xaml    |   4 -
 .../ViewExtensions/ViewExtensionsPage.xaml.cs |   3 -
 .../WeatherLiveTileAndToastCode.bind          |   3 +-
 ...WeatherLiveTileAndToastCodeJavaScript.bind | 271 ------------------
 .../WeatherLiveTileAndToastPage.xaml.cs       |   6 +-
 .../SamplePages/samples.json                  |   5 +-
 .../Shell.SamplePicker.cs                     |   7 +-
 Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml    |   1 -
 .../Styles/ThemeInjector.cs                   |  70 +++--
 Microsoft.Toolkit.Uwp.SampleApp/readme.md     |   2 +-
 ...Toolkit.Uwp.Samples.BackgroundTasks.csproj |   4 +-
 .../ApiInformationHelper.cs                   |  13 -
 .../Behaviors/Blur.cs                         |  13 +-
 .../Behaviors/FadeHeaderBehavior.cs           |   8 -
 .../Behaviors/Light.cs                        |  18 +-
 .../Behaviors/QuickReturnHeaderBehavior.cs    |   8 -
 .../Behaviors/Saturation.cs                   |  15 +-
 .../Behaviors/StickyHeaderBehavior.cs         |   8 -
 .../Animations/TranslationAnimation.cs        |  13 -
 .../Animations/TypedAnimationBase.cs          |   6 +-
 .../ConnectedAnimations/Connected.cs          |  22 +-
 .../ConnectedAnimationHelper.cs               |  15 +-
 .../Effects/AnimationEffect.cs                |  13 -
 .../Effects/Blur.cs                           |  10 -
 .../Effects/Saturation.cs                     |  10 -
 .../Extensions/AnimationExtensions.Blur.cs    |  14 -
 .../Extensions/AnimationExtensions.Light.cs   |  32 ---
 .../Implicit.cs                               |  24 +-
 ...Microsoft.Toolkit.Uwp.UI.Animations.csproj |   2 +-
 .../ReorderGridAnimation.cs                   |  13 +-
 ...kit.Uwp.UI.Controls.DataGrid.Design.csproj |   8 +-
 .../DataGrid/DataGrid.cs                      |   2 +-
 .../DataGrid/DataGrid.xaml                    |  14 +-
 ...ft.Toolkit.Uwp.UI.Controls.DataGrid.csproj |   2 +-
 .../Utilities/TypeHelper.cs                   |  15 -
 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj |   8 +-
 ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj |   4 +-
 ...kit.Uwp.UI.Controls.Markdown.Design.csproj |   8 +-
 .../MarkdownTextBlock.Methods.cs              |   7 +-
 .../MarkdownTextBlock.Properties.cs           |   5 -
 ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj |   2 +-
 .../Render/MarkdownRenderer.Inlines.cs        |  25 +-
 .../Render/MarkdownRenderer.Properties.cs     |   6 -
 .../CameraPreview/CameraPreview.cs            |  11 +-
 .../DropShadowPanel.Properties.cs             |  25 +-
 .../DropShadowPanel/DropShadowPanel.cs        |  16 +-
 .../ImageEx/ImageExBase.Members.cs            |   6 -
 .../ImageEx/ImageExBase.Source.cs             |  15 +-
 .../ImageEx/ImageExBase.cs                    |  20 +-
 .../InAppNotification/InAppNotification.xaml  |  11 +-
 .../Menu/Menu.xaml                            |   7 +-
 .../Menu/MenuItem.cs                          |  15 +-
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |   2 +-
 .../TileControl/TileControl.cs                |   2 -
 .../TokenizingTextBoxItem.AutoSuggestBox.xaml |   2 +-
 .../UniformGrid/UniformGrid.cs                |  13 +-
 .../Microsoft.Toolkit.Uwp.UI.Media.csproj     |   2 +-
 .../StatusBar/StatusBarExtensions.cs          | 165 -----------
 .../SurfaceDialTextbox/SurfaceDialTextbox.cs  |   6 -
 .../Extensions/TitleBar/TitleBarExtensions.cs |   7 +-
 .../Helpers/DesignTimeHelpers.cs              |  20 +-
 .../Microsoft.Toolkit.Uwp.UI.csproj           |   6 +-
 .../Helpers/CameraHelper/CameraHelper.cs      |   5 +-
 .../Helpers/CameraHelper/FrameEventArgs.cs    |   3 -
 .../RemoteDeviceHelper/RemoteDeviceHelper.cs  |  15 +-
 .../Microsoft.Toolkit.Uwp.csproj              |   2 +-
 .../UnitTests.HighPerformance.UWP.csproj      |   4 +-
 .../UnitTests.Notifications.UWP.csproj        |   4 +-
 .../UnitTests.Notifications.WinRT.csproj      |   4 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   4 +-
 .../Package.appxmanifest                      |   2 +-
 .../UnitTests.XamlIslands.Package.wapproj     |   2 +-
 .../UnitTests.XamlIslands.UWPApp.csproj       |   2 +-
 .../UnitTests.XamlIslands.csproj              |   4 +-
 UnitTests/UnitTests.XamlIslands/app.manifest  |   2 +-
 Windows Community Toolkit.sln                 |  30 --
 azure-pipelines.yml                           |   2 +-
 readme.md                                     |   6 +-
 106 files changed, 258 insertions(+), 1516 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj
 delete mode 100644 Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.targets
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTileCodeJavaScript.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCodeJavaScript.bind
 delete mode 100644 Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBarExtensions.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index fe9cbb14b56..d43a2ceffc3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,8 +14,8 @@
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
-    <DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
+    <DefaultTargetPlatformVersion>19041</DefaultTargetPlatformVersion>
+    <DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9898f028145..111afac2e44 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <Choose>
-    <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
+    <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
       <!-- UAP versions for uap10.0 where TPMV isn't implied -->
       <PropertyGroup>
         <TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
@@ -15,9 +15,6 @@
         <SDKReference Condition="'$(UseWindowsDesktopSdk)' == 'true' " Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
           <Name>Windows Desktop Extensions for the UWP</Name>
         </SDKReference>
-        <SDKReference Condition="'$(UseWindowsMobileSdk)' == 'true' " Include="WindowsMobile, Version=$(TargetPlatformVersion)">
-          <Name>Windows Mobile Extensions for the UWP</Name>
-        </SDKReference>
       </ItemGroup>
     </When>
   </Choose>
diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
index 7735a9bb1a5..9c699a3f5bf 100644
--- a/GazeInputTest/GazeInputTest.csproj
+++ b/GazeInputTest/GazeInputTest.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>GazeInputTest</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.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index 446db56c7a3..e1f1a13d6fb 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.16299;netstandard2.0;NET462</TargetFrameworks>
+    <TargetFrameworks>uap10.0.17763;netstandard2.0;NET462</TargetFrameworks>
     <Title>Windows Community Toolkit .NET Standard Services</Title>
     <Description>
       This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit.
@@ -12,7 +12,7 @@
     <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.17763'">
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
@@ -31,7 +31,7 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">
+  <ItemGroup Condition="'$(TargetFramework)'=='uap10.0.17763'">
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
 
@@ -47,7 +47,7 @@
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
   </ItemGroup>
 
-  <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
+  <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.17763')">
     <Compile Remove="PlatformSpecific\Uwp\**\*" />
   </ItemGroup>
 </Project>
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs
index 97e20f13aec..c83718ec2ac 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs
@@ -12,7 +12,6 @@
 using Windows.Devices.Bluetooth;
 using Windows.Devices.Bluetooth.Advertisement;
 using Windows.Devices.Enumeration;
-using Windows.Foundation.Metadata;
 using Windows.System;
 
 namespace Microsoft.Toolkit.Uwp.Connectivity
@@ -27,11 +26,6 @@ public class BluetoothLEHelper
         /// </summary>
         private const string BluetoothLeDeviceWatcherAqs = "(System.Devices.Aep.ProtocolId:=\"{bb7bb05e-5972-42b5-94fc-76eaa7084d49}\")";
 
-        /// <summary>
-        /// Gets a value indicating whether the Bluetooth LE Helper is supported
-        /// </summary>
-        private static bool? _isBluetoothLESupported = null;
-
         /// <summary>
         /// We need to cache all DeviceInformation objects we get as they may
         /// get updated in the future. The update may make them eligible to be put on
@@ -82,12 +76,6 @@ private BluetoothLEHelper(DispatcherQueue dispatcherQueue = null)
         /// </summary>
         public static BluetoothLEHelper Context { get; } = new BluetoothLEHelper();
 
-        /// <summary>
-        /// Gets a value indicating whether the Bluetooth LE Helper is supported.
-        /// </summary>
-        public static bool IsBluetoothLESupported => (bool)(_isBluetoothLESupported ??
-            (_isBluetoothLESupported = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 4)));
-
         /// <summary>
         /// Gets the list of available bluetooth devices
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
index e1a7784b70c..f1b211c251d 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
+++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.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 Devices</Title>
     <Description>This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers.</Description>
     <PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>
diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
index ff464b80dc1..930d09f5abf 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.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 Developer Tools</Title>
     <Description>This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit.
       
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
index 74113867050..0c2b42caf47 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
@@ -42,7 +42,7 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>Microsoft.Toolkit.Uwp.Input.GazeInteraction</ProjectName>
diff --git a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj b/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj
deleted file mode 100644
index fcfe464a666..00000000000
--- a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-
-  <PropertyGroup>
-    <TargetFramework>uap10.0</TargetFramework>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <Title>Windows Community Toolkit Notifications for JavaScript</Title>
-    <Description>
-      This project is used for packaging the WinMD to work for WinJS projects. 
-      
-      Generate tile, toast, and badge notifications for Windows 10 via code, with the help of IntelliSense, instead of directly using XML.
-      Supports adaptive tiles and adaptive/interactive toasts for Windows 10. It is part of the Windows Community Toolkit.
-      Supports C# and C++ UWP project types (see Microsoft.Toolkit.Uwp.Notifications).
-      Also works with C# portable class libraries and non-UWP C# projects like server projects.
-    </Description>
-    <PackageTags>notifications win10 windows-10 tile tiles toast toasts badge xml uwp javascript</PackageTags>
-    <ExtrasImplicitPlatformPackageIsPrivate>true</ExtrasImplicitPlatformPackageIsPrivate>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Microsoft.Toolkit.Uwp.Notifications.JavaScript.targets" PackagePath="build\Windows" Pack="true" />
-    <None Include="..\Microsoft.Toolkit.Uwp.Notifications\bin\$(Configuration)\native\*.*" PackagePath="lib\Windows" Pack="true" />
-  </ItemGroup>
-  
-</Project>
diff --git a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.targets b/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.targets
deleted file mode 100644
index 8a78f301f95..00000000000
--- a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup>
-    <Reference Include="Microsoft.Toolkit.Uwp.Notifications.Windows">
-      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\Windows\Microsoft.Toolkit.Uwp.Notifications.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-    </Reference>
-  </ItemGroup>
-
-</Project>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 1c08ba0f600..5d5f1a63808 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -7,7 +7,7 @@
     <Description>
       Generate tile, toast, and badge notifications for Windows 10 via code, with the help of IntelliSense.
       Adds Support for adaptive tiles and adaptive/interactive toasts for Windows 10. It is part of the Windows Community Toolkit.
-      Supports C# and C++ UWP project types (see Microsoft.Toolkit.Uwp.Notifications.JavaScript for the JS version).
+      Supports C# and C++ UWP project types.
       Also works with C# portable class libraries and non-UWP C# projects like server projects.
       This project contains outputs for netstandard1.4, uap10.0 and native for WinRT.
     </Description>
@@ -65,7 +65,7 @@
     <NugetTargetMoniker Condition="'$(DesignTimeBuild)' == 'true'">native</NugetTargetMoniker>
     <NugetTargetMoniker Condition="'$(DesignTimeBuild)' != 'true'">UAP,Version=v10.0</NugetTargetMoniker>
     <PackageTargetFallback>uap10.0</PackageTargetFallback>
-    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)' == '' ">10.0.10240.0</TargetPlatformMinVersion>
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);NETFX_CORE;WINDOWS_UWP;WINRT</DefineConstants>
     <CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/readme.md b/Microsoft.Toolkit.Uwp.Notifications/readme.md
index c7ee380f522..bfc7d22d1ca 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/readme.md
+++ b/Microsoft.Toolkit.Uwp.Notifications/readme.md
@@ -6,22 +6,16 @@ Any code for generating notifications should be written in the Microsoft.Toolkit
 If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`.
 
 ## What are all the projects for?
-There's two notification projects...
- - Microsoft.Toolkit.Uwp.Notifications
- - Microsoft.Toolkit.Uwp.Notifications.JavaScript
+All the code is contained on the Microsoft.Toolkit.Uwp.Notifications project.
 
-The first project is where all the code is contained.
+It outputs `netstandard1.4`, `uap10.0`, `native` for WinRT, and netcoreapp for .Net Core projects. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for C++.
 
-The JavaScript project is just for packaging the `WinMD` to work for WinJS projects.
 
-
-The first project contains outputs for `netstandard1.4`, `uap10.0` and a `native` for WinRT. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for JavaScript and C++.
-
-
-| C#               | JavaScript/C++      |
+| C#               | C++      |
 | ---------------- | ------------------- |
 | NET Standard 1.4 | UWP WinRT Component |
 | UWP C# DLL |                     |
+| .Net Core DLL |                     |
 
 
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 2933c1f2137..07dde256e28 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>Microsoft.Toolkit.Uwp.SampleApp</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <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>
@@ -412,10 +412,7 @@
     <Content Include="SamplePages\Incremental Loading Collection\IncrementalLoadingCollectionCode.bind" />
     <Content Include="SamplePages\ImageCache\ImageCacheCode.bind" />
     <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
-    <Content Include="SamplePages\LiveTile\LiveTileCodeJavaScript.bind" />
-    <Content Include="SamplePages\Toast\ToastCodeJavaScript.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
-    <Content Include="SamplePages\WeatherLiveTileAndToast\WeatherLiveTileAndToastCodeJavaScript.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
     <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index d3cffd7038f..30a4f70d56c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -141,8 +141,6 @@ public string CodeUrl
 
         public string CodeFile { get; set; }
 
-        public string JavaScriptCodeFile { get; set; }
-
         public string XamlCodeFile { get; set; }
 
         public bool DisableXamlEditorRendering { get; set; }
@@ -163,8 +161,6 @@ public string CodeUrl
 
         public bool HasCSharpCode => !string.IsNullOrEmpty(CodeFile);
 
-        public bool HasJavaScriptCode => !string.IsNullOrEmpty(JavaScriptCodeFile);
-
         public bool HasDocumentation => !string.IsNullOrEmpty(DocumentationUrl);
 
         public bool IsSupported
@@ -191,17 +187,6 @@ public async Task<string> GetCSharpSourceAsync()
             }
         }
 
-        public async Task<string> GetJavaScriptSourceAsync()
-        {
-            using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(JavaScriptCodeFile.StartsWith('/') ? JavaScriptCodeFile : $"SamplePages/{Name}/{JavaScriptCodeFile}"))
-            {
-                using (var streamReader = new StreamReader(codeStream.AsStream()))
-                {
-                    return await streamReader.ReadToEndAsync();
-                }
-            }
-        }
-
 #pragma warning disable SA1009 // Doesn't like ValueTuples.
         public async Task<(string contents, string path)> GetDocumentationAsync()
 #pragma warning restore SA1009 // Doesn't like ValueTuples.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index 99d1f479794..299c4787542 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -195,12 +195,6 @@
                                                     IsFocusEngagementEnabled="False" />
                     </PivotItem>
 
-                    <PivotItem x:Name="JavaScriptPivotItem"
-                               Padding="0, 10,0,0"
-                               Header="Javascript">
-                        <controlsLocal:CodeRenderer x:Name="JavaScriptCodeRenderer" />
-                    </PivotItem>
-
                     <PivotItem x:Name="DocumentationPivotItem"
                             Padding="0, 10,0,0"
                             Header="Documentation">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
index 289912e9b7d..29e0f2540d0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
@@ -271,14 +271,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
                     InfoAreaPivot.Items.Add(CSharpPivotItem);
                 }
 
-                if (CurrentSample.HasJavaScriptCode)
-                {
-                    var code = await CurrentSample.GetJavaScriptSourceAsync();
-
-                    JavaScriptCodeRenderer.SetCode(code, "js");
-                    InfoAreaPivot.Items.Add(JavaScriptPivotItem);
-                }
-
                 if (CurrentSample.HasDocumentation)
                 {
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
@@ -421,14 +413,6 @@ private async void InfoAreaPivot_OnSelectionChanged(object sender, SelectionChan
 
                 return;
             }
-
-            if (CurrentSample.HasJavaScriptCode && InfoAreaPivot.SelectedItem == JavaScriptPivotItem)
-            {
-                var code = await CurrentSample.GetJavaScriptSourceAsync();
-                JavaScriptCodeRenderer.SetCode(code, "js");
-
-                return;
-            }
         }
 
         private async void XamlCodeEditor_UpdateRequested(object sender, EventArgs e)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperCode.bind
index 37824232426..4cab3096b26 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperCode.bind
@@ -1,22 +1,18 @@
 // Get a local copy of the context for easier reading
 BluetoothLEHelper bluetoothLEHelper = BluetoothLEHelper.Context;
 
-// check if BluetoothLE APIs are available
-if (BluetoothLEHelper.IsBluetoothLESupported)
-{
-    // Start the Enumeration
-	bluetoothLEHelper.StartEnumeration();
+// Start the Enumeration
+bluetoothLEHelper.StartEnumeration();
 
-	// At this point the user needs to select a device they want to connect to. This can be done by
-	// creating a ListView and binding the bluetoothLEHelper collection to it. Once a device is found, 
-	// the Connect() method can be called to connect to the device and start interacting with its services
+// At this point the user needs to select a device they want to connect to. This can be done by
+// creating a ListView and binding the bluetoothLEHelper collection to it. Once a device is found, 
+// the Connect() method can be called to connect to the device and start interacting with its services
 
-	// Connect to a device if your choice
-	ObservableBluetoothLEDevice device = bluetoothLEHelper.BluetoothLeDevices[<Device you choose>];
-	await device.ConnectAsync();
+// Connect to a device if your choice
+ObservableBluetoothLEDevice device = bluetoothLEHelper.BluetoothLeDevices[<Device you choose>];
+await device.ConnectAsync();
 
-	// At this point the device is connected and the Services property is populated.
+// At this point the device is connected and the Services property is populated.
 
-	// See all the services
-	var services = device.Services;
-}
+// See all the services
+var services = device.Services;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml
index 4337bbf0c83..c2e0aedcf42 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml
@@ -6,89 +6,76 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
-    <Grid>
-        <RelativePanel x:Name="MainContent"
-                       Visibility="Collapsed">
-            <Button x:Name="BtEnumeration"
+    <RelativePanel>
+        <Button x:Name="BtEnumeration"
+                Margin="10"
+                Click="Enumeration_Click"
+                Content="Start enumeration" />
+        <ListView x:Name="LVDevices"
+                    Height="200"
                     Margin="10"
-                    Click="Enumeration_Click"
-                    Content="Start enumeration" />
-            <ListView x:Name="LVDevices"
-                      Height="200"
-                      Margin="10"
-                      VerticalAlignment="Top"
-                      ItemsSource="{x:Bind bluetoothLEHelper.BluetoothLeDevices}"
-                      RelativePanel.AlignLeftWithPanel="True"
-                      RelativePanel.AlignRightWithPanel="True"
-                      RelativePanel.Below="BtEnumeration"
-                      SelectionChanged="LVDevices_SelectionChanged">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="connectivity:ObservableBluetoothLEDevice">
-                        <StackPanel>
-                            <TextBlock Text="{x:Bind Name, Mode=OneWay}" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-            <StackPanel Name="SPDevice"
-                        Margin="10"
-                        RelativePanel.Below="LVDevices">
-                <TextBlock x:Name="TbDeviceName"
-                           Text="" />
-                <TextBlock x:Name="TbDeviceBtAddr"
-                           Text="" />
-            </StackPanel>
-
-            <ComboBox x:Name="CBServices"
-                      Margin="10"
-                      RelativePanel.Below="SPDevice"
-                      SelectionChanged="CBServices_SelectionChanged"
-                      Visibility="Collapsed">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate x:DataType="connectivity:ObservableGattDeviceService">
-                        <TextBlock>
-                            <Run Text="Service Name: " />
-                            <Run Text="{x:Bind Name}" />
-                        </TextBlock>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+                    VerticalAlignment="Top"
+                    ItemsSource="{x:Bind bluetoothLEHelper.BluetoothLeDevices}"
+                    RelativePanel.AlignLeftWithPanel="True"
+                    RelativePanel.AlignRightWithPanel="True"
+                    RelativePanel.Below="BtEnumeration"
+                    SelectionChanged="LVDevices_SelectionChanged">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="connectivity:ObservableBluetoothLEDevice">
+                    <StackPanel>
+                        <TextBlock Text="{x:Bind Name, Mode=OneWay}" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+        <StackPanel Name="SPDevice"
+                    Margin="10"
+                    RelativePanel.Below="LVDevices">
+            <TextBlock x:Name="TbDeviceName"
+                        Text="" />
+            <TextBlock x:Name="TbDeviceBtAddr"
+                        Text="" />
+        </StackPanel>
 
-            <ComboBox x:Name="CBCharacteristic"
-                      Margin="10"
-                      RelativePanel.Below="CBServices"
-                      SelectionChanged="CBCharacteristic_SelectionChanged"
-                      Visibility="Collapsed">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate x:DataType="connectivity:ObservableGattCharacteristics">
-                        <TextBlock>
-                            <Run Text="Characteristic Name: " />
-                            <Run Text="{x:Bind Name}" />
-                        </TextBlock>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+        <ComboBox x:Name="CBServices"
+                    Margin="10"
+                    RelativePanel.Below="SPDevice"
+                    SelectionChanged="CBServices_SelectionChanged"
+                    Visibility="Collapsed">
+            <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="connectivity:ObservableGattDeviceService">
+                    <TextBlock>
+                        <Run Text="Service Name: " />
+                        <Run Text="{x:Bind Name}" />
+                    </TextBlock>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
 
-            <Button x:Name="BtReadCharValue"
+        <ComboBox x:Name="CBCharacteristic"
                     Margin="10"
-                    Click="ReadCharValue_Click"
-                    Content="Read Value"
-                    RelativePanel.Below="CBCharacteristic"
-                    Visibility="Collapsed" />
+                    RelativePanel.Below="CBServices"
+                    SelectionChanged="CBCharacteristic_SelectionChanged"
+                    Visibility="Collapsed">
+            <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="connectivity:ObservableGattCharacteristics">
+                    <TextBlock>
+                        <Run Text="Characteristic Name: " />
+                        <Run Text="{x:Bind Name}" />
+                    </TextBlock>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
 
-            <TextBlock x:Name="TBCharValue"
-                       Margin="10"
-                       RelativePanel.Below="BtReadCharValue" />
-        </RelativePanel>
-        <TextBlock x:Name="NotAvailableMessage"
-                   Margin="40"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   FontSize="20"
-                   Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
-                   Text="BluetoothLE requires the Windows 10 Creators Update"
-                   TextAlignment="Center"
-                   TextWrapping="WrapWholeWords"
-                   Visibility="Collapsed" />
-    </Grid>
+        <Button x:Name="BtReadCharValue"
+                Margin="10"
+                Click="ReadCharValue_Click"
+                Content="Read Value"
+                RelativePanel.Below="CBCharacteristic"
+                Visibility="Collapsed" />
+
+        <TextBlock x:Name="TBCharValue"
+                    Margin="10"
+                    RelativePanel.Below="BtReadCharValue" />
+    </RelativePanel>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml.cs
index 5ce8c5030d0..7ea42e37418 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml.cs
@@ -20,19 +20,6 @@ public BluetoothLEHelperPage()
         {
             this.InitializeComponent();
             bluetoothLEHelper.EnumerationCompleted += BluetoothLEHelper_EnumerationCompleted;
-            Load();
-        }
-
-        private void Load()
-        {
-            if (BluetoothLEHelper.IsBluetoothLESupported)
-            {
-                MainContent.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                NotAvailableMessage.Visibility = Visibility.Visible;
-            }
         }
 
         private async void BluetoothLEHelper_EnumerationCompleted(object sender, EventArgs e)
@@ -46,11 +33,6 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
 
         private void Enumeration_Click(object sender, RoutedEventArgs e)
         {
-            if (!BluetoothLEHelper.IsBluetoothLESupported)
-            {
-                return;
-            }
-
             if (!bluetoothLEHelper.IsEnumerating)
             {
                 bluetoothLEHelper.StartEnumeration();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
index 94d793b170b..bc49604e9de 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
@@ -22,20 +22,5 @@
         </Style>
     </Page.Resources>
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <TextBlock x:Name="WarningText"
-                   Margin="0,20"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Top"
-                   Foreground="{ThemeResource Brush-Grey-03}"
-                   Text="DropShadowPanel is only available on Windows 10 Anniversary Update or greater"
-                   TextWrapping="Wrap"
-                   Visibility="Collapsed" />
-
-        <Grid x:Name="XamlRoot" Grid.Row="1" />
-    </Grid>
+    <Grid x:Name="XamlRoot"/>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
index 8c8c9a67f65..d5e37716db1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
@@ -2,11 +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 Microsoft.Toolkit.Uwp.SampleApp.Models;
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -21,15 +17,6 @@ public sealed partial class DropShadowPanelPage : Page
         public DropShadowPanelPage()
         {
             InitializeComponent();
-            Load();
-        }
-
-        private void Load()
-        {
-            if (!DropShadowPanel.IsSupported)
-            {
-                WarningText.Visibility = Visibility.Visible;
-            }
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
index b783aa37a26..bb2dd735000 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
@@ -69,25 +69,22 @@ private async void Load()
                 AddImage(false, false, true);
             });
 
-            if (ImageExBase.IsLazyLoadingSupported)
+            SampleController.Current.RegisterNewCommand("Lazy loading sample (17763 or higher supported)", (sender, args) =>
             {
-                SampleController.Current.RegisterNewCommand("Lazy loading sample (17763 or higher supported)", (sender, args) =>
+                var imageExLazyLoadingControl = new ImageExLazyLoadingControl();
+                imageExLazyLoadingControl.CloseButtonClick += (s, a) =>
                 {
-                    var imageExLazyLoadingControl = new ImageExLazyLoadingControl();
-                    imageExLazyLoadingControl.CloseButtonClick += (s, a) =>
-                    {
-                        if (lazyLoadingControlHost != null)
-                        {
-                            lazyLoadingControlHost.Child = null;
-                        }
-                    };
-
                     if (lazyLoadingControlHost != null)
                     {
-                        lazyLoadingControlHost.Child = imageExLazyLoadingControl;
+                        lazyLoadingControlHost.Child = null;
                     }
-                });
-            }
+                };
+
+                if (lazyLoadingControlHost != null)
+                {
+                    lazyLoadingControlHost.Child = imageExLazyLoadingControl;
+                }
+            });
 
             SampleController.Current.RegisterNewCommand("Clear image cache", async (sender, args) =>
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
index 8eba95bedbd..276a3166388 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml
@@ -9,14 +9,6 @@
       mc:Ignorable="d">
 
     <Grid>
-        <TextBlock x:Name="WarningText"
-                   Margin="0,20"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Top"
-                   Foreground="Red"
-                   Text="Light effects are not available on your version of Windows 10"
-                   TextWrapping="Wrap"
-                   Visibility="Collapsed" />
         <Grid x:Name="XamlRoot"/>
         
         <!-- Shallow Copy -->
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
index fd59ec7d5be..a731da773ad 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs
@@ -27,11 +27,6 @@ public LightBehaviorPage()
         {
             this.InitializeComponent();
 
-            if (!AnimationExtensions.IsLightingSupported)
-            {
-                WarningText.Visibility = Visibility.Visible;
-            }
-
             SampleController.Current.RegisterNewCommand("Apply", (s, e) =>
             {
                 _lightBehavior?.StartAnimation();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTileCodeJavaScript.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTileCodeJavaScript.bind
deleted file mode 100644
index 464073359e4..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTileCodeJavaScript.bind
+++ /dev/null
@@ -1,138 +0,0 @@
-var square44x44Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square44x44Logo.png");
-var square150x150Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square150x150Logo.png");
-var wide310x150Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Wide310x150Logo.png");
-var square310x310Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square310x310Logo.png");
-
-var generateTileBindingMedium = function (username, avatarLogoSource) {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    tileBinding.content.peekImage = new Microsoft.Toolkit.Uwp.Notifications.TilePeekImage();
-    tileBinding.content.peekImage.source = avatarLogoSource;
-    tileBinding.content.peekImage.hintCrop = Microsoft.Toolkit.Uwp.Notifications.TilePeekImageCrop.Circle;
-
-    tileBinding.content.textStacking = Microsoft.Toolkit.Uwp.Notifications.TileTextStacking.center;
-
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Hi,";
-    adaptativeText1.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.center;
-    adaptativeText1.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.base;
-
-    var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText2.text = username;
-    adaptativeText2.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.center;
-    adaptativeText2.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.captionSubtle;
-
-    tileBinding.content.children.push(adaptativeText1);
-    tileBinding.content.children.push(adaptativeText2);
-
-    return tileBinding;
-};
-
-var generateTileBindingWide = function (username, avatarLogoSource) {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    var group = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-    var adaptativeSubgroup1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup1.hintWeight = 33;
-    var adaptativeImage = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveImage();
-    adaptativeImage.source = avatarLogoSource;
-    adaptativeImage.hintCrop = Microsoft.Toolkit.Uwp.Notifications.AdaptiveImageCrop.circle;
-    adaptativeSubgroup1.children.push(adaptativeImage);
-
-    var adaptativeSubgroup2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup2.hintTextStacking = Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroupTextStacking.center;
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Hi,";
-    adaptativeText1.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.title;
-    var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText2.text = username;
-    adaptativeText2.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.subtitleSubtle;
-    adaptativeSubgroup2.children.push(adaptativeText1);
-    adaptativeSubgroup2.children.push(adaptativeText2);
-
-    group.children.push(adaptativeSubgroup1);
-    group.children.push(adaptativeSubgroup2);
-
-    tileBinding.content.children.push(group);
-
-    return tileBinding;
-};
-
-var generateTileBindingLarge = function (username, avatarLogoSource) {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-    tileBinding.content.textStacking = Microsoft.Toolkit.Uwp.Notifications.TileTextStacking.center;
-
-    var group = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-    var adaptativeSubgroup1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup1.hintWeight = 1;
-
-    // we surround the image by two subgroups so that it doesn't take the full width
-    var adaptativeSubgroup2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup2.hintWeight = 2;
-    var adaptativeImage = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveImage();
-    adaptativeImage.source = avatarLogoSource;
-    adaptativeImage.hintCrop = Microsoft.Toolkit.Uwp.Notifications.AdaptiveImageCrop.circle;
-    adaptativeSubgroup2.children.push(adaptativeImage);
-
-    var adaptativeSubgroup3 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup3.hintWeight = 1;
-
-    group.children.push(adaptativeSubgroup1);
-    group.children.push(adaptativeSubgroup2);
-    group.children.push(adaptativeSubgroup3);
-
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Hi,";
-    adaptativeText1.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.center;
-    adaptativeText1.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.title;
-
-    var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText2.text = username;
-    adaptativeText2.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.center;
-    adaptativeText2.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.subtitleSubtle;
-
-    tileBinding.content.children.push(group);
-    tileBinding.content.children.push(adaptativeText1);
-    tileBinding.content.children.push(adaptativeText2);
-
-    return tileBinding;
-};
-
-var generateTileContent = function (username, avatarLogoSource) {
-    var tileContent = new Microsoft.Toolkit.Uwp.Notifications.TileContent();
-    tileContent.visual = new Microsoft.Toolkit.Uwp.Notifications.TileVisual();
-    tileContent.visual.tileMedium = generateTileBindingMedium(username, avatarLogoSource);
-    tileContent.visual.tileWide = generateTileBindingWide(username, avatarLogoSource);
-    tileContent.visual.tileLarge = generateTileBindingLarge(username, avatarLogoSource);
-
-    return tileContent;
-};
-
-var pinTile = function () {
-    var tile = new Windows.UI.StartScreen.SecondaryTile(new Date().getTime());
-
-    tile.displayName = "Xbox";
-    tile.arguments = "args";
-    tile.visualElements.square150x150Logo = square150x150Logo;
-    tile.visualElements.wide310x150Logo = wide310x150Logo;
-    tile.visualElements.square310x310Logo = square310x310Logo;
-    tile.visualElements.showNameOnSquare150x150Logo = true;
-    tile.visualElements.showNameOnSquare310x310Logo = true;
-    tile.visualElements.showNameOnWide310x150Logo = true;
-
-    tile.requestCreateAsync()
-        .then(function () {
-            // generate the tile notification content and update the tile
-            var content = generateTileContent("MasterHip", "Assets/Photos/Owl.jpg");
-            var tileNotification = new Windows.UI.Notifications.TileNotification(content.getXml());
-            Windows.UI.Notifications.TileUpdateManager.createTileUpdaterForSecondaryTile(tile.TileId).update(tileNotification);
-        });
-};
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
index 826d35feae1..711cc6114b4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbar.bind
@@ -8,7 +8,6 @@
       xmlns:textToolbarSamples="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
       mc:Ignorable="d">
 
   <Page.Resources>
@@ -58,7 +57,7 @@
                      BorderThickness="1"
                      BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
                      Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-                     contract7Present:SelectionFlyout="{x:Null}"/>
+                     SelectionFlyout="{x:Null}"/>
         <Grid x:Name="MD"
               Grid.Row="1"
               Margin="0, 16"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
deleted file mode 100644
index 00958686dd2..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
+++ /dev/null
@@ -1,53 +0,0 @@
-var generateToastContent = function () {
-    var toastButtonSnooze = new Microsoft.Toolkit.Uwp.Notifications.ToastButtonSnooze();
-    toastButtonSnooze.selectionBoxId = "snoozeTime";
-
-    var toastButtonDismiss = new Microsoft.Toolkit.Uwp.Notifications.ToastButtonDismiss();
-
-    var toastSelectionBox = new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBox("snoozeTime");
-    toastSelectionBox.defaultSelectionBoxItemId = "15";
-    toastSelectionBox.items.push(new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBoxItem("1", "1 minute"));
-    toastSelectionBox.items.push(new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBoxItem("15", "15 minutes"));
-    toastSelectionBox.items.push(new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBoxItem("60", "1 hour"));
-    toastSelectionBox.items.push(new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBoxItem("240", "4 hours"));
-    toastSelectionBox.items.push(new Microsoft.Toolkit.Uwp.Notifications.ToastSelectionBoxItem("1440", "1 day"));
-
-    var toastVisual = new Microsoft.Toolkit.Uwp.Notifications.ToastVisual();
-    var bindingGeneric = new Microsoft.Toolkit.Uwp.Notifications.ToastBindingGeneric();
-
-    var adaptiveText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptiveText1.text = "Adaptive Tiles Meeting";
-
-     var adaptiveText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptiveText2.text = "Conf Room 2001 / Building 135";
-
-     var adaptiveText3 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptiveText3.text = "10:00 AM - 10:30 AM";
-
-    bindingGeneric.children.push(adaptiveText1);
-    bindingGeneric.children.push(adaptiveText2);
-    bindingGeneric.children.push(adaptiveText3);
-
-    toastVisual.bindingGeneric = bindingGeneric;
-
-    var toastActions = new Microsoft.Toolkit.Uwp.Notifications.ToastActionsCustom();
-    toastActions.inputs.push(toastSelectionBox);
-    toastActions.buttons.push(toastButtonSnooze);
-    toastActions.buttons.push(toastButtonDismiss);
-
-    var content = new Microsoft.Toolkit.Uwp.Notifications.ToastContent();
-
-    content.launch = "action=viewEvent&eventId=1983";
-    content.scenario = Microsoft.Toolkit.Uwp.Notifications.ToastScenario.reminder;
-    content.visual = toastVisual;
-    content.actions = toastActions;
-
-    return content;
-};
-
-var popToast = function () {
-    // generate the toast notification content and pop the toast
-    var content = generateToastContent();
-    var toast = new Windows.UI.Notifications.ToastNotification(content.getXml());
-    Windows.UI.Notifications.ToastNotificationManager.createToastNotifier().show(toast);
-};
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsCode.bind
index ce9eede03ef..c19725cde5d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsCode.bind
@@ -10,15 +10,11 @@
       extensions:TitleBarExtensions.ForegroundColor="White"
       extensions:TitleBarExtensions.ButtonBackgroundColor="CornflowerBlue"
       extensions:TitleBarExtensions.ButtonForegroundColor="White"
-      extensions:StatusBarExtensions.BackgroundColor="CornflowerBlue"
-      extensions:StatusBarExtensions.BackgroundOpacity="0.8"
-      extensions:StatusBarExtensions.ForegroundColor="White"
-      extensions:StatusBarExtensions.IsVisible="False"
       mc:Ignorable="d">
 
   <Grid>
     <TextBlock Margin="16">
-      Modify the XAML to change the Title and (mobile) Status bars.
+      Modify the XAML to change the Title.
     </TextBlock>
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml
index ea5bd342ee1..49a539705d6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml
@@ -5,10 +5,6 @@
       xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       extensions:ApplicationViewExtensions.Title="View Extensions"
-      extensions:StatusBarExtensions.BackgroundColor="Blue"
-      extensions:StatusBarExtensions.BackgroundOpacity="0.8"
-      extensions:StatusBarExtensions.ForegroundColor="White"
-      extensions:StatusBarExtensions.IsVisible="True"
       extensions:TitleBarExtensions.BackgroundColor="Blue"
       extensions:TitleBarExtensions.ForegroundColor="White"
       mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs
index 580f36f85a9..5295aedf11d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs
@@ -24,9 +24,6 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
         {
             base.OnNavigatedFrom(e);
 
-            // Reset app back to normal.
-            StatusBarExtensions.SetIsVisible(this, false);
-
             ApplicationViewExtensions.SetTitle(this, string.Empty);
 
             var lightGreyBrush = (Color)Application.Current.Resources["Grey-04"];
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 26603452af9..7963c5a5640 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -121,10 +121,9 @@ private static bool IsAdaptiveToastSupported()
 {
     switch (AnalyticsInfo.VersionInfo.DeviceFamily)
     {
-        // Desktop and Mobile started supporting adaptive toasts in API contract 3 (Anniversary Update)
         case "Windows.Mobile":
         case "Windows.Desktop":
-            return ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
+            return true;
 
         // Other device families do not support adaptive toasts
         default:
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCodeJavaScript.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCodeJavaScript.bind
deleted file mode 100644
index 34461a1812e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCodeJavaScript.bind
+++ /dev/null
@@ -1,271 +0,0 @@
-var square44x44Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square44x44Logo.png");
-var square150x150Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square150x150Logo.png");
-var wide310x150Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Wide310x150Logo.png");
-var square310x310Logo = new Windows.Foundation.Uri("ms-appx:///Assets/Square310x310Logo.png");
-
-var generateLargeSubgroup = function (day, image, high, low) {
-    // generate the normal subgroup
-    var subgroup = generateSubgroup(day, image, high, low);
-
-    // allow there to be padding around the image
-    (subgroup.children[1]).hintRemoveMargin = null;
-
-    return subgroup;
-};
-
-var generateSubgroup = function (day, img, tempHi, tempLo) {
-    var adaptativeSubgroup = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup.hintWeight = 1;
-
-    // Day
-    var dayText = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    dayText.text = day;
-    dayText.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.Center;
-
-    // Image
-    var adaptativeImage = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveImage();
-    adaptativeImage.source = img;
-    adaptativeImage.hintRemoveMargin = true;
-
-    // High temp
-    var highTempText = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    highTempText.text = tempHi + "�";
-    highTempText.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.Center;
-
-    // Low temp
-    var lowTempText = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    lowTempText.text = tempLo + "�";
-    lowTempText.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.Center;
-    lowTempText.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.CaptionSubtle;
-
-    adaptativeSubgroup.children.push(dayText);
-    adaptativeSubgroup.children.push(adaptativeImage);
-    adaptativeSubgroup.children.push(highTempText);
-    adaptativeSubgroup.children.push(lowTempText);
-
-    return adaptativeSubgroup;
-};
-
-var generateLegacyToastText = function (day, weatherEmoji, tempHi, tempLo) {
-    var adaptativeText = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText.text = `${day} ${weatherEmoji} ${tempHi}� / ${tempLo}�`;
-    return adaptativeText;
-};
-
-var isAdaptiveToastSupported = function () {
-    switch (Windows.System.Profile.AnalyticsInfo.versionInfo.deviceFamily) {
-        // desktop and Mobile started supporting adaptive toasts in API contract 3 (Anniversary Update)
-        case "Windows.Mobile":
-        case "Windows.Desktop":
-            return Windows.Foundation.Metadata.ApiInformation.isApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
-
-            // other device families do not support adaptive toasts
-        default:
-            return false;
-    }
-};
-
-var generateToastContent = function () {
-    // start by constructing the visual portion of the toast
-    var binding = new Microsoft.Toolkit.Uwp.Notifications.ToastBindingGeneric();
-
-    // we'll always have this summary text on our toast notification
-    // (it is required that your toast starts with a text element)
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Today will be mostly sunny with a high of 63 and a low of 42.";
-    binding.children.push(adaptativeText1);
-
-    // if Adaptive Toast Notifications are supported
-    if (isAdaptiveToastSupported()) {
-        var adaptativeGroup = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-        adaptativeGroup.children.push(generateSubgroup("Mon", "Mostly Cloudy.png", 63, 42));
-        adaptativeGroup.children.push(generateSubgroup("Tue", "Cloudy.png", 57, 38));
-        adaptativeGroup.children.push(generateSubgroup("Wed", "Sunny.png", 59, 43));
-        adaptativeGroup.children.push(generateSubgroup("Thu", "Sunny.png", 62, 42));
-        adaptativeGroup.children.push(generateSubgroup("Fri", "Sunny.png", 71, 66));
-
-        // use the rich Tile-like visual layout
-        binding.children.push(adaptativeGroup);
-    } else {
-        var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-        adaptativeText2.text = "Monday ? 63� / 42�";
-
-        var adaptativeText3 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-        adaptativeText3.text = "Tuesday ? 57� / 38�"
-
-        // we'll just add two simple lines of text
-        binding.children.push(adaptativeText2);
-        binding.children.push(adaptativeText3);
-    }
-
-    // construct the entire notification
-    var toastContent = new Microsoft.Toolkit.Uwp.Notifications.ToastContent();
-
-    toastContent.visual = new Microsoft.Toolkit.Uwp.Notifications.ToastVisual();
-    // use our binding from above
-    toastContent.visual.bindingGeneric = binding;
-    // set the base URI for the images, so we don't redundantly specify the entire path
-    toastContent.visual.baseUri = new Windows.Foundation.Uri("ms-appx:///Assets/NotificationAssets/");
-
-    // include launch string so we know what to open when user clicks toast
-    toastContent.launch = "action=viewForecast&zip=98008";
-
-    return toastContent;
-};
-
-var generateTileBindingSmall = function () {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    tileBinding.content.textStacking = Microsoft.Toolkit.Uwp.Notifications.TileTextStacking.Center;
-
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Mon";
-    adaptativeText1.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.Body;
-    adaptativeText1.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.Center;
-
-    var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText2.text = "63�";
-    adaptativeText2.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.Base;
-    adaptativeText2.hintAlign = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextAlign.Center;
-
-    tileBinding.content.children.push(adaptativeText1);
-    tileBinding.content.children.push(adaptativeText2);
-
-    return tileBinding;
-};
-
-var generateTileBindingMedium = function () {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    var adaptativeGroup = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup()
-    adaptativeGroup.children.push(generateSubgroup("Mon", "Mostly Cloudy.png", 63, 42));
-    adaptativeGroup.children.push(generateSubgroup("Tue", "Cloudy.png", 57, 38));
-
-    tileBinding.content.children.push(adaptativeGroup);
-
-    return tileBinding;
-};
-
-var generateTileBindingWide = function () {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    var adaptativeGroup = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-    adaptativeGroup.children.push(generateSubgroup("Mon", "Mostly Cloudy.png", 63, 42));
-    adaptativeGroup.children.push(generateSubgroup("Tue", "Cloudy.png", 57, 38));
-    adaptativeGroup.children.push(generateSubgroup("Wed", "Sunny.png", 59, 43));
-    adaptativeGroup.children.push(generateSubgroup("Thu", "Sunny.png", 62, 42));
-    adaptativeGroup.children.push(generateSubgroup("Fri", "Sunny.png", 71, 66));
-
-    tileBinding.content.children.push(adaptativeGroup);
-
-    return tileBinding;
-};
-
-var generateTileBindingLarge = function () {
-    var tileBinding = new Microsoft.Toolkit.Uwp.Notifications.TileBinding();
-
-    tileBinding.content = new Microsoft.Toolkit.Uwp.Notifications.TileBindingContentAdaptive();
-
-    // 1. group
-    var adaptativeGroup1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-    var adaptativeSubgroup1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-    adaptativeSubgroup1.hintWeight = 30;
-
-    var adaptativeImage1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveImage();
-    adaptativeImage1.source = "Mostly Cloudy.png";
-    adaptativeSubgroup1.children.push(adaptativeImage1);
-
-    var adaptativeSubgroup2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveSubgroup();
-
-    var adaptativeText1 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText1.text = "Monday";
-    adaptativeText1.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.base;
-
-    var adaptativeText2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText2.text = "63� / 42�";
-
-    var adaptativeText3 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText3.text = "20% chance of rain";
-    adaptativeText3.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.captionSubtle;
-
-    var adaptativeText4 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText();
-    adaptativeText4.text = "Winds 5 mph NE";
-    adaptativeText4.hintStyle = Microsoft.Toolkit.Uwp.Notifications.AdaptiveTextStyle.captionSubtle;
-
-    adaptativeSubgroup2.children.push(adaptativeText1);
-    adaptativeSubgroup2.children.push(adaptativeText2);
-    adaptativeSubgroup2.children.push(adaptativeText3);
-    adaptativeSubgroup2.children.push(adaptativeText4);
-
-    adaptativeGroup1.children.push(adaptativeSubgroup1);
-    adaptativeGroup1.children.push(adaptativeSubgroup2);
-
-    tileBinding.content.children.push(adaptativeGroup1);
-
-    // 2. for spacing
-    tileBinding.content.children.push(new Microsoft.Toolkit.Uwp.Notifications.AdaptiveText());
-
-    // 3. group
-    var adaptativeGroup2 = new Microsoft.Toolkit.Uwp.Notifications.AdaptiveGroup();
-
-    adaptativeGroup2.children.push(generateLargeSubgroup("Tue", "Cloudy.png", 57, 38));
-    adaptativeGroup2.children.push(generateLargeSubgroup("Wed", "Sunny.png", 59, 43));
-    adaptativeGroup2.children.push(generateLargeSubgroup("Thu", "Sunny.png", 62, 42));
-    adaptativeGroup2.children.push(generateLargeSubgroup("Fri", "Sunny.png", 71, 66));
-
-    tileBinding.content.children.push(adaptativeGroup2);
-
-    return tileBinding;
-};
-
-var generateTileContent = function () {
-    var tileContent = new Microsoft.Toolkit.Uwp.Notifications.TileContent();
-    tileContent.visual = new Microsoft.Toolkit.Uwp.Notifications.TileVisual();
-
-    tileContent.visual.tileSmall = generateTileBindingSmall();
-    tileContent.visual.tileMedium = generateTileBindingMedium();
-    tileContent.visual.tileWide = generateTileBindingWide();
-    tileContent.visual.tileLarge = generateTileBindingLarge();
-
-    // set the base URI for the images, so we don't redundantly specify the entire path
-    tileContent.visual.baseUri = new Windows.Foundation.Uri("ms-appx:///Assets/NotificationAssets/");
-
-    return tileContent;
-};
-
-var pinTile = function () {
-    var tile = new Windows.UI.StartScreen.SecondaryTile(new Date().getTime());
-
-    tile.displayName = "WeatherSample";
-    tile.arguments = "args";
-    tile.visualElements.square150x150Logo = square150x150Logo;
-    tile.visualElements.wide310x150Logo = wide310x150Logo;
-    tile.visualElements.square310x310Logo = square310x310Logo;
-    tile.visualElements.showNameOnSquare150x150Logo = true;
-    tile.visualElements.showNameOnSquare310x310Logo = true;
-    tile.visualElements.showNameOnWide310x150Logo = true;
-
-    tile.requestCreateAsync()
-        .then(function () {
-            // generate the tile notification content and update the tile
-            var content = generateTileContent();
-            var tileNotification = new Windows.UI.Notifications.TileNotification(content.getXml());
-            Windows.UI.Notifications.TileUpdateManager.createTileUpdaterForSecondaryTile(tile.TileId).update(tileNotification);
-        });
-};
-
-var popToast = function () {
-    // generate the toast notification content and pop the toast
-    var content = generateToastContent();
-    var toast = new Windows.UI.Notifications.ToastNotification(content.getXml());
-    Windows.UI.Notifications.ToastNotificationManager.createToastNotifier().show(toast);
-};
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index d172b39aa34..3abda74cf17 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -5,14 +5,11 @@
 using System;
 using Microsoft.Toolkit.Uwp.Notifications;
 using Microsoft.Toolkit.Uwp.SampleApp.Common;
-using Microsoft.Toolkit.Uwp.SampleApp.Models;
 using NotificationsVisualizerLibrary;
-using Windows.Foundation.Metadata;
 using Windows.System.Profile;
 using Windows.UI.Notifications;
 using Windows.UI.StartScreen;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Navigation;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -119,10 +116,9 @@ private static bool IsAdaptiveToastSupported()
         {
             switch (AnalyticsInfo.VersionInfo.DeviceFamily)
             {
-                // Desktop and Mobile started supporting adaptive toasts in API contract 3 (Anniversary Update)
                 case "Windows.Mobile":
                 case "Windows.Desktop":
-                    return ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
+                    return true;
 
                 // Other device families do not support adaptive toasts
                 default:
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 526cae34d5e..1a5c5303b40 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -882,7 +882,6 @@
         "About": "This shows how to update a Live Tile with a rich Adaptive notification.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications",
         "CodeFile": "LiveTileCode.bind",
-        "JavaScriptCodeFile": "LiveTileCodeJavaScript.bind",
         "Icon": "/SamplePages/LiveTile/LiveTile.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/notifications/NotificationsOverview.md"
       },
@@ -893,7 +892,6 @@
         "About": "This shows how to send a Toast notification.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications",
         "CodeFile": "ToastCode.bind",
-        "JavaScriptCodeFile": "ToastCodeJavaScript.bind",
         "Icon": "/SamplePages/Toast/Toast.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/notifications/NotificationsOverview.md"
       },
@@ -904,7 +902,6 @@
         "About": "This shows how to send a Weather Live Tile and Toast notification, displaying the forecast.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications",
         "CodeFile": "WeatherLiveTileAndToastCode.bind",
-        "JavaScriptCodeFile": "WeatherLiveTileAndToastCodeJavaScript.bind",
         "Icon": "/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToast.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/notifications/NotificationsOverview.md"
       },
@@ -1139,7 +1136,7 @@
       {
         "Name": "ViewExtensions",
         "Type": "ViewExtensionsPage",
-        "About": "View extensions to set StatusBar and TitleBar properties.",
+        "About": "View extensions to set TitleBar properties.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions",
         "XamlCodeFile": "ViewExtensionsCode.bind",
         "Icon": "/SamplePages/ViewExtensions/ViewExtensions.png",
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
index be888c5b9fa..80cc95787c6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
@@ -6,14 +6,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.SampleApp.Pages;
 using Microsoft.Toolkit.Uwp.UI.Animations;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
@@ -331,10 +329,7 @@ private void HideMoreInfo()
             if (MoreInfoImage != null && MoreInfoContent.DataContext != null)
             {
                 var animation = ConnectedAnimationService.GetForCurrentView().GetAnimation("sample_icon");
-                if (ApiInformation.IsTypePresent("Windows.UI.Xaml.Media.Animation.DirectConnectedAnimationConfiguration"))
-                {
-                    animation.Configuration = new DirectConnectedAnimationConfiguration();
-                }
+                animation.Configuration = new DirectConnectedAnimationConfiguration();
 
                 _ = SamplePickerGridView.TryStartConnectedAnimationAsync(animation, MoreInfoContent.DataContext, "SampleIcon");
             }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
index 2cf8264d642..7aa45fcdc86 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
@@ -10,7 +10,6 @@
       xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors"
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      extensions:StatusBarExtensions.IsVisible="False"
       extensions:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
       extensions:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
       extensions:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Styles/ThemeInjector.cs b/Microsoft.Toolkit.Uwp.SampleApp/Styles/ThemeInjector.cs
index 5e809a8495c..c0a595ac3c4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Styles/ThemeInjector.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Styles/ThemeInjector.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
@@ -21,46 +20,43 @@ public static void InjectThemeResources(ResourceDictionary dict)
             darkTheme = themes.ThemeDictionaries["Dark"] as ResourceDictionary;
             lightTheme = themes.ThemeDictionaries["Light"] as ResourceDictionary;
 
-            if (ApiInformation.IsTypePresent("Windows.UI.Xaml.Media.AcrylicBrush"))
+            AddAcrylic(new ThemeAcrylic
             {
-                AddAcrylic(new ThemeAcrylic
+                Name = "Background-AboutPage-SidePane",
+                DarkAcrylic = new AcrylicBrush
                 {
-                    Name = "Background-AboutPage-SidePane",
-                    DarkAcrylic = new AcrylicBrush
-                    {
-                        TintColor = Helpers.ColorHelper.ToColor("#FF333333"),
-                        TintOpacity = 0.8,
-                        BackgroundSource = AcrylicBackgroundSource.Backdrop,
-                        FallbackColor = Helpers.ColorHelper.ToColor("#FF333333")
-                    },
-                    LightAcrylic = new AcrylicBrush
-                    {
-                        TintColor = Colors.White,
-                        TintOpacity = 0.8,
-                        BackgroundSource = AcrylicBackgroundSource.Backdrop,
-                        FallbackColor = Colors.White
-                    }
-                });
+                    TintColor = Helpers.ColorHelper.ToColor("#FF333333"),
+                    TintOpacity = 0.8,
+                    BackgroundSource = AcrylicBackgroundSource.Backdrop,
+                    FallbackColor = Helpers.ColorHelper.ToColor("#FF333333")
+                },
+                LightAcrylic = new AcrylicBrush
+                {
+                    TintColor = Colors.White,
+                    TintOpacity = 0.8,
+                    BackgroundSource = AcrylicBackgroundSource.Backdrop,
+                    FallbackColor = Colors.White
+                }
+            });
 
-                AddAcrylic(new ThemeAcrylic
+            AddAcrylic(new ThemeAcrylic
+            {
+                Names = new[] { "Commands-Background" },
+                DarkAcrylic = new AcrylicBrush
                 {
-                    Names = new[] { "Commands-Background" },
-                    DarkAcrylic = new AcrylicBrush
-                    {
-                        TintColor = Helpers.ColorHelper.ToColor("#FF111111"),
-                        TintOpacity = 0.7,
-                        BackgroundSource = AcrylicBackgroundSource.Backdrop,
-                        FallbackColor = Helpers.ColorHelper.ToColor("#FF111111")
-                    },
-                    LightAcrylic = new AcrylicBrush
-                    {
-                        TintColor = Helpers.ColorHelper.ToColor("#FFDDDDDD"),
-                        TintOpacity = 0.6,
-                        BackgroundSource = AcrylicBackgroundSource.Backdrop,
-                        FallbackColor = Helpers.ColorHelper.ToColor("#FFDDDDDD")
-                    }
-                });
-            }
+                    TintColor = Helpers.ColorHelper.ToColor("#FF111111"),
+                    TintOpacity = 0.7,
+                    BackgroundSource = AcrylicBackgroundSource.Backdrop,
+                    FallbackColor = Helpers.ColorHelper.ToColor("#FF111111")
+                },
+                LightAcrylic = new AcrylicBrush
+                {
+                    TintColor = Helpers.ColorHelper.ToColor("#FFDDDDDD"),
+                    TintOpacity = 0.6,
+                    BackgroundSource = AcrylicBackgroundSource.Backdrop,
+                    FallbackColor = Helpers.ColorHelper.ToColor("#FFDDDDDD")
+                }
+            });
         }
 
         private static void AddAcrylic(ThemeAcrylic resource)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/readme.md b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
index 846f1f665ef..52741e7ffe4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/readme.md
+++ b/Microsoft.Toolkit.Uwp.SampleApp/readme.md
@@ -168,7 +168,7 @@ The value is a string which is the fully-qualified typename to check for the pre
 ```json
     {
         //...
-        "About": "MySample needs 10.0.16299 or higher to work.",
+        "About": "MySample needs 10.0.18362 or higher to work.",
         "ApiCheck": "Windows.UI.Xaml.Controls.NavigationView",
         "BadgeUpdateVersionRequired": "Fall Creators Update required",
         //...
diff --git a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
index 5a6580a8eed..20a7e071373 100644
--- a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
+++ b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>Microsoft.Toolkit.Uwp.Samples.BackgroundTasks</AssemblyName>
     <DefaultLanguage>fr-FR</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <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/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs
index d2b26d7cd08..a81b7a5d8fe 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs
@@ -8,19 +8,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
 {
     internal class ApiInformationHelper
     {
-        private static bool? _isAniversaryUpdateOrAbove;
-        private static bool? _isCreatorsUpdateOrAbove;
-        private static bool? _isFallCreatorsUpdateOrAbove;
-
-        public static bool IsAniversaryUpdateOrAbove => (bool)(_isAniversaryUpdateOrAbove ??
-            (_isAniversaryUpdateOrAbove = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3)));
-
-        public static bool IsCreatorsUpdateOrAbove => (bool)(_isCreatorsUpdateOrAbove ??
-            (_isCreatorsUpdateOrAbove = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 4)));
-
-        public static bool IsFallCreatorsUpdateOrAbove => (bool)(_isFallCreatorsUpdateOrAbove ??
-            (_isFallCreatorsUpdateOrAbove = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5)));
-
         public static bool IsXamlRootAvailable { get; } = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Blur.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Blur.cs
index ebdb1ab2240..3a56da53c15 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Blur.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Blur.cs
@@ -9,17 +9,9 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations.Behaviors
     /// <summary>
     /// Performs an blur animation using composition.
     /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Blurs are only supported on Build 1607 and up. Assigning the blur behavior on an older
-    /// version of Windows will not add any effect. You can use the <see cref="AnimationExtensions.IsBlurSupported"/>
-    /// property to check for whether blurs are supported on the device at runtime.
-    /// </para>
-    /// </remarks>
     /// <seealso>
     ///     <cref>Microsoft.Xaml.Interactivity.Behavior{Windows.UI.Xaml.UIElement}</cref>
     /// </seealso>
-    /// <seealso cref="AnimationExtensions.IsBlurSupported"/>
     public class Blur : CompositionBehaviorBase<FrameworkElement>
     {
         /// <summary>
@@ -44,10 +36,7 @@ public double Value
         /// </summary>
         public override void StartAnimation()
         {
-            if (AnimationExtensions.BlurEffect.IsSupported)
-            {
-                AssociatedObject?.Blur(duration: Duration, delay: Delay, value: (float)Value, easingType: EasingType, easingMode: EasingMode)?.Start();
-            }
+            AssociatedObject?.Blur(duration: Duration, delay: Delay, value: (float)Value, easingType: EasingType, easingMode: EasingMode)?.Start();
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
index d35769e43e0..c965f783473 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
@@ -5,7 +5,6 @@
 using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
 using Microsoft.Toolkit.Uwp.UI.Behaviors;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Hosting;
@@ -91,13 +90,6 @@ public UIElement HeaderElement
         /// <returns><c>true</c> if the assignment was successful; otherwise, <c>false</c>.</returns>
         private bool AssignFadeAnimation()
         {
-            // Confirm that Windows.UI.Xaml.Hosting.ElementCompositionPreview is available (Windows 10 10586 or later).
-            if (!ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", nameof(ElementCompositionPreview.GetScrollViewerManipulationPropertySet)))
-            {
-                // Just return true since it's not supported
-                return true;
-            }
-
             if (AssociatedObject == null)
             {
                 return false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
index 8940f3eb630..556972c1dae 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Light.cs
@@ -13,7 +13,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations.Behaviors
     /// Applies a basic point light to a UIElement. You control the intensity by setting the distance of the light.
     /// </summary>
     /// <seealso cref="Microsoft.Toolkit.Uwp.UI.Animations.Behaviors.CompositionBehaviorBase" />
-    /// <seealso cref="AnimationExtensions.IsLightingSupported"/>
     [Obsolete("The Light effect will be removed in a future major release. Please use XamlLight instead")]
 
     public class Light : CompositionBehaviorBase<FrameworkElement>
@@ -54,16 +53,13 @@ public Brush Color
         /// </summary>
         public override void StartAnimation()
         {
-            if (AnimationExtensions.IsLightingSupported)
-            {
-                AssociatedObject?.Light(
-                    duration: Duration,
-                    delay: Delay,
-                    easingType: EasingType,
-                    easingMode: EasingMode,
-                    distance: (float)Distance,
-                    color: ((SolidColorBrush)Color).Color)?.Start();
-            }
+            AssociatedObject?.Light(
+                duration: Duration,
+                delay: Delay,
+                easingType: EasingType,
+                easingMode: EasingMode,
+                distance: (float)Distance,
+                color: ((SolidColorBrush)Color).Color)?.Start();
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
index 3cb2a030d0c..fe86fd75bbb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
@@ -6,7 +6,6 @@
 using Microsoft.Toolkit.Uwp.UI.Behaviors;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -104,13 +103,6 @@ private bool AssignAnimation()
         {
             StopAnimation();
 
-            // Confirm that Windows.UI.Xaml.Hosting.ElementCompositionPreview is available (Windows 10 10586 or later).
-            if (!ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", nameof(ElementCompositionPreview.GetScrollViewerManipulationPropertySet)))
-            {
-                // Just return true since it's not supported
-                return true;
-            }
-
             if (AssociatedObject == null)
             {
                 return false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Saturation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Saturation.cs
index 7cb5c6352f5..61e0050fcb0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Saturation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/Saturation.cs
@@ -38,15 +38,12 @@ public double Value
         /// </summary>
         public override void StartAnimation()
         {
-            if (AnimationExtensions.SaturationEffect.IsSupported)
-            {
-                _frameworkElement?.Saturation(
-                    duration: Duration,
-                    delay: Delay,
-                    easingType: EasingType,
-                    easingMode: EasingMode,
-                    value: (float)Value)?.StartAsync();
-            }
+            _frameworkElement?.Saturation(
+                duration: Duration,
+                delay: Delay,
+                easingType: EasingType,
+                easingMode: EasingMode,
+                value: (float)Value)?.StartAsync();
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
index 6eae922af7f..6aa45714b58 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
@@ -6,7 +6,6 @@
 using Microsoft.Toolkit.Uwp.UI.Behaviors;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -106,13 +105,6 @@ private bool AssignAnimation()
         {
             StopAnimation();
 
-            // Confirm that Windows.UI.Xaml.Hosting.ElementCompositionPreview is available (Windows 10 10586 or later).
-            if (!ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", nameof(ElementCompositionPreview.GetScrollViewerManipulationPropertySet)))
-            {
-                // Just return true since it's not supported
-                return true;
-            }
-
             if (AssociatedObject == null)
             {
                 return false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TranslationAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TranslationAnimation.cs
index d223a94939b..1ce4a10ee8a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TranslationAnimation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TranslationAnimation.cs
@@ -20,18 +20,5 @@ public TranslationAnimation()
         {
             Target = "Translation";
         }
-
-        /// <inheritdoc/>
-        public override CompositionAnimation GetCompositionAnimation(Compositor compositor)
-        {
-            if (ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return base.GetCompositionAnimation(compositor);
-            }
-            else
-            {
-                return null;
-            }
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TypedAnimationBase.cs b/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TypedAnimationBase.cs
index 4c302916826..fed3156586c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TypedAnimationBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/Animations/TypedAnimationBase.cs
@@ -69,11 +69,7 @@ public override CompositionAnimation GetCompositionAnimation(Compositor composit
             animation.Target = Target;
             animation.Duration = Duration;
             animation.DelayTime = Delay;
-
-            if (ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                animation.DelayBehavior = SetInitialValueBeforeDelay ? AnimationDelayBehavior.SetInitialValueBeforeDelay : AnimationDelayBehavior.SetInitialValueAfterDelay;
-            }
+            animation.DelayBehavior = SetInitialValueBeforeDelay ? AnimationDelayBehavior.SetInitialValueBeforeDelay : AnimationDelayBehavior.SetInitialValueAfterDelay;
 
             if (KeyFrames.Count == 0)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
index 999ea1d40c4..f3ae5aba79d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs
@@ -378,11 +378,6 @@ public static void SetListDataItemForNextConnectedAnimation(this Frame frame, ob
 
         private static void OnKeyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var element = d as FrameworkElement;
             if (element == null)
             {
@@ -406,11 +401,6 @@ private static void OnKeyChanged(DependencyObject d, DependencyPropertyChangedEv
 
         private static void OnAnchorElementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var element = d as FrameworkElement;
             if (element == null)
             {
@@ -434,11 +424,6 @@ private static void OnAnchorElementChanged(DependencyObject d, DependencyPropert
 
         private static void OnListItemKeyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var element = d as Windows.UI.Xaml.Controls.ListViewBase;
             if (element == null)
             {
@@ -462,11 +447,6 @@ private static void OnListItemKeyChanged(DependencyObject d, DependencyPropertyC
 
         private static void OnListItemElementNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var element = d as Windows.UI.Xaml.Controls.ListViewBase;
             if (element == null)
             {
@@ -520,7 +500,7 @@ private static void GetParentFrameAndExecuteAction(FrameworkElement element, Act
 
         private static void AddListViewBaseItemAnimationDetails(Page page, Windows.UI.Xaml.Controls.ListViewBase listViewBase)
         {
-            if (ApiInformationHelper.IsCreatorsUpdateOrAbove && listViewBase != null)
+            if (listViewBase != null)
             {
                 var elementName = GetListItemElementName(listViewBase);
                 var key = GetListItemKey(listViewBase);
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
index 31c18fe0ac3..35e33bb2f88 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Animation;
@@ -34,11 +33,6 @@ public ConnectedAnimationHelper(Frame frame)
                 throw new ArgumentNullException(nameof(frame));
             }
 
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             frame.Navigating += Frame_Navigating;
             frame.Navigated += Frame_Navigated;
         }
@@ -69,7 +63,7 @@ private void Frame_Navigating(object sender, Windows.UI.Xaml.Navigation.Navigati
             {
                 ConnectedAnimation animation = null;
 
-                if (props.IsListAnimation && parameter != null && ApiInformationHelper.IsCreatorsUpdateOrAbove)
+                if (props.IsListAnimation && parameter != null)
                 {
                     foreach (var listAnimProperty in props.ListAnimProperties)
                     {
@@ -97,8 +91,7 @@ private void Frame_Navigating(object sender, Windows.UI.Xaml.Navigation.Navigati
                 }
 
                 if (animation != null &&
-                    e.NavigationMode == Windows.UI.Xaml.Navigation.NavigationMode.Back &&
-                    ApiInformation.IsTypePresent("Windows.UI.Xaml.Media.Animation.DirectConnectedAnimationConfiguration"))
+                    e.NavigationMode == Windows.UI.Xaml.Navigation.NavigationMode.Back)
                 {
                     UseDirectConnectedAnimationConfiguration(animation);
                 }
@@ -147,7 +140,7 @@ void LoadedHandler(object s, RoutedEventArgs args)
                     var animationHandled = false;
                     if (connectedAnimation != null)
                     {
-                        if (props.IsListAnimation && parameter != null && ApiInformationHelper.IsCreatorsUpdateOrAbove)
+                        if (props.IsListAnimation && parameter != null)
                         {
                             foreach (var listAnimProperty in props.ListAnimProperties)
                             {
@@ -174,7 +167,7 @@ void LoadedHandler(object s, RoutedEventArgs args)
                         }
                         else if (!props.IsListAnimation)
                         {
-                            if (ApiInformationHelper.IsCreatorsUpdateOrAbove && coordinatedAnimationElements.TryGetValue(props.Element, out var coordinatedElements))
+                            if (coordinatedAnimationElements.TryGetValue(props.Element, out var coordinatedElements))
                             {
                                 connectedAnimation.TryStart(props.Element, coordinatedElements);
                             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/AnimationEffect.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/AnimationEffect.cs
index 3fe6bcff5a4..724e1e35fec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/AnimationEffect.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/AnimationEffect.cs
@@ -19,14 +19,6 @@ public abstract class AnimationEffect
     {
         private static string[] _effectProperties;
 
-        /// <summary>
-        /// Gets a value indicating whether this instance is supported.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is supported; otherwise, <c>false</c>.
-        /// </value>
-        public abstract bool IsSupported { get; }
-
         /// <summary>
         /// Gets the name of the effect.
         /// </summary>
@@ -80,11 +72,6 @@ public AnimationSet EffectAnimation(
                 return null;
             }
 
-            if (!IsSupported)
-            {
-                return null;
-            }
-
             var visual = animationSet.Visual;
             var associatedObject = animationSet.Element as FrameworkElement;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Blur.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Blur.cs
index 8363413159a..aa60fd5e059 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Blur.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Blur.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Graphics.Canvas.Effects;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 
 namespace Microsoft.Toolkit.Uwp.UI.Animations.Effects
@@ -14,15 +13,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations.Effects
     /// <seealso cref="Microsoft.Toolkit.Uwp.UI.Animations.Effects.AnimationEffect" />
     public class Blur : AnimationEffect
     {
-        /// <summary>
-        /// Gets a value indicating whether blur is supported.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is supported; otherwise, <c>false</c>.
-        /// </value>
-        public override bool IsSupported
-            => ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
-
         /// <summary>
         /// Gets the name of the effect.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Saturation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Saturation.cs
index e13fa57c1a3..30289f925a3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Saturation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Effects/Saturation.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Graphics.Canvas.Effects;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 
 namespace Microsoft.Toolkit.Uwp.UI.Animations.Effects
@@ -14,15 +13,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations.Effects
     /// <seealso cref="Microsoft.Toolkit.Uwp.UI.Animations.Effects.AnimationEffect" />
     public class Saturation : AnimationEffect
     {
-        /// <summary>
-        /// Gets a value indicating whether Saturation is supported.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is supported; otherwise, <c>false</c>.
-        /// </value>
-        public override bool IsSupported
-            => ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
-
         /// <summary>
         /// Gets the name of the effect.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
index c18d3e78958..879e7a2819d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Blur.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Toolkit.Uwp.UI.Animations.Effects;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Animation;
 
@@ -22,17 +21,6 @@ public static partial class AnimationExtensions
         /// </value>
         public static Blur BlurEffect { get; } = new Blur();
 
-        /// <summary>
-        /// Gets a value indicating whether the platform supports blur.
-        /// </summary>
-        /// <remarks>
-        /// A check should always be made to IsBlurSupported prior to calling Blur,
-        /// since older operating systems will not support blurs.
-        /// </remarks>
-        /// <seealso cref="Blur(FrameworkElement, double, double, double, EasingType, EasingMode)"/>
-        public static bool IsBlurSupported =>
-            ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
-
         /// <summary>
         /// Animates the Gaussian blur of the UIElement.
         /// </summary>
@@ -45,7 +33,6 @@ public static partial class AnimationExtensions
         /// <returns>
         /// An Animation Set.
         /// </returns>
-        /// <seealso cref="IsBlurSupported" />
         public static AnimationSet Blur(
             this FrameworkElement associatedObject,
             double value = 0d,
@@ -75,7 +62,6 @@ public static AnimationSet Blur(
         /// <returns>
         /// An Animation Set.
         /// </returns>
-        /// <seealso cref="IsBlurSupported" />
         public static AnimationSet Blur(
             this AnimationSet animationSet,
             double value = 0d,
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
index 0949dd235dd..88573df78c9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
@@ -27,32 +27,6 @@ public static partial class AnimationExtensions
         /// </summary>
         private static Dictionary<Visual, PointLight> pointLights = new Dictionary<Visual, PointLight>();
 
-        /// <summary>
-        /// Gets a value indicating whether this instance is lighting supported.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is lighting supported; otherwise, <c>false</c>.
-        /// </value>
-        public static bool IsLightingSupported
-        {
-            get
-            {
-                bool lightingSupported = true;
-
-                if (!Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.UI.Xaml.Hosting.ElementCompositionPreview", "SetElementChildVisual"))
-                {
-                    lightingSupported = false;
-                }
-
-                if (!Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.Composition.CompositionSurfaceBrush"))
-                {
-                    lightingSupported = false;
-                }
-
-                return lightingSupported;
-            }
-        }
-
         /// <summary>
         /// Animates a point light and it's distance.
         /// </summary>
@@ -93,7 +67,6 @@ public static AnimationSet Light(
         /// <param name="color">The color of the spotlight.</param>
         /// <param name="easingType">The easing function</param>
         /// <param name="easingMode">The easing mode</param>
-        /// <seealso cref="IsLightingSupported" />
         /// <returns>
         /// An Animation Set.
         /// </returns>
@@ -107,11 +80,6 @@ public static AnimationSet Light(
             EasingType easingType = EasingType.Default,
             EasingMode easingMode = EasingMode.EaseOut)
         {
-            if (!IsLightingSupported)
-            {
-                return null;
-            }
-
             if (animationSet == null)
             {
                 return null;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs
index 59fe6c42fbe..a8a28187eba 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs
@@ -118,11 +118,6 @@ public static void SetAnimations(DependencyObject obj, AnimationCollection value
 
         private static void ShowAnimationsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             if (e.OldValue is AnimationCollection oldCollection)
             {
                 oldCollection.AnimationCollectionChanged -= ShowCollectionChanged;
@@ -139,11 +134,6 @@ private static void ShowAnimationsChanged(DependencyObject d, DependencyProperty
 
         private static void HideAnimationsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             if (e.OldValue is AnimationCollection oldCollection)
             {
                 oldCollection.AnimationCollectionChanged -= HideCollectionChanged;
@@ -176,11 +166,6 @@ private static void AnimationsChanged(DependencyObject d, DependencyPropertyChan
 
         private static void ShowCollectionChanged(object sender, EventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var collection = (AnimationCollection)sender;
             if (collection.Parent == null)
             {
@@ -192,11 +177,6 @@ private static void ShowCollectionChanged(object sender, EventArgs e)
 
         private static void HideCollectionChanged(object sender, EventArgs e)
         {
-            if (!ApiInformationHelper.IsCreatorsUpdateOrAbove)
-            {
-                return;
-            }
-
             var collection = (AnimationCollection)sender;
             if (collection.Parent == null)
             {
@@ -220,7 +200,7 @@ private static void AnimationsCollectionChanged(object sender, EventArgs e)
 
         private static CompositionAnimationGroup GetCompositionAnimationGroup(AnimationCollection collection, UIElement element)
         {
-            if (ApiInformationHelper.IsCreatorsUpdateOrAbove && collection.ContainsTranslationAnimation)
+            if (collection.ContainsTranslationAnimation)
             {
                 ElementCompositionPreview.SetIsTranslationEnabled(element, true);
             }
@@ -230,7 +210,7 @@ private static CompositionAnimationGroup GetCompositionAnimationGroup(AnimationC
 
         private static ImplicitAnimationCollection GetImplicitAnimationCollection(AnimationCollection collection, UIElement element)
         {
-            if (ApiInformationHelper.IsCreatorsUpdateOrAbove && collection.ContainsTranslationAnimation)
+            if (collection.ContainsTranslationAnimation)
             {
                 ElementCompositionPreview.SetIsTranslationEnabled(element, true);
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
index e2542fcca87..df6558d9426 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.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 Animations</Title>
     <Description>
       This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
index b8e86ad1596..f05d5b1d46c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -19,16 +18,6 @@ public class ReorderGridAnimation
         private static readonly DependencyProperty ReorderAnimationProperty =
             DependencyProperty.RegisterAttached("ReorderAnimation", typeof(bool), typeof(ImplicitAnimationCollection), new PropertyMetadata(null));
 
-        /// <summary>
-        /// Gets a value indicating whether the platform supports the animation.
-        /// </summary>
-        /// <remarks>
-        /// On platforms not supporting the animation, this class has no effect.
-        /// </remarks>
-        public static bool IsSupported =>
-            Windows.ApplicationModel.DesignMode.DesignModeEnabled ? false :
-            ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3); // SDK >= 14393
-
         /// <summary>
         /// Identifies the Duration attached dependency property.
         /// </summary>
@@ -57,7 +46,7 @@ public static void SetDuration(DependencyObject obj, double value)
 
         private static void OnDurationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported == false)
+            if (Windows.ApplicationModel.DesignMode.DesignModeEnabled)
             {
                 return;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj
index 2250fc69b2f..77f8ff582ca 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj
@@ -12,21 +12,21 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.16299</AssetTargetFallback>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
   </PropertyGroup>
   <PropertyGroup>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.17763\Design\</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\uap10.0.17763\Design\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <Optimize>true</Optimize>
@@ -113,7 +113,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\$(Configuration)\uap10.0.16299\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml">
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml">
       <Link>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml</Link>
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
index 703734b2d04..abfe33de4c2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -5834,7 +5834,7 @@ private void DataGrid_PointerExited(object sender, PointerRoutedEventArgs e)
         private void DataGrid_PointerMoved(object sender, PointerRoutedEventArgs e)
         {
             // Don't process if this is a generated replay of the event.
-            if (TypeHelper.IsRS3OrHigher && e.IsGenerated)
+            if (e.IsGenerated)
             {
                 return;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml
index 021cef53831..9793d66dd02 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml
@@ -12,8 +12,6 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
-                    xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:localprimitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
 
@@ -335,11 +333,7 @@
                                 <VisualState x:Name="SeparatorCollapsed"/>
                                 <VisualState x:Name="SeparatorExpanded">
                                     <Storyboard>
-                                        <contract6NotPresent:DoubleAnimation Duration="{ThemeResource ScrollBarsSeparatorExpandDuration}"
-                                            Storyboard.TargetName="BottomRightCorner"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"/>
-                                        <contract6Present:DoubleAnimation Duration="{ThemeResource ScrollBarsSeparatorExpandDuration}"
+                                        <DoubleAnimation Duration="{ThemeResource ScrollBarsSeparatorExpandDuration}"
                                             BeginTime="{ThemeResource ScrollBarsSeparatorExpandBeginTime}"
                                             Storyboard.TargetName="BottomRightCorner"
                                             Storyboard.TargetProperty="Opacity"
@@ -348,11 +342,7 @@
                                 </VisualState>
                                 <VisualState x:Name="SeparatorExpandedWithoutAnimation">
                                     <Storyboard>
-                                        <contract6NotPresent:DoubleAnimation Duration="0"
-                                            Storyboard.TargetName="BottomRightCorner"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"/>
-                                        <contract6Present:DoubleAnimation Duration="0"
+                                        <DoubleAnimation Duration="0"
                                             BeginTime="{ThemeResource ScrollBarsSeparatorExpandBeginTime}"
                                             Storyboard.TargetName="BottomRightCorner"
                                             Storyboard.TargetProperty="Opacity"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
index c4648ffd2a8..fb417ede285 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17763</TargetFramework>
     <Title>Windows Community Toolkit Controls DataGrid</Title>
     <Description>
       This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs
index df98d5e165b..a1728c3508d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs
@@ -19,7 +19,6 @@ internal static class TypeHelper
         internal const char RightIndexerToken = ']';
 
         private static bool isAPIsAvailableInitialized = false;
-        private static bool isRS3OrHigher = false;
         private static bool isXamlRootAvailable = false;
 
         // Methods
@@ -459,19 +458,6 @@ internal static Type GetCustomOrCLRType(this object instance)
             return instance == null ? null : instance.GetType();
         }
 
-        internal static bool IsRS3OrHigher
-        {
-            get
-            {
-                if (!isAPIsAvailableInitialized)
-                {
-                    InitializeAPIsAvailable();
-                }
-
-                return isRS3OrHigher;
-            }
-        }
-
         internal static bool IsXamlRootAvailable
         {
             get
@@ -487,7 +473,6 @@ internal static bool IsXamlRootAvailable
 
         internal static void InitializeAPIsAvailable()
         {
-            isRS3OrHigher = Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5);
             isXamlRootAvailable = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");
             isAPIsAvailableInitialized = true;
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
index 84484c19126..1201d323388 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
@@ -13,21 +13,21 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NoWarn>$(NoWarn);0618</NoWarn>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.16299</AssetTargetFallback>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
   </PropertyGroup>
   <PropertyGroup>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\uap10.0.17763\Design\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <Optimize>true</Optimize>
@@ -136,7 +136,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\uap10.0.16299\Microsoft.Toolkit.Uwp.UI.Controls.xml">
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
       <Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link>
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index b9b96f32d13..7496c876c9e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.17134</TargetFramework>
-    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetFramework>uap10.0.17763</TargetFramework>
+    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <Title>Windows Community Toolkit Layout</Title>
     <Description>
       This library provides XAML layout controls. It is part of the Windows Community Toolkit.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
index a0fee831253..a03aff9ca16 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj
@@ -13,21 +13,21 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NoWarn>$(NoWarn);0618</NoWarn>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.16299</AssetTargetFallback>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
   </PropertyGroup>
   <PropertyGroup>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.17763\Design\</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.16299\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.17763\Design\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <Optimize>true</Optimize>
@@ -114,7 +114,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\$(Configuration)\uap10.0.16299\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml">
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml">
       <Link>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml</Link>
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
index dac3a18170e..5066137f810 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
@@ -276,12 +276,9 @@ async Task<ImageSource> IImageResolver.ResolveImageAsync(string url, string tool
 
             ImageSource GetImageSource(Uri imageUrl)
             {
-                if (_isSvgImageSupported)
+                if (Path.GetExtension(imageUrl.AbsolutePath)?.ToLowerInvariant() == ".svg")
                 {
-                    if (Path.GetExtension(imageUrl.AbsolutePath)?.ToLowerInvariant() == ".svg")
-                    {
-                        return new SvgImageSource(imageUrl);
-                    }
+                    return new SvgImageSource(imageUrl);
                 }
 
                 return new BitmapImage(imageUrl);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
index 568df9e1f38..5489e350b76 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Properties.cs
@@ -7,11 +7,9 @@
 using ColorCode.Styling;
 using Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Render;
 using Microsoft.Toolkit.Uwp.UI.Helpers;
-using Windows.Foundation.Metadata;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Documents;
 using Windows.UI.Xaml.Media;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -21,9 +19,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class MarkdownTextBlock
     {
-        // SvgImageSource was introduced in Creators Update (15063)
-        private static readonly bool _isSvgImageSupported = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 4);
-
         // Used to attach the URL to hyperlinks.
         private static readonly DependencyProperty HyperlinkUrlProperty =
             DependencyProperty.RegisterAttached("HyperlinkUrl", typeof(string), typeof(MarkdownTextBlock), new PropertyMetadata(null));
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 9fe9742d1a9..7fc82cb0be3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17763</TargetFramework>
     <Title>Windows Community Toolkit Controls Markdown</Title>
     <Description>
       This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is part of the Windows Community Toolkit.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
index e83ea316c03..d1c50feabb1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
@@ -388,14 +388,7 @@ protected override void RenderStrikethroughRun(StrikethroughTextInline element,
 
             Span span = new Span();
 
-            if (TextDecorationsSupported)
-            {
-                span.TextDecorations = TextDecorations.Strikethrough;
-            }
-            else
-            {
-                span.FontFamily = new FontFamily("Consolas");
-            }
+            span.TextDecorations = TextDecorations.Strikethrough;
 
             var childContext = new InlineRenderContext(span.Inlines, context)
             {
@@ -405,22 +398,6 @@ protected override void RenderStrikethroughRun(StrikethroughTextInline element,
             // Render the children into the inline.
             RenderInlineChildren(element.Inlines, childContext);
 
-            if (!TextDecorationsSupported)
-            {
-                AlterChildRuns(span, (parentSpan, run) =>
-                {
-                    var text = run.Text;
-                    var builder = new StringBuilder(text.Length * 2);
-                    foreach (var c in text)
-                    {
-                        builder.Append((char)0x0336);
-                        builder.Append(c);
-                    }
-
-                    run.Text = builder.ToString();
-                });
-            }
-
             // Add it to the current inlines
             localContext.InlineCollection.Add(span);
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs
index c4e8a7d38fa..f90b8b00ade 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Properties.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Reflection;
-using Windows.Foundation.Metadata;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -16,11 +15,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Render
     /// </summary>
     public partial class MarkdownRenderer
     {
-        private static bool? _textDecorationsSupported = null;
-
-        private static bool TextDecorationsSupported => (bool)(_textDecorationsSupported ??
-                        (_textDecorationsSupported = ApiInformation.IsTypePresent("Windows.UI.Text.TextDecorations")));
-
         /// <summary>
         /// Super Hack to retain inertia and passing the Scroll data onto the Parent ScrollViewer.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs b/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs
index 2e02ec4c07c..8dec9a4d421 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs
@@ -145,15 +145,8 @@ private void SetMediaPlayerSource()
                         };
                     }
 
-                    if (Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.Media.Core.MediaSource", "CreateFromMediaFrameSource", 1))
-                    {
-                        _mediaPlayer.Source = MediaSource.CreateFromMediaFrameSource(frameSource);
-                        _mediaPlayerElementControl.SetMediaPlayer(_mediaPlayer);
-                    }
-                    else
-                    {
-                        InvokePreviewFailed("CameraPreview is only supported on the April 2018 Windows 10 Update or later");
-                    }
+                    _mediaPlayer.Source = MediaSource.CreateFromMediaFrameSource(frameSource);
+                    _mediaPlayerElementControl.SetMediaPlayer(_mediaPlayer);
                 }
             }
             catch (Exception ex)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs
index 5f76c3667ed..a29c19e6844 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.ApplicationModel;
-using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -58,15 +56,6 @@ public partial class DropShadowPanel
         public static readonly DependencyProperty IsMaskedProperty =
             DependencyProperty.Register(nameof(IsMasked), typeof(bool), typeof(DropShadowPanel), new PropertyMetadata(true, OnIsMaskedChanged));
 
-        /// <summary>
-        /// Gets a value indicating whether the platform supports drop shadows.
-        /// </summary>
-        /// <remarks>
-        /// On platforms not supporting drop shadows, this control has no effect.
-        /// </remarks>
-        public static bool IsSupported =>
-            (!DesignTimeHelpers.IsRunningInLegacyDesignerMode) && ApiInformation.IsTypePresent("Windows.UI.Composition.DropShadow"); // SDK >= 14393
-
         /// <summary>
          /// Gets DropShadow. Exposes the underlying composition object to allow custom Windows.UI.Composition animations.
          /// </summary>
@@ -202,7 +191,7 @@ public bool IsMasked
 
         private static void OnBlurRadiusChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnBlurRadiusChanged((double)e.NewValue);
             }
@@ -210,7 +199,7 @@ private static void OnBlurRadiusChanged(DependencyObject d, DependencyPropertyCh
 
         private static void OnColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnColorChanged((Color)e.NewValue);
             }
@@ -218,7 +207,7 @@ private static void OnColorChanged(DependencyObject d, DependencyPropertyChanged
 
         private static void OnOffsetXChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnOffsetXChanged((double)e.NewValue);
             }
@@ -226,7 +215,7 @@ private static void OnOffsetXChanged(DependencyObject d, DependencyPropertyChang
 
         private static void OnOffsetYChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnOffsetYChanged((double)e.NewValue);
             }
@@ -234,7 +223,7 @@ private static void OnOffsetYChanged(DependencyObject d, DependencyPropertyChang
 
         private static void OnOffsetZChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnOffsetZChanged((double)e.NewValue);
             }
@@ -242,7 +231,7 @@ private static void OnOffsetZChanged(DependencyObject d, DependencyPropertyChang
 
         private static void OnShadowOpacityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.OnShadowOpacityChanged((double)e.NewValue);
             }
@@ -250,7 +239,7 @@ private static void OnShadowOpacityChanged(DependencyObject d, DependencyPropert
 
         private static void OnIsMaskedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (IsSupported && d is DropShadowPanel panel)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && d is DropShadowPanel panel)
             {
                 panel.UpdateShadowMask();
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs
index 9178516e57d..3e189f4d800 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs
@@ -34,7 +34,7 @@ public DropShadowPanel()
         {
             this.DefaultStyleKey = typeof(DropShadowPanel);
 
-            if (IsSupported)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
                 Compositor compositor = ElementCompositionPreview.GetElementVisual(this).Compositor;
 
@@ -50,7 +50,7 @@ public DropShadowPanel()
         /// </summary>
         protected override void OnApplyTemplate()
         {
-            if (!IsSupported)
+            if (DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
                 return;
             }
@@ -93,7 +93,7 @@ protected override void OnContentChanged(object oldContent, object newContent)
 
         private void OnSizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (IsSupported)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
                 UpdateShadowSize();
             }
@@ -103,7 +103,7 @@ private void ConfigureShadowVisualForCastingElement()
         {
             UpdateShadowMask();
 
-            if (IsSupported)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
                 UpdateShadowSize();
             }
@@ -127,7 +127,7 @@ private void OnColorChanged(Color newValue)
 
         private void OnOffsetXChanged(double newValue)
         {
-            if (IsSupported && _dropShadow != null)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && _dropShadow != null)
             {
                 UpdateShadowOffset((float)newValue, _dropShadow.Offset.Y, _dropShadow.Offset.Z);
             }
@@ -135,7 +135,7 @@ private void OnOffsetXChanged(double newValue)
 
         private void OnOffsetYChanged(double newValue)
         {
-            if (IsSupported && _dropShadow != null)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && _dropShadow != null)
             {
                 UpdateShadowOffset(_dropShadow.Offset.X, (float)newValue, _dropShadow.Offset.Z);
             }
@@ -143,7 +143,7 @@ private void OnOffsetYChanged(double newValue)
 
         private void OnOffsetZChanged(double newValue)
         {
-            if (IsSupported && _dropShadow != null)
+            if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode && _dropShadow != null)
             {
                 UpdateShadowOffset(_dropShadow.Offset.X, _dropShadow.Offset.Y, (float)newValue);
             }
@@ -159,7 +159,7 @@ private void OnShadowOpacityChanged(double newValue)
 
         private void UpdateShadowMask()
         {
-            if (!IsSupported)
+            if (DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
                 return;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
index a472dae24a2..a32c1f93676 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.Foundation.Metadata;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
@@ -56,11 +55,6 @@ public partial class ImageExBase
         /// </summary>
         public static readonly DependencyProperty EnableLazyLoadingProperty = DependencyProperty.Register(nameof(EnableLazyLoading), typeof(bool), typeof(ImageExBase), new PropertyMetadata(false));
 
-        /// <summary>
-        /// Gets a value indicating whether <see cref="EnableLazyLoading"/> is supported
-        /// </summary>
-        public static bool IsLazyLoadingSupported { get; } = ApiInformation.IsEventPresent("Windows.UI.Xaml.FrameworkElement", nameof(EffectiveViewportChanged));
-
         /// <summary>
         /// Returns a mask that represents the alpha channel of an image as a <see cref="CompositionBrush"/>
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
index 41acbb86571..2b13c681121 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
@@ -49,21 +49,14 @@ private static void SourceChanged(DependencyObject d, DependencyPropertyChangedE
 
             if (e.OldValue == null || e.NewValue == null || !e.OldValue.Equals(e.NewValue))
             {
-                if (IsLazyLoadingSupported)
+                if (e.NewValue == null || !control.EnableLazyLoading || control._isInViewport)
                 {
-                    if (e.NewValue == null || !control.EnableLazyLoading || control._isInViewport)
-                    {
-                        control._lazyLoadingSource = null;
-                        control.SetSource(e.NewValue);
-                    }
-                    else
-                    {
-                        control._lazyLoadingSource = e.NewValue;
-                    }
+                    control._lazyLoadingSource = null;
+                    control.SetSource(e.NewValue);
                 }
                 else
                 {
-                    control.SetSource(e.NewValue);
+                    control._lazyLoadingSource = e.NewValue;
                 }
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
index 80c2e695f82..a62f6bffa31 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
@@ -80,10 +80,7 @@ public ImageExBase()
         {
             LockObj = new object();
 
-            if (IsLazyLoadingSupported)
-            {
-                EffectiveViewportChanged += ImageExBase_EffectiveViewportChanged;
-            }
+            EffectiveViewportChanged += ImageExBase_EffectiveViewportChanged;
         }
 
         /// <summary>
@@ -177,21 +174,14 @@ protected override void OnApplyTemplate()
 
             ImageExInitialized?.Invoke(this, EventArgs.Empty);
 
-            if (IsLazyLoadingSupported)
+            if (Source == null || !EnableLazyLoading || _isInViewport)
             {
-                if (Source == null || !EnableLazyLoading || _isInViewport)
-                {
-                    _lazyLoadingSource = null;
-                    SetSource(Source);
-                }
-                else
-                {
-                    _lazyLoadingSource = Source;
-                }
+                _lazyLoadingSource = null;
+                SetSource(Source);
             }
             else
             {
-                SetSource(Source);
+                _lazyLoadingSource = Source;
             }
 
             AttachImageOpened(OnImageOpened);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
index 5277f9b09f9..b345dc7ba43 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
@@ -35,13 +33,8 @@
         <Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
     </Style>
 
-    <contract7NotPresent:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
-                               TargetType="local:InAppNotification">
-        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
-    </contract7NotPresent:Style>
-
-    <contract7Present:Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
+    <Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
                             TargetType="local:InAppNotification">
         <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumLowAcrylicElementMediumBrush}" />
-    </contract7Present:Style>
+    </Style>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
index 221644775c8..e28da50ceec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
@@ -1,9 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:contract5Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)"
-    xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)">
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
@@ -11,8 +9,7 @@
             <SolidColorBrush x:Key="SystemControlButtonBorderBrushPointerOver" Color="{StaticResource SystemBaseLowColor}" />
             <SolidColorBrush x:Key="SystemControlButtonForegroundPointerOver" Color="{StaticResource SystemBaseHighColor}" />
             <SolidColorBrush x:Key="SystemControlBackgroundBrush" Color="Transparent" />
-            <contract5NotPresent:SolidColorBrush x:Key="SystemControlFlyoutBackgroundBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
-            <contract5Present:AcrylicBrush x:Key="SystemControlFlyoutBackgroundBrush"
+            <AcrylicBrush x:Key="SystemControlFlyoutBackgroundBrush"
                                            BackgroundSource="Backdrop" 
                                            TintColor="{StaticResource SystemChromeMediumLowColor}" 
                                            TintOpacity="0.8" 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
index d12750d85b0..4dbe5a80025 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
@@ -9,7 +9,6 @@
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -27,8 +26,6 @@ public class MenuItem : HeaderedItemsControl
     {
         private const string FlyoutButtonName = "FlyoutButton";
         private const char UnderlineCharacter = '^';
-        private readonly bool _isAccessKeySupported = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
-        private readonly bool _isTextTextDecorationsSupported = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 4);
         private Menu _parentMenu;
         private bool _isOpened;
         private bool _menuFlyoutRepositioned;
@@ -130,11 +127,8 @@ protected override void OnApplyTemplate()
 
                 IsEnabledChanged += MenuItem_IsEnabledChanged;
 
-                if (_isAccessKeySupported)
-                {
-                    FlyoutButton.AccessKey = AccessKey;
-                    AccessKey = string.Empty;
-                }
+                FlyoutButton.AccessKey = AccessKey;
+                AccessKey = string.Empty;
             }
 
             if (_parentMenu?.CurrentFlyoutPlacement != null)
@@ -464,10 +458,7 @@ internal void Underline()
                 Text = underlinedCharacter.ToString()
             };
 
-            if (_isTextTextDecorationsSupported)
-            {
-                runWithUnderlinedCharacter.TextDecorations = Windows.UI.Text.TextDecorations.Underline;
-            }
+            runWithUnderlinedCharacter.TextDecorations = Windows.UI.Text.TextDecorations.Underline;
 
             var firstPartBuilder = new StringBuilder();
             var secondPartBuilder = new StringBuilder();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 4e3def286e9..6258250a2f0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.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 Controls</Title>
     <Description>
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
index cdc4af642c5..00912da8913 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
@@ -13,13 +13,11 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
     using Microsoft.Toolkit.Uwp.UI.Extensions;
     using Windows.Foundation;
-    using Windows.Foundation.Metadata;
     using Windows.UI.Composition;
     using Windows.UI.Xaml;
     using Windows.UI.Xaml.Controls;
     using Windows.UI.Xaml.Hosting;
     using Windows.UI.Xaml.Media;
-    using Windows.UI.Xaml.Shapes;
 
     /// <summary>
     /// Orientation of the scroll
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
index 61506d7540e..ab242e8c616 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
@@ -314,7 +314,7 @@
         </Setter>
     </Style>
 
-    <!-- Copy of System Style from 18362 to try and workaround WinUI Styles -->
+    <!-- Copy of System Style from 19041 to try and workaround WinUI Styles -->
     <Style TargetType="AutoSuggestBox" x:Key="SystemAutoSuggestBoxStyle">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="IsTabStop" Value="False" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
index 306e3159fe3..454177bd41e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
@@ -7,10 +7,8 @@
 using System.Linq;
 using Microsoft.Toolkit.Extensions;
 using Windows.Foundation;
-using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -19,9 +17,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class UniformGrid : Grid
     {
-        // Guard for 15063 as Grid Spacing only works on 16299+.
-        private static bool _hasGridSpacing = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.Grid", "ColumnSpacing");
-
         // Internal list we use to keep track of items that we don't have space to layout.
         private List<UIElement> _overflow = new List<UIElement>();
 
@@ -70,12 +65,8 @@ protected override Size MeasureOverride(Size availableSize)
             double columnSpacingSize = 0;
             double rowSpacingSize = 0;
 
-            // Guard for 15063 as Grid Spacing only works on 16299+.
-            if (_hasGridSpacing)
-            {
-                columnSpacingSize = ColumnSpacing * (columns - 1);
-                rowSpacingSize = RowSpacing * (rows - 1);
-            }
+            columnSpacingSize = ColumnSpacing * (columns - 1);
+            rowSpacingSize = RowSpacing * (rows - 1);
 
             Size childSize = new Size(
                 (availableSize.Width - columnSpacingSize) / columns,
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
index 51bf3e87f5b..d7ba95d0111 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17763</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <Title>Windows Community Toolkit UI Media</Title>
     <Description>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBarExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBarExtensions.cs
deleted file mode 100644
index 734577d6606..00000000000
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBarExtensions.cs
+++ /dev/null
@@ -1,165 +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 Windows.UI;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Extensions
-{
-    /// <summary>
-    /// Provides attached dependency properties for interacting with the <see cref="StatusBar"/> on a window (app view).
-    /// </summary>
-    public static class StatusBarExtensions
-    {
-        /// <summary>
-        /// Gets a value indicating whether StatusBar is supported or not.
-        /// </summary>
-        public static bool IsStatusBarSupported => Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.ViewManagement.StatusBar");
-
-        /// <summary>
-        /// Gets Color for StatusBar.BackgroundColor
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <returns>Color</returns>
-        public static Color GetBackgroundColor(Page page)
-        {
-            Color color;
-
-            var statusBar = GetStatusBar();
-            if (statusBar != null)
-            {
-                color = statusBar.BackgroundColor.GetValueOrDefault();
-            }
-
-            return color;
-        }
-
-        /// <summary>
-        /// Sets Color to StatusBar.BackgroundColor
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <param name="value">Color</param>
-        public static void SetBackgroundColor(Page page, Color value)
-        {
-            var statusBar = GetStatusBar();
-            if (statusBar != null)
-            {
-                statusBar.BackgroundColor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets Color from StatusBar.ForegroundColor
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <returns>Color</returns>
-        public static Color GetForegroundColor(Page page)
-        {
-            Color color;
-
-            var statusBar = GetStatusBar();
-            if (statusBar != null)
-            {
-                color = statusBar.ForegroundColor.GetValueOrDefault();
-            }
-
-            return color;
-        }
-
-        /// <summary>
-        /// Sets Color to StatusBar.ForegroundColor
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <param name="value"> Color</param>
-        public static void SetForegroundColor(Page page, Color value)
-        {
-            var statusBar = GetStatusBar();
-            if (statusBar != null)
-            {
-                statusBar.ForegroundColor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="double"/> from StatusBar.BackgroundOpacity
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <returns><see cref="double"/></returns>
-        public static double GetBackgroundOpacity(Page page)
-        {
-            return GetStatusBar()?.BackgroundOpacity ?? 0;
-        }
-
-        /// <summary>
-        /// Sets <see cref="double"/> to StatusBar.BackgroundOpacity
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <param name="value"><see cref="double"/></param>
-        public static void SetBackgroundOpacity(Page page, double value)
-        {
-            var statusBar = GetStatusBar();
-            if (statusBar != null)
-            {
-                statusBar.BackgroundOpacity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets <see cref="bool"/> indicating whether <see cref="StatusBar"/> is visible or not.
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public static bool GetIsVisible(Page page)
-        {
-            var statusBar = GetStatusBar();
-
-            return statusBar?.OccludedRect.Height > 0;
-        }
-
-        /// <summary>
-        /// Sets a <see cref="bool"/> resulting in <see cref="StatusBar"/> becoming visible or invisible.
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/></param>
-        /// <param name="value"><see cref="bool"/></param>
-        public static void SetIsVisible(Page page, bool value)
-        {
-            page.SetValue(IsVisibleProperty, value);
-        }
-
-        /// <summary>
-        /// Using a DependencyProperty as the backing store for IsVisible.  This enables animation, styling, binding, etc...
-        /// </summary>
-        public static readonly DependencyProperty IsVisibleProperty =
-            DependencyProperty.RegisterAttached("IsVisible", typeof(bool), typeof(StatusBarExtensions), new PropertyMetadata(true, OnIsVisibleChanged));
-
-        private static async void OnIsVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var statusBar = GetStatusBar();
-
-            if (statusBar == null)
-            {
-                return;
-            }
-
-            bool isVisible = (bool)e.NewValue;
-
-            if (isVisible)
-            {
-                await statusBar.ShowAsync();
-            }
-            else
-            {
-                await statusBar.HideAsync();
-            }
-        }
-
-        private static Windows.UI.ViewManagement.StatusBar GetStatusBar()
-        {
-            return IsStatusBarSupported ? Windows.UI.ViewManagement.StatusBar.GetForCurrentView() : null;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
index 185e17a9c87..d084519707d 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.Foundation.Metadata;
 using Windows.UI.Input;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -230,11 +229,6 @@ public static bool IsSupported
         {
             get
             {
-                if (!ApiInformation.IsTypePresent("Windows.UI.Input.RadialController"))
-                {
-                    return false;
-                }
-
                 if (!RadialController.IsSupported())
                 {
                     return false;
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBarExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBarExtensions.cs
index 33353b8f485..c811339472a 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBarExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBarExtensions.cs
@@ -13,11 +13,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
     /// </summary>
     public static class TitleBarExtensions
     {
-        /// <summary>
-        /// Gets a value indicating whether TitleBar is supported or not.
-        /// </summary>
-        public static bool IsTitleBarSupported => Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.ViewManagement.ApplicationViewTitleBar");
-
         /// <summary>
         /// Gets Color for <see cref="ApplicationViewTitleBar.BackgroundColor"/>
         /// </summary>
@@ -404,7 +399,7 @@ public static void SetInactiveForegroundColor(Page page, Color value)
 
         private static ApplicationViewTitleBar GetTitleBar()
         {
-            return IsTitleBarSupported ? ApplicationView.GetForCurrentView()?.TitleBar : null;
+            return ApplicationView.GetForCurrentView()?.TitleBar;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Helpers/DesignTimeHelpers.cs b/Microsoft.Toolkit.Uwp.UI/Helpers/DesignTimeHelpers.cs
index cd6f0da9754..24268bd9fef 100644
--- a/Microsoft.Toolkit.Uwp.UI/Helpers/DesignTimeHelpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Helpers/DesignTimeHelpers.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Reflection;
 
 namespace Microsoft.Toolkit.Uwp.UI
 {
@@ -55,24 +54,7 @@ private static bool InitializeDesignerMode()
         /// <returns>True if called from code running inside a XAML designer that targets the Windows 10 Fall Creators Update, or later; otherwise false.</returns>
         private static bool InitializeDesignMode2()
         {
-            bool designMode2Enabled = false;
-            try
-            {
-                // The reflection below prevents the code to take a direct dependency on Fall Creators Update SDK
-                if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.ApplicationModel.DesignMode", "DesignMode2Enabled"))
-                {
-                    var prop = typeof(Windows.ApplicationModel.DesignMode).GetProperty("DesignMode2Enabled");
-                    if (prop != null && prop.PropertyType == typeof(bool))
-                    {
-                        designMode2Enabled = (bool)prop.GetValue(null);
-                    }
-                }
-            }
-            catch
-            {
-            }
-
-            return designMode2Enabled;
+            return Windows.ApplicationModel.DesignMode.DesignMode2Enabled;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
index e6ef83568c6..99767ff0f0c 100644
--- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
+++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17763</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <Title>Windows Community Toolkit UI</Title>
     <Description>
@@ -30,7 +30,6 @@
       - ScaleTransformExtensions: Extension methods for ScaleTransform.
       - ScrollViewerExtensions: Provides attached dependency properties for the ListViewBase
       - SkewTransformExtensions: Extension methods for SkewTransform.
-      - StatusBarExtensions: Provides attached dependency properties for interacting with the StatusBar on a window (app view).
       - SurfaceDialTextbox: Helper class that provides attached properties to enable any TextBox with the Surface Dial.
       - TextBoxMask: TextBox mask property allows a user to more easily enter fixed width text in TextBox control.
       - TextBoxRegex: TextBoxRegex allows text validation using a regular expression.
@@ -47,9 +46,6 @@
     <PackageTags>UWP Toolkit Windows UI Converters XAML extensions helpers</PackageTags>
 
     <UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
-    
-    <!-- For StatusBar -->
-    <UseWindowsMobileSdk>true</UseWindowsMobileSdk>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
index 142000987ec..ec1a56e79c8 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/CameraHelper.cs
@@ -131,10 +131,7 @@ public async Task<CameraHelperResult> InitializeAndStartCaptureAsync()
                 if (PreviewFrameSource != null)
                 {
                     _frameReader = await _mediaCapture.CreateFrameReaderAsync(PreviewFrameSource);
-                    if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.Media.Capture.Frames.MediaFrameReader", "AcquisitionMode"))
-                    {
-                        _frameReader.AcquisitionMode = MediaFrameReaderAcquisitionMode.Realtime;
-                    }
+                    _frameReader.AcquisitionMode = MediaFrameReaderAcquisitionMode.Realtime;
 
                     _frameReader.FrameArrived += Reader_FrameArrived;
 
diff --git a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/FrameEventArgs.cs b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/FrameEventArgs.cs
index a3cb0e0ff8d..f3d0425cb5d 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/FrameEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/CameraHelper/FrameEventArgs.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Threading;
-using Windows.Foundation.Metadata;
 using Windows.Graphics.Imaging;
 using Windows.Media;
 
@@ -29,9 +28,7 @@ public VideoFrame VideoFrame
                 _semaphore.Wait();
 
                 // The VideoFrame could be disposed at any time so we need to create a copy we can use.
-                // This API is only available on 17134 so we return the original VideoFrame on older versions.
                 if (_videoFrameCopy == null &&
-                    ApiInformation.IsMethodPresent("Windows.Media.VideoFrame", "CreateWithSoftwareBitmap", 1) &&
                     _videoFrame != null &&
                     _videoFrame.SoftwareBitmap != null)
                 {
diff --git a/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
index f1190105639..842176428c4 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
@@ -6,10 +6,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Windows.Foundation.Metadata;
 using Windows.System;
 using Windows.System.RemoteSystems;
-using Windows.System.Threading;
 
 namespace Microsoft.Toolkit.Uwp.Helpers
 {
@@ -73,18 +71,7 @@ private async void GenerateSystemsWithFilterAsync(List<IRemoteSystemFilter> filt
                 _remoteSystemWatcher.RemoteSystemAdded += RemoteSystemWatcher_RemoteSystemAdded;
                 _remoteSystemWatcher.RemoteSystemRemoved += RemoteSystemWatcher_RemoteSystemRemoved;
                 _remoteSystemWatcher.RemoteSystemUpdated += RemoteSystemWatcher_RemoteSystemUpdated;
-                if (ApiInformation.IsEventPresent("Windows.System.RemoteSystems.RemoteSystemWatcher", "EnumerationCompleted"))
-                {
-                    _remoteSystemWatcher.EnumerationCompleted += RemoteSystemWatcher_EnumerationCompleted;
-                }
-                else
-                {
-                    ThreadPoolTimer.CreateTimer(
-                        (e) =>
-                        {
-                            RemoteSystemWatcher_EnumerationCompleted(_remoteSystemWatcher, null);
-                        }, TimeSpan.FromSeconds(2));
-                }
+                _remoteSystemWatcher.EnumerationCompleted += RemoteSystemWatcher_EnumerationCompleted;
 
                 _remoteSystemWatcher.Start();
             }
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
index 445fb25bbf1..07ef6adb800 100644
--- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
+++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.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</Title>
     <Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
     <PackageTags>UWP Toolkit Windows</PackageTags>
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
index 9457baf56ba..39663f0f30c 100644
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
+++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>UnitTests.HighPerformance.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <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/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
index 9de862b14da..c470562a7ad 100644
--- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
+++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>UnitTests.Notifications.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <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/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
index 7b7b9a8eb6a..e75092c90ed 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
+++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>UnitTests.Notifications.WinRT</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <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/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index a9893fa92c0..3e2ace9eb19 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>UnitTests.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <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/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest b/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
index 1d1aaf29eda..824a20958a6 100644
--- a/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
+++ b/UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
@@ -19,7 +19,7 @@
 
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.18362.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>
diff --git a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
index a6903f454c6..d461847b4e0 100644
--- a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
+++ b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
@@ -51,7 +51,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>dcfbf9f1-2bbe-498d-b6c9-8ade50c06cdc</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>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 5d4f2ab6393..4b1f7502b2d 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>UnitTests.XamlIslands.UWPApp</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/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
index ab52bd03741..5c5865ea3b4 100644
--- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
+++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
@@ -6,13 +6,13 @@
     <Platforms>x64;x86</Platforms>
     <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssetTargetFallback>uap10.0.18362</AssetTargetFallback>
+    <AssetTargetFallback>uap10.0.19041</AssetTargetFallback>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <StartupObject>UnitTests.XamlIslands.Program</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/UnitTests/UnitTests.XamlIslands/app.manifest b/UnitTests/UnitTests.XamlIslands/app.manifest
index ada43287157..f1f44fdb0e1 100644
--- a/UnitTests/UnitTests.XamlIslands/app.manifest
+++ b/UnitTests/UnitTests.XamlIslands/app.manifest
@@ -27,7 +27,7 @@
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <maxversiontested Id="10.0.18362.0"/>
+      <maxversiontested Id="10.0.19041.0"/>
     </application>
   </compatibility>
 </assembly>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 8ce8fd2fec3..6ce662a327b 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -59,11 +59,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Notifications.JavaScript", "Microsoft.Toolkit.Uwp.Notifications.JavaScript\Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj", "{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}"
-	ProjectSection(ProjectDependencies) = postProject
-		{97EE849B-403C-490E-80ED-D19D7CC153FD} = {97EE849B-403C-490E-80ED-D19D7CC153FD}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81}
@@ -582,31 +577,6 @@ Global
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|x86.ActiveCfg = Release|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|x86.Build.0 = Release|x86
 		{EFA96B3C-857E-4659-B942-6BEF7719F4CA}.Release|x86.Deploy.0 = Release|x86
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|ARM.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x64.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Debug|x86.Build.0 = Debug|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|Any CPU.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|ARM.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|ARM64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|x64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Native|x86.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|ARM.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|ARM.Build.0 = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|ARM64.Build.0 = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x64.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x64.Build.0 = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x86.ActiveCfg = Release|Any CPU
-		{94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x86.Build.0 = Release|Any CPU
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76470fb759b..230dc38f0b3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,7 +35,7 @@ steps:
 - script: nbgv cloud
   displayName: Set Version
 
-#- powershell: .\build\Install-WindowsSdkISO.ps1 18362
+#- powershell: .\build\Install-WindowsSdkISO.ps1 19041
 #  displayName: Insider SDK
 
 - powershell: .\build\build.ps1 -target=Build
diff --git a/readme.md b/readme.md
index dbfd2321508..d22c34a62f0 100644
--- a/readme.md
+++ b/readme.md
@@ -39,7 +39,6 @@ Once you do a search, you should see a list similar to the one below (versions m
 | Microsoft.Toolkit.Services | .NET Standard NuGet package containing cross-platform services helpers, such as LinkedIn, Microsoft Graph, Twitter and more |
 | Microsoft.Toolkit.Uwp | Main NuGet package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. |
 | Microsoft.Toolkit.Uwp.Notifications | Notifications Package - Generate tile, toast, and badge notifications for Windows 10 via code.  Includes intellisense support to avoid having to use the XML syntax |
-| Microsoft.Toolkit.Uwp.Notifications.Javascript | Notification Packages for JavaScript |
 | Microsoft.Toolkit.Uwp.UI | UI Packages - XAML converters, Visual tree extensions, and other extensions and helpers for your XAML UI |
 | Microsoft.Toolkit.Uwp.UI.Animations | Animations and Composition behaviors such as Blur, Fade, Rotate, etc. |
 | Microsoft.Toolkit.Uwp.UI.Controls | XAML Controls such as RadialGauge, RangeSelector, etc. | 
@@ -51,7 +50,7 @@ Once you do a search, you should see a list similar to the one below (versions m
 | Microsoft.Toolkit.Uwp.DeveloperTools | XAML user controls and services to help developer building their app | 
 
 ## <a name="supported"></a> Features
-The [Features list](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/blob/master/docs/toc.md#controls) refers to all the currently available features that can be found in the Windows Community Toolkit. Most features should work with the Falls Creator Update SDK 16299 and above; however, refer to specific documentation on each feature for more information.
+The [Features list](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/blob/master/docs/toc.md#controls) refers to all the currently available features that can be found in the Windows Community Toolkit. Most features should work with the April 2018 Update SDK 17134 and above; however, refer to specific documentation on each feature for more information.
 
 ## Feedback and Requests
 Please use [GitHub Issues](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues) for bug reports and feature requests.
@@ -62,8 +61,7 @@ The following dependencies are required for building the Windows Community Toolk
 
 * [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/) with UWP and .NET workloads
   * You'll also need to check the `C++ (v142) Universal Windows Platform tools` option under the UWP workload
-* [Windows SDK October 2018 Update 17763](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive)
-* [Sample App - Windows SDK May 2019 Update 18362](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive) - **Important:** If you're building the Sample App on 2004, you must install the 19041 SDK and re-target the app [ref](https://github.com/microsoft/microsoft-ui-xaml/issues/1286).
+* [Windows SDK April 2020 Update 19041](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive)
 * [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/visual-studio-sdks)
 * [.NET Framework 4.6.2 Developer Pack](https://dotnet.microsoft.com/download/visual-studio-sdks)
 

From ca46e0cca960a1ccff340c84c1b3447ba1cb4ceb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 17 Sep 2020 14:34:07 +0200
Subject: [PATCH 523/595] Added #ifdef block for unneeded using directive

---
 .../Extensions/StringExtensions.cs                              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
index 2d96413baa4..1fb0767fba1 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -5,7 +5,9 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
+#if !NETCOREAPP3_1
 using System.Runtime.InteropServices;
+#endif
 using Microsoft.Toolkit.HighPerformance.Enumerables;
 using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
 

From 0c797645f160d907e4e8bd4d12d957ec50fb42e9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 17 Sep 2020 15:51:59 +0200
Subject: [PATCH 524/595] Fixed incorrect XML docs

---
 .../Extensions/StringExtensions.cs                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
index 1fb0767fba1..74ba2edd2fd 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
@@ -109,7 +109,7 @@ public static int Count(this string text, char c)
         /// {
         ///     // Access the index and value of each item here...
         ///     int index = item.Index;
-        ///     string value = item.Value;
+        ///     char value = item.Value;
         /// }
         /// </code>
         /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.

From ad307c2db61b054a5e86b83a7f157899040740fb Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 17 Sep 2020 12:22:51 -0700
Subject: [PATCH 525/595] Small fixes for the notifications lib, targetting a
 new SDK.

---
 .../Microsoft.Toolkit.Uwp.Notifications.csproj              | 6 +++---
 .../WeatherLiveTileAndToastCode.bind                        | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 5d5f1a63808..a138bad89c5 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -18,10 +18,10 @@
   <Choose>
 
     <!--Desktop Win32 apps-->
-    <When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.0'">
+    <When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1'">
       <ItemGroup>
         <!--Reference Windows SDK NuGet of correct target platform version-->
-        <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
+        <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
       </ItemGroup>
       <PropertyGroup>
         <!--Define the WINDOWS_UWP conditional symbol, since the Windows.Data.Xml and the Windows.UI.Notification namespaces are available-->
@@ -40,7 +40,7 @@
   </Choose>
 
   <!--NET Core desktop apps also need the Registry NuGet package-->
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
   </ItemGroup>
   
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 7963c5a5640..0a9fcc65645 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -121,9 +121,10 @@ private static bool IsAdaptiveToastSupported()
 {
     switch (AnalyticsInfo.VersionInfo.DeviceFamily)
     {
+        // Desktop and Mobile started supporting adaptive toasts in API contract 3 (Anniversary Update)	
         case "Windows.Mobile":
         case "Windows.Desktop":
-            return true;
+            return ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 3);
 
         // Other device families do not support adaptive toasts
         default:

From 5e15e73aa59a73074ad849e800915bcd527217c9 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 17 Sep 2020 12:23:04 -0700
Subject: [PATCH 526/595] Applied PR feedback.

---
 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
index ab242e8c616..61506d7540e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
@@ -314,7 +314,7 @@
         </Setter>
     </Style>
 
-    <!-- Copy of System Style from 19041 to try and workaround WinUI Styles -->
+    <!-- Copy of System Style from 18362 to try and workaround WinUI Styles -->
     <Style TargetType="AutoSuggestBox" x:Key="SystemAutoSuggestBoxStyle">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="IsTabStop" Value="False" />

From 4c2204974af75ac4c6e9138c1d8a576b4df6eaa7 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 17 Sep 2020 12:25:54 -0700
Subject: [PATCH 527/595] Small PR feedback.

---
 .../WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index 3abda74cf17..e827a77ca91 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -116,7 +116,6 @@ private static bool IsAdaptiveToastSupported()
         {
             switch (AnalyticsInfo.VersionInfo.DeviceFamily)
             {
-                case "Windows.Mobile":
                 case "Windows.Desktop":
                     return true;
 

From 817253b22e97f0f862ea9d100d99daae23b52d4d Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 17 Sep 2020 13:12:31 -0700
Subject: [PATCH 528/595] Small fix when Independent loader might throw.

---
 .../Extensions/StringExtensions.cs              | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
index 1701e70ecdd..8d97fe8b1fd 100644
--- a/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Extensions/StringExtensions.cs
@@ -14,7 +14,18 @@ namespace Microsoft.Toolkit.Uwp.Extensions
     /// </summary>
     public static class StringExtensions
     {
-        private static readonly ResourceLoader IndependentLoader = ResourceLoader.GetForViewIndependentUse();
+        private static readonly ResourceLoader IndependentLoader;
+
+        static StringExtensions()
+        {
+            try
+            {
+                IndependentLoader = ResourceLoader.GetForViewIndependentUse();
+            }
+            catch
+            {
+            }
+        }
 
         /// <summary>
         /// Retrieves the provided resource for the current view context.
@@ -52,7 +63,7 @@ public static string GetLocalized(this string resourceKey, UIContext uiContext =
             }
             else
             {
-                return IndependentLoader.GetString(resourceKey);
+                return IndependentLoader?.GetString(resourceKey);
             }
         }
 
@@ -65,7 +76,7 @@ public static string GetLocalized(this string resourceKey, UIContext uiContext =
         public static string GetLocalized(this string resourceKey, string resourcePath)
         {
             // Try and retrieve resource at app level first.
-            var result = IndependentLoader.GetString(resourceKey);
+            var result = IndependentLoader?.GetString(resourceKey);
 
             if (string.IsNullOrEmpty(result))
             {

From b725cb8287c962feb0dacbe95c0b6ea417888e9b Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 17 Sep 2020 18:13:10 -0700
Subject: [PATCH 529/595] Switched back to TAEF for UI Tests. Added build task
 to enable running UI tests in mstest in the future.

---
 azure-pipelines.yml |  7 +++++++
 build/build.cake    | 21 +++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cd54edb8644..b82634d7b65 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,6 +59,13 @@ jobs:
     displayName: Publish Test Results
     condition: always()
 
+  - task: PublishPipelineArtifact@1
+    displayName: Publish Test WexLogFileOutput
+    inputs:
+      targetPath: .\build\WexLogFileOutput
+      artifactName: WexLogFileOutput
+    condition: succeededOrFailed()
+
   - task: PowerShell@2
     displayName: Authenticode Sign Packages
     inputs:
diff --git a/build/build.cake b/build/build.cake
index 0155ea4516b..cad3504f1d6 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -35,7 +35,7 @@ var toolsDir = buildDir + "/tools";
 var binDir = baseDir + "/bin";
 var nupkgDir = binDir + "/nupkg";
 
-var taefBinDir = baseDir + "/UITests/UITests.Tests.TAEF/bin/Release/netcoreapp2.1";
+var taefBinDir = baseDir + "/UITests/UITests.Tests.TAEF/bin/Release/netcoreapp3.1/win10-x86";
 
 var styler = toolsDir + "/XamlStyler.Console/tools/xstyler.exe";
 var stylerFile = baseDir + "/settings.xamlstyler";
@@ -305,7 +305,21 @@ Task("Test")
         ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"),
     };
     DotNetCoreTest(file.FullPath, testSettings);
-}).DoesForEach(GetFiles(baseDir + "/**/UITests.*.MSTest.csproj"), (file) => 
+}).DoesForEach(GetFiles(taefBinDir + "/**/UITests.Tests.TAEF.dll"), (file) =>
+{
+    Information("\nRunning TAEF Interaction Tests");
+
+    var result = StartProcess(System.IO.Path.GetDirectoryName(file.FullPath) + "/TE.exe", file.FullPath + " /screenCaptureOnError");
+    if (result != 0)
+    {
+        throw new InvalidOperationException("TAEF Tests failed!");
+    }
+}).DeferOnError();
+
+
+Task("MSTestUITest")
+	.Description("Runs UITests using MSTest")
+    .DoesForEach(GetFiles(baseDir + "/**/UITests.*.MSTest.csproj"), (file) =>
 {
     Information("\nRunning UI Interaction Tests");
 
@@ -317,8 +331,7 @@ Task("Test")
         Verbosity = DotNetCoreVerbosity.Normal
     };
     DotNetCoreTest(file.FullPath, testSettings);
-}).DeferOnError();
-
+});
 
 
 //////////////////////////////////////////////////////////////////////

From c01fe8f2fc918f17921fb6e91ff546a4f9ffed19 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 18 Sep 2020 21:59:53 +0200
Subject: [PATCH 530/595] Code tweaks to MemoryStream initialization

---
 .../Extensions/IMemoryOwnerExtensions.cs      |  2 ++
 .../Extensions/MemoryExtensions.cs            |  1 +
 .../Extensions/ReadOnlyMemoryExtensions.cs    |  1 +
 .../Streams/MemoryStream.cs                   | 30 ++++++++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
index 59b73fe8f84..cb4ec0f2829 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.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.Buffers;
 using System.Diagnostics.Contracts;
 using System.IO;
@@ -24,6 +25,7 @@ public static class IMemoryOwnerExtensions
         /// The caller does not need to track the lifetime of the input <see cref="IMemoryOwner{T}"/> of <see cref="byte"/>
         /// instance, as the returned <see cref="Stream"/> will take care of disposing that buffer when it is closed.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="memoryOwner"/> has an invalid data store.</exception>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Stream AsStream(this IMemoryOwner<byte> memoryOwner)
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
index 44b496170f5..794339fbbed 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
@@ -26,6 +26,7 @@ public static class MemoryExtensions
         /// In particular, the caller must ensure that the target buffer is not disposed as long
         /// as the returned <see cref="Stream"/> is in use, to avoid unexpected issues.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="memory"/> has an invalid data store.</exception>
         [Pure]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Stream AsStream(this Memory<byte> memory)
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
index 0639ae39c5f..eab50592776 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
@@ -25,6 +25,7 @@ public static class ReadOnlyMemoryExtensions
         /// In particular, the caller must ensure that the target buffer is not disposed as long
         /// as the returned <see cref="Stream"/> is in use, to avoid unexpected issues.
         /// </remarks>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="memory"/> has an invalid data store.</exception>
         [Pure]
         public static Stream AsStream(this ReadOnlyMemory<byte> memory)
         {
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
index 247fb3833ac..cd2908bd881 100644
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
@@ -21,9 +21,16 @@ internal static partial class MemoryStream
         /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance.</param>
         /// <param name="isReadOnly">Indicates whether or not <paramref name="memory"/> can be written to.</param>
         /// <returns>A <see cref="Stream"/> wrapping the underlying data for <paramref name="memory"/>.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="memory"/> has an invalid data store.</exception>
         [Pure]
         public static Stream Create(ReadOnlyMemory<byte> memory, bool isReadOnly)
         {
+            if (memory.IsEmpty)
+            {
+                // Return an empty stream if the memory was empty
+                return new MemoryStream<ArrayOwner>(ArrayOwner.Empty, isReadOnly);
+            }
+
             if (MemoryMarshal.TryGetArray(memory, out ArraySegment<byte> segment))
             {
                 var arraySpanSource = new ArrayOwner(segment.Array!, segment.Offset, segment.Count);
@@ -38,8 +45,7 @@ public static Stream Create(ReadOnlyMemory<byte> memory, bool isReadOnly)
                 return new MemoryStream<MemoryManagerOwner>(memoryManagerSpanSource, isReadOnly);
             }
 
-            // Return an empty stream if the memory was empty
-            return new MemoryStream<ArrayOwner>(ArrayOwner.Empty, isReadOnly);
+            return ThrowNotSupportedExceptionForInvalidMemory();
         }
 
         /// <summary>
@@ -47,11 +53,18 @@ public static Stream Create(ReadOnlyMemory<byte> memory, bool isReadOnly)
         /// </summary>
         /// <param name="memoryOwner">The input <see cref="IMemoryOwner{T}"/> instance.</param>
         /// <returns>A <see cref="Stream"/> wrapping the underlying data for <paramref name="memoryOwner"/>.</returns>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="memoryOwner"/> has an invalid data store.</exception>
         [Pure]
         public static Stream Create(IMemoryOwner<byte> memoryOwner)
         {
             Memory<byte> memory = memoryOwner.Memory;
 
+            if (memory.IsEmpty)
+            {
+                // Return an empty stream if the memory was empty
+                return new IMemoryOwnerStream<ArrayOwner>(ArrayOwner.Empty, memoryOwner);
+            }
+
             if (MemoryMarshal.TryGetArray(memory, out ArraySegment<byte> segment))
             {
                 var arraySpanSource = new ArrayOwner(segment.Array!, segment.Offset, segment.Count);
@@ -66,8 +79,17 @@ public static Stream Create(IMemoryOwner<byte> memoryOwner)
                 return new IMemoryOwnerStream<MemoryManagerOwner>(memoryManagerSpanSource, memoryOwner);
             }
 
-            // Return an empty stream if the memory was empty
-            return new IMemoryOwnerStream<ArrayOwner>(ArrayOwner.Empty, memoryOwner);
+            return ThrowNotSupportedExceptionForInvalidMemory();
+        }
+
+        /// <summary>
+        /// Throws a <see cref="ArgumentException"/> when a given <see cref="Memory{T}"/>
+        /// or <see cref="IMemoryOwner{T}"/> instance has an unsupported backing store.
+        /// </summary>
+        /// <returns>Nothing, this method always throws.</returns>
+        private static Stream ThrowNotSupportedExceptionForInvalidMemory()
+        {
+            throw new ArgumentException("The input instance doesn't have a valid underlying data store.");
         }
     }
 }

From 49b1ebaa7b4c46d024795089aa6e2ffe68e9aa91 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 18 Sep 2020 23:48:31 +0200
Subject: [PATCH 531/595] Switched a Span<T>.CopyTo to Array.Copy

---
 .../Extensions/ArrayPoolExtensions.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs
index 13d15a60aaf..1f7341a93e6 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs
@@ -46,7 +46,7 @@ public static void Resize<T>(this ArrayPool<T> pool, ref T[]? array, int newSize
             T[] newArray = pool.Rent(newSize);
             int itemsToCopy = Math.Min(array.Length, newSize);
 
-            array.AsSpan(0, itemsToCopy).CopyTo(newArray);
+            Array.Copy(array, 0, newArray, 0, itemsToCopy);
 
             pool.Return(array, clearArray);
 

From 32656db1cdd4ddc25e3a88c297ce4062fe64d2ad Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 20 Sep 2020 18:17:14 +0200
Subject: [PATCH 532/595] Minor memory usage improvement

---
 .../Messaging/WeakReferenceMessenger.cs       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
index 0a3a8717c0e..72b1683f577 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using Microsoft.Collections.Extensions;
 using Microsoft.Toolkit.Mvvm.Messaging.Internals;
@@ -181,8 +182,8 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                recipients = new ArrayPoolBufferWriter<object>();
-                handlers = new ArrayPoolBufferWriter<object>();
+                recipients = ArrayPoolBufferWriter<object>.Create();
+                handlers = ArrayPoolBufferWriter<object>.Create();
 
                 // We need a local, temporary copy of all the pending recipients and handlers to
                 // invoke, to avoid issues with handlers unregistering from messages while we're
@@ -232,8 +233,8 @@ public void Cleanup()
         {
             lock (this.recipientsMap)
             {
-                using ArrayPoolBufferWriter<Type2> type2s = new ArrayPoolBufferWriter<Type2>();
-                using ArrayPoolBufferWriter<object> emptyRecipients = new ArrayPoolBufferWriter<object>();
+                using ArrayPoolBufferWriter<Type2> type2s = ArrayPoolBufferWriter<Type2>.Create();
+                using ArrayPoolBufferWriter<object> emptyRecipients = ArrayPoolBufferWriter<object>.Create();
 
                 var enumerator = this.recipientsMap.GetEnumerator();
 
@@ -385,7 +386,12 @@ public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
         /// A simple buffer writer implementation using pooled arrays.
         /// </summary>
         /// <typeparam name="T">The type of items to store in the list.</typeparam>
-        private sealed class ArrayPoolBufferWriter<T> : IDisposable
+        /// <remarks>
+        /// This type is a <see langword="ref"/> <see langword="struct"/> to avoid the object allocation and to
+        /// enable the pattern-based <see cref="IDisposable"/> support. We aren't worried with consumers not
+        /// using this type correctly since it's private and only accessible within the parent type.
+        /// </remarks>
+        private ref struct ArrayPoolBufferWriter<T>
         {
             /// <summary>
             /// The default buffer size to use to expand empty arrays.
@@ -403,12 +409,13 @@ private sealed class ArrayPoolBufferWriter<T> : IDisposable
             private int index;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
+            /// Creates a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> struct.
             /// </summary>
-            public ArrayPoolBufferWriter()
+            [Pure]
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public static ArrayPoolBufferWriter<T> Create()
             {
-                this.array = ArrayPool<T>.Shared.Rent(DefaultInitialBufferSize);
-                this.index = 0;
+                return new ArrayPoolBufferWriter<T> { array = ArrayPool<T>.Shared.Rent(DefaultInitialBufferSize) };
             }
 
             /// <summary>
@@ -461,7 +468,7 @@ private void ResizeBuffer()
                 this.array = rent;
             }
 
-            /// <inheritdoc/>
+            /// <inheritdoc cref="IDisposable.Dispose"/>
             public void Dispose()
             {
                 Array.Clear(this.array, 0, this.index);

From 232e5dabde8861dd17f1efedcd1cd1f04695d073 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 21 Sep 2020 16:45:44 +0200
Subject: [PATCH 533/595] Fixed incorrect blur in loading sample

---
 .../SamplePages/Loading/LoadingCode.bind               |  2 +-
 .../SamplePages/Loading/LoadingPage.xaml.cs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
index c8db52e3816..d7da09fabec 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
@@ -37,7 +37,7 @@
 
   <Grid>
 
-    <ScrollViewer>
+    <ScrollViewer x:Name="ScrollViewerControl">
       <StackPanel Margin="20">
         <RichTextBlock Margin="0,10,0,0">
           <Paragraph FontSize="18" FontWeight="Bold">The loading control is for showing an animation with some content when the user should wait in some tasks of the app.</Paragraph>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index 9d17d078c8d..8c3cc04fe38 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     public sealed partial class LoadingPage : IXamlRenderListener
     {
+        private ScrollViewer scrollViewerControl;
         private AdaptiveGridView adaptiveGridViewControl;
         private Loading loadingControl;
         private ContentControl loadingContentControl;
@@ -26,6 +27,7 @@ public LoadingPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
+            scrollViewerControl = control.FindChildByName("ScrollViewerControl") as ScrollViewer;
             adaptiveGridViewControl = control.FindChildByName("AdaptiveGridViewControl") as AdaptiveGridView;
             loadingControl = control.FindDescendantByName("LoadingControl") as Loading;
             loadingContentControl = control.FindChildByName("LoadingContentControl") as ContentControl;
@@ -62,9 +64,13 @@ private void Load()
                 if (loadingContentControl != null)
                 {
                     loadingContentControl.ContentTemplate = resources["LogoTemplate"] as DataTemplate;
-                    await loadingContentControl.Blur(2, 100).StartAsync();
+
+                    // We need to blur the ScrollViewer hosting the main content of the page and not the
+                    // root control, otherwise the popup with the icon would be blurred as well, as it
+                    // would be in the same visual tree as the control whose visual is being blurred.
+                    await scrollViewerControl.Blur(2, 100).StartAsync();
                     await ShowLoadingDialogAsync();
-                    await loadingContentControl.Blur(0, 0).StartAsync();
+                    await scrollViewerControl.Blur(0, 0).StartAsync();
                 }
             });
         }

From ae61cf04fe41cb9ccf96924b460fdf2b30bd04f5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 21 Sep 2020 17:55:16 +0200
Subject: [PATCH 534/595] Added SizeExtensions class

---
 .../Extensions/SizeExtensions.cs              | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs

diff --git a/Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs
new file mode 100644
index 00000000000..b32ce516501
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs
@@ -0,0 +1,57 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using Point = Windows.Foundation.Point;
+using Rect = Windows.Foundation.Rect;
+using Size = Windows.Foundation.Size;
+
+namespace Microsoft.Toolkit.Uwp.Extensions
+{
+    /// <summary>
+    /// Extensions for the <see cref="Size"/> type.
+    /// </summary>
+    public static class SizeExtensions
+    {
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the origin.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the origin.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size)
+        {
+            return new Rect(0, 0, size.Width, size.Height);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the given coordinates.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <param name="x">The horizontal offset.</param>
+        /// <param name="y">The vertical offset.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given coordinates.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size, double x, double y)
+        {
+            return new Rect(x, y, size.Width, size.Height);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the given position.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <param name="point">The starting position to use.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given position.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size, Point point)
+        {
+            return new Rect(point, size);
+        }
+    }
+}

From fbaad657f1f37d9ce3af61dbf1fdd91cace586a3 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 21 Sep 2020 17:57:46 +0200
Subject: [PATCH 535/595] Added tests for size extensions

---
 .../Extensions/Test_SizeExtensions.cs         | 62 +++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs
new file mode 100644
index 00000000000..80193e2e29a
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs
@@ -0,0 +1,62 @@
+// 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 Windows.Foundation;
+using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_SizeExtensions
+    {
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d)]
+        [DataRow(3.14d, 6.55f)]
+        [DataRow(double.MinValue, double.Epsilon)]
+        public static void Test_SizeExtensions_ToRect_FromSize(double width, double height)
+        {
+            Size s = new Size(width, height);
+            Rect
+                a = s.ToRect(),
+                b = new Rect(0, 0, s.Width, s.Height);
+
+            Assert.AreEqual(a, b);
+        }
+
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_SizeExtensions_ToRect_FromSizeAndPosition(double width, double height, int x, int y)
+        {
+            Size s = new Size(width, height);
+            Rect
+                a = s.ToRect(x, y),
+                b = new Rect(x, y, s.Width, s.Height);
+
+            Assert.AreEqual(a, b);
+        }
+
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_SizeExtensions_ToRect_FromSizeAndPoint(double width, double height, int x, int y)
+        {
+            Point p = new Point(x, y);
+            Size s = new Size(width, height);
+            Rect
+                a = s.ToRect(p),
+                b = new Rect(p, s);
+
+            Assert.AreEqual(a, b);
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index d6b29c94c02..690bf146df3 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -138,6 +138,7 @@
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
     <Compile Include="Converters\Test_TypeToObjectConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
+    <Compile Include="Extensions\Test_SizeExtensions.cs" />
     <Compile Include="Extensions\Test_BitmapIconExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconSourceExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconExtensionMarkupExtension.cs" />

From e02308b2f7ef5a399d6a90b7a297fc066dcaad6c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 22 Sep 2020 01:24:10 +0200
Subject: [PATCH 536/595] Switched to AcrylicBrush in all loading samples

---
 .../SamplePages/Loading/LoadingCode.bind      | 22 +++++++++++--------
 .../SamplePages/Loading/LoadingPage.xaml.cs   | 17 +++-----------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
index d7da09fabec..8d6720d28b4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
@@ -3,6 +3,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:brushes="using:Microsoft.Toolkit.Uwp.UI.Media"
       mc:Ignorable="d">
 
   <Page.Resources>
@@ -37,7 +38,7 @@
 
   <Grid>
 
-    <ScrollViewer x:Name="ScrollViewerControl">
+    <ScrollViewer>
       <StackPanel Margin="20">
         <RichTextBlock Margin="0,10,0,0">
           <Paragraph FontSize="18" FontWeight="Bold">The loading control is for showing an animation with some content when the user should wait in some tasks of the app.</Paragraph>
@@ -50,19 +51,22 @@
         </RichTextBlock>
 
         <controls:AdaptiveGridView
-        Margin="0,12,0,0"
-        x:Name="AdaptiveGridViewControl"
-        ItemHeight="200"
-        DesiredWidth="300"
-        SelectionMode="None"
-        IsItemClickEnabled="False"
-        ItemTemplate="{StaticResource PhotosTemplate}" />
+          Margin="0,12,0,0"
+          x:Name="AdaptiveGridViewControl"
+          ItemHeight="200"
+          DesiredWidth="300"
+          SelectionMode="None"
+          IsItemClickEnabled="False"
+          ItemTemplate="{StaticResource PhotosTemplate}" />
       </StackPanel>
     </ScrollViewer>
 
     <controls:Loading x:Name="LoadingControl">
       <controls:Loading.Background>
-        <SolidColorBrush Color="@[Background:Brush:Black]" Opacity="@[Background Opacity:DoubleSlider:0.7:0-1]" />
+        <brushes:AcrylicBrush BackgroundSource="Backdrop"
+                              TintColor="Black"
+                              TintOpacity="@[Opacity:DoubleSlider:0.4:0.0-1.0]"
+                              BlurAmount="@[BlurAmount:DoubleSlider:8:0.0-32.0]"/>
       </controls:Loading.Background>
       <ContentControl x:Name="LoadingContentControl" />
     </controls:Loading>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index 8c3cc04fe38..e916ffdf223 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.UI.Animations;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
@@ -13,8 +12,6 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     public sealed partial class LoadingPage : IXamlRenderListener
     {
-        private ScrollViewer scrollViewerControl;
-        private AdaptiveGridView adaptiveGridViewControl;
         private Loading loadingControl;
         private ContentControl loadingContentControl;
         private ResourceDictionary resources;
@@ -27,15 +24,13 @@ public LoadingPage()
 
         public async void OnXamlRendered(FrameworkElement control)
         {
-            scrollViewerControl = control.FindChildByName("ScrollViewerControl") as ScrollViewer;
-            adaptiveGridViewControl = control.FindChildByName("AdaptiveGridViewControl") as AdaptiveGridView;
             loadingControl = control.FindDescendantByName("LoadingControl") as Loading;
             loadingContentControl = control.FindChildByName("LoadingContentControl") as ContentControl;
             resources = control.Resources;
 
-            if (adaptiveGridViewControl != null)
+            if (control.FindChildByName("AdaptiveGridViewControl") is AdaptiveGridView gridView)
             {
-                adaptiveGridViewControl.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync();
+                gridView.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync();
             }
         }
 
@@ -59,18 +54,12 @@ private void Load()
                 }
             });
 
-            SampleController.Current.RegisterNewCommand("Loading control with logo and blurring when requested", async (sender, args) =>
+            SampleController.Current.RegisterNewCommand("Loading control with logo", async (sender, args) =>
             {
                 if (loadingContentControl != null)
                 {
                     loadingContentControl.ContentTemplate = resources["LogoTemplate"] as DataTemplate;
-
-                    // We need to blur the ScrollViewer hosting the main content of the page and not the
-                    // root control, otherwise the popup with the icon would be blurred as well, as it
-                    // would be in the same visual tree as the control whose visual is being blurred.
-                    await scrollViewerControl.Blur(2, 100).StartAsync();
                     await ShowLoadingDialogAsync();
-                    await scrollViewerControl.Blur(0, 0).StartAsync();
                 }
             });
         }

From ea2dd57d3ea02641ff2bd16829ded8d709817357 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 22 Sep 2020 01:43:21 +0200
Subject: [PATCH 537/595] Minor UI tweaks

---
 .../SamplePages/Loading/LoadingCode.bind                        | 2 +-
 .../SamplePages/Loading/LoadingPage.xaml.cs                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
index 8d6720d28b4..3f731b56e19 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
@@ -66,7 +66,7 @@
         <brushes:AcrylicBrush BackgroundSource="Backdrop"
                               TintColor="Black"
                               TintOpacity="@[Opacity:DoubleSlider:0.4:0.0-1.0]"
-                              BlurAmount="@[BlurAmount:DoubleSlider:8:0.0-32.0]"/>
+                              BlurAmount="@[BlurAmount:DoubleSlider:8:0.0-24.0]"/>
       </controls:Loading.Background>
       <ContentControl x:Name="LoadingContentControl" />
     </controls:Loading>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index e916ffdf223..a6b3b57aa53 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -67,7 +67,7 @@ private void Load()
         private async Task ShowLoadingDialogAsync()
         {
             loadingControl.IsLoading = true;
-            await Task.Delay(3000);
+            await Task.Delay(5000);
             loadingControl.IsLoading = false;
         }
     }

From ae92e24d21acf08c92ecf6db504f99caf3edb0b2 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 22 Sep 2020 08:58:27 -0700
Subject: [PATCH 538/595] Update
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .../SamplePages/ImageEx/ImageExPage.xaml.cs                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
index bb2dd735000..f9acfd9f44e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs
@@ -69,7 +69,7 @@ private async void Load()
                 AddImage(false, false, true);
             });
 
-            SampleController.Current.RegisterNewCommand("Lazy loading sample (17763 or higher supported)", (sender, args) =>
+            SampleController.Current.RegisterNewCommand("Lazy loading sample", (sender, args) =>
             {
                 var imageExLazyLoadingControl = new ImageExLazyLoadingControl();
                 imageExLazyLoadingControl.CloseButtonClick += (s, a) =>
@@ -128,4 +128,4 @@ private void AddImage(bool broken, bool placeholder, bool round = false)
             }
         }
     }
-}
\ No newline at end of file
+}

From 77da3608b6626e2c2eb085fb09de1a1c1cae4071 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 22 Sep 2020 09:00:48 -0700
Subject: [PATCH 539/595] Update readme.md

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index d22c34a62f0..8648a6e5700 100644
--- a/readme.md
+++ b/readme.md
@@ -50,7 +50,7 @@ Once you do a search, you should see a list similar to the one below (versions m
 | Microsoft.Toolkit.Uwp.DeveloperTools | XAML user controls and services to help developer building their app | 
 
 ## <a name="supported"></a> Features
-The [Features list](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/blob/master/docs/toc.md#controls) refers to all the currently available features that can be found in the Windows Community Toolkit. Most features should work with the April 2018 Update SDK 17134 and above; however, refer to specific documentation on each feature for more information.
+The [Features list](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/blob/master/docs/toc.md#controls) refers to all the currently available features that can be found in the Windows Community Toolkit. Most features should work with the October 2018 Update (1809) SDK 17763 and above; however, refer to specific documentation on each feature for more information.
 
 ## Feedback and Requests
 Please use [GitHub Issues](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues) for bug reports and feature requests.

From 4e42672c108ff70572657be70116492f885fd336 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 22 Sep 2020 09:05:29 -0700
Subject: [PATCH 540/595] PR feedback.

---
 .../InAppNotification/InAppNotification.xaml              | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
index 17a8b9721e3..852ffaf2a63 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
@@ -9,7 +9,7 @@
 
     <Style x:Key="BaseInAppNotificationsStyle"
            TargetType="local:InAppNotification">
-        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
+        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumLowAcrylicElementMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseLowBrush}" />
         <Setter Property="Visibility" Value="Collapsed" />
@@ -33,8 +33,6 @@
         <Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
     </Style>
 
-    <Style BasedOn="{StaticResource BaseInAppNotificationsStyle}"
-                            TargetType="local:InAppNotification">
-        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumLowAcrylicElementMediumBrush}" />
-    </Style>
+    <Style BasedOn="{StaticResource BaseInAppNotificationsStyle}" TargetType="local:InAppNotification"/>
+
 </ResourceDictionary>

From 6af0372d7e3eeef2747ce7a910db0295137ab505 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 22 Sep 2020 11:13:19 -0700
Subject: [PATCH 541/595] Update UITests.App.csproj

---
 UITests/UITests.App/UITests.App.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 4222962d2a1..8081bc06ad8 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -12,7 +12,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -252,4 +252,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

From 5e4f30e7849dcc3ff3964ac50a7d394db7a675a4 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 22 Sep 2020 14:17:05 -0700
Subject: [PATCH 542/595] Add text for Gaze sample Button to make it easier to
 focus on.

---
 .../GazeInteraction/GazeInteractionXaml.bind  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionXaml.bind
index 77845bad4d8..8b199dc4f62 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionXaml.bind
@@ -13,17 +13,17 @@
     >
 
   <Grid>
-        <Button x:Name="TargetButton" HorizontalAlignment="Center" BorderBrush="#7FFFFFFF"
+    <Button x:Name="TargetButton" HorizontalAlignment="Center" BorderBrush="#7FFFFFFF"
 
-                    g:GazeInput.ThresholdDuration="@[ThresholdDuration:TimeSpan:50:0-1500]@"
-                    g:GazeInput.FixationDuration="@[FixationDuration:TimeSpan:350:0-1500]@"
-                    g:GazeInput.DwellDuration="@[DwellDuration:TimeSpan:400:0-1500]@"
-                    g:GazeInput.RepeatDelayDuration="@[RepeatDelayDuration:TimeSpan:400:0-1500]@"
-                    g:GazeInput.DwellRepeatDuration="@[DwellRepeatDuration:TimeSpan:400:0-1500]@"
-                    g:GazeInput.MaxDwellRepeatCount="@[MaxDwellRepeatCount:Slider:0:0-20]@"
+                g:GazeInput.ThresholdDuration="@[ThresholdDuration:TimeSpan:50:0-1500]@"
+                g:GazeInput.FixationDuration="@[FixationDuration:TimeSpan:350:0-1500]@"
+                g:GazeInput.DwellDuration="@[DwellDuration:TimeSpan:400:0-1500]@"
+                g:GazeInput.RepeatDelayDuration="@[RepeatDelayDuration:TimeSpan:400:0-1500]@"
+                g:GazeInput.DwellRepeatDuration="@[DwellRepeatDuration:TimeSpan:400:0-1500]@"
+                g:GazeInput.MaxDwellRepeatCount="@[MaxDwellRepeatCount:Slider:0:0-20]@"
 
-                    Width="@[ButtonSize:Slider:100:10-300]"
-                    Height="@[ButtonSize]"
-                    />
+                Width="@[ButtonSize:Slider:100:10-300]"
+                Height="@[ButtonSize]"
+                    >Focus</Button>
   </Grid>
 </Page>

From a9a391cf1d617c96a2ef37b7657fb5c1b30b4153 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 22 Sep 2020 14:17:26 -0700
Subject: [PATCH 543/595] Fix logic that was preventing progress reporting on
 Gaze events

---
 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
index b6f64bd181e..6f1b681f7e5 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeTargetItem.cs
@@ -160,7 +160,7 @@ internal void GiveFeedback()
         private void RaiseProgressEvent(DwellProgressState state)
         {
             // TODO: We should eliminate non-invokable controls before we arrive here!
-            if (!(TargetElement is Page))
+            if (TargetElement is Page)
             {
                 return;
             }

From 37639f87386c7ec67fc0087fec793ac6d96f5207 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 22 Sep 2020 15:20:39 -0700
Subject: [PATCH 544/595] Fix null exception crash when removing button from
 Gaze sample page

---
 .../SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs
index 4f4cc0d6f40..5f8af7e016b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GazeInteraction/GazeInteractionPage.xaml.cs
@@ -34,10 +34,11 @@ public void OnXamlRendered(FrameworkElement control)
             WarnUserToPlugInDevice();
 
             var buttonControl = control.FindChildByName("TargetButton") as Button;
-            buttonControl.Click += TargetButton_Click;
 
             if (buttonControl != null)
             {
+                buttonControl.Click += TargetButton_Click;
+
                 gazeButtonControl = GazeInput.GetGazeElement(buttonControl);
 
                 if (gazeButtonControl == null)

From 00e1ab694eb013f31def09824616d6142e1ebf0f Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 23 Sep 2020 12:31:48 -0700
Subject: [PATCH 545/595] Updated to support MSIX

---
 UITests/UITests.App/UITests.App.csproj             |  2 +-
 .../UITests.Tests.MSTest.csproj                    |  2 +-
 UITests/UITests.Tests.Shared/Tests.cs              | 14 +++++++-------
 .../UITests.App.dependencies.txt                   |  4 ++++
 .../UITests.Tests.TAEF/UITests.Tests.TAEF.csproj   | 11 +++++++++--
 5 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 8081bc06ad8..060949e98e7 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -165,7 +165,7 @@
       <Version>6.2.10</Version>
     </PackageReference>
     <PackageReference Include="MUXAppTestHelpers">
-      <Version>0.0.3</Version>
+      <Version>0.0.4</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 9f1b8ae8a7f..67a02acf40f 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.3" />
+    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 89d77831eed..bba017d8c9e 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -30,17 +30,17 @@ public static TestApplicationInfo WinUICsUWPSampleApp
                 string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
                 string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App");
 
-                Log.Comment($"Base Appx Search Directory = \"{baseDirectory}\"");
+                Log.Comment($"Base Package Search Directory = \"{baseDirectory}\"");
 
-                var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs" };
-                var files = Directory.GetFiles(baseDirectory, "*.appx", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
+                var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
+                var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
 
                 if (files.Count() == 0)
                 {
-                    throw new Exception(string.Format("Failed to find '*.appx' in {0}'!", baseDirectory));
+                    throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory));
                 }
 
-                string mostRecentlyBuiltAppx = string.Empty;
+                string mostRecentlyBuiltPackage = string.Empty;
                 DateTime timeMostRecentlyBuilt = DateTime.MinValue;
 
                 foreach (string file in files)
@@ -50,7 +50,7 @@ public static TestApplicationInfo WinUICsUWPSampleApp
                     if (fileWriteTime > timeMostRecentlyBuilt)
                     {
                         timeMostRecentlyBuilt = fileWriteTime;
-                        mostRecentlyBuiltAppx = file;
+                        mostRecentlyBuiltPackage = file;
                     }
                 }
 
@@ -60,7 +60,7 @@ public static TestApplicationInfo WinUICsUWPSampleApp
                     "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
                     "UITests.App",
                     "UITests.App.exe",
-                    mostRecentlyBuiltAppx.Replace(".appx", string.Empty),
+                    mostRecentlyBuiltPackage.Replace(".msix", string.Empty),
                     "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d",
                     baseDirectory);
             }
diff --git a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt
new file mode 100644
index 00000000000..7c615eb580e
--- /dev/null
+++ b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt
@@ -0,0 +1,4 @@
+Microsoft.NET.CoreFramework.Debug.2.2.appx
+Microsoft.NET.CoreRuntime.2.2.appx
+Microsoft.UI.Xaml.2.4.appx
+Microsoft.VCLibs.x86.Debug.14.00.appx
\ No newline at end of file
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 733b3fd080e..68b70c24a9a 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -36,14 +36,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.3" />
+    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.4" />
     <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="UITests.App.dependencies.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
 </Project>
\ No newline at end of file

From 63cf3ce20cc239c1176ecd99620d9cb8d1a56355 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 23 Sep 2020 14:15:15 -0700
Subject: [PATCH 546/595] Updated taef uitests to support both debug and
 release.

---
 ...encies.txt => UITests.App.dependencies.Debug.txt} |  0
 .../UITests.App.dependencies.Release.txt             |  4 ++++
 UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename UITests/UITests.Tests.TAEF/{UITests.App.dependencies.txt => UITests.App.dependencies.Debug.txt} (100%)
 create mode 100644 UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt

diff --git a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt
similarity index 100%
rename from UITests/UITests.Tests.TAEF/UITests.App.dependencies.txt
rename to UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt
diff --git a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt
new file mode 100644
index 00000000000..bc54bb4b6cc
--- /dev/null
+++ b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt
@@ -0,0 +1,4 @@
+Microsoft.NET.Native.Framework.2.2.appx
+Microsoft.NET.Native.Runtime.2.2.appx
+Microsoft.UI.Xaml.2.4.appx
+Microsoft.VCLibs.x86.14.00.appx
\ No newline at end of file
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 68b70c24a9a..f7afdf949bd 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -14,6 +14,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <IsPackable>false</IsPackable>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
 
   <ItemGroup>
@@ -47,7 +48,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="UITests.App.dependencies.txt">
+    <Compile Include="MainClass.cs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="UITests.App.dependencies.Debug.txt" Condition="'$(Configuration)' == 'Debug'">
+      <Link>UITests.App.dependencies.txt</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="UITests.App.dependencies.Release.txt" Condition="'$(Configuration)' == 'Release'">
+      <Link>UITests.App.dependencies.txt</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

From d0bd8aba110df9b8db56130b039b2cbe81407132 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 23 Sep 2020 16:18:30 -0700
Subject: [PATCH 547/595] Ignoring WexLogFileOutput when there are no issues.

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 43e293725a5..cd180178f5a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -64,7 +64,7 @@ jobs:
     inputs:
       targetPath: .\build\WexLogFileOutput
       artifactName: WexLogFileOutput
-    condition: succeededOrFailed()
+    condition: failed()
 
   - task: PowerShell@2
     displayName: Authenticode Sign Packages

From 28b1977bd3f0f88f9e8095adbefe69c9d87b54be Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 11:37:40 +0200
Subject: [PATCH 548/595] Code refactoring in ObservableValidator

---
 .../ComponentModel/ObservableValidator.cs     | 166 +++++++++++++++++-
 .../Mvvm/Test_ObservableValidator.cs          |  47 +++--
 2 files changed, 183 insertions(+), 30 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index a634d43c280..f0580cc39de 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -37,6 +37,167 @@ public abstract class ObservableValidator : ObservableObject, INotifyDataErrorIn
         /// <inheritdoc/>
         public bool HasErrors => this.totalErrors > 0;
 
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.SetProperty{T}(ref T,T,string)"/>, just with the addition
+        /// of the <paramref name="validate"/> parameter. If that is set to <see langword="true"/>, the new value will be
+        /// validated and <see cref="ErrorsChanged"/> will be raised if needed. Following the behavior of the base method,
+        /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetProperty<T>(ref T field, T newValue, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(ref field, newValue, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(ref T,T,bool,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="field">The field storing the property's value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(ref field, newValue, comparer, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event. Similarly to
+        /// the <see cref="ObservableObject.SetProperty{T}(T,T,Action{T},string)"/> method, this overload should only be
+        /// used when <see cref="ObservableObject.SetProperty{T}(ref T,T,string)"/> can't be used directly.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// This method is just like <see cref="ObservableObject.SetProperty{T}(T,T,Action{T},string)"/>, just with the addition
+        /// of the <paramref name="validate"/> parameter. As such, following the behavior of the base method,
+        /// the <see cref="ObservableObject.PropertyChanging"/> and <see cref="ObservableObject.PropertyChanged"/> events
+        /// are not raised if the current and new value for the target property are the same.
+        /// </remarks>
+        protected bool SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(oldValue, newValue, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property with
+        /// the new value, then raises the <see cref="ObservableObject.PropertyChanged"/> event.
+        /// See additional notes about this overload in <see cref="SetProperty{T}(T,T,Action{T},bool,string)"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the property that changed.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="callback">A callback to invoke to update the property value.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(oldValue, newValue, comparer, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string)"/>, with the difference being that this
+        /// method is used to relay properties from a wrapped model in the current instance. For more info, see the docs for
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string)"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(oldValue, newValue, model, callback, propertyName);
+        }
+
+        /// <summary>
+        /// Compares the current and new values for a given nested property. If the value has changed,
+        /// raises the <see cref="ObservableObject.PropertyChanging"/> event, updates the property and then raises the
+        /// <see cref="ObservableObject.PropertyChanged"/> event. The behavior mirrors that of
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,IEqualityComparer{T},TModel,Action{TModel,T},string)"/>,
+        /// with the difference being that this method is used to relay properties from a wrapped model in the
+        /// current instance. For more info, see the docs for
+        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,IEqualityComparer{T},TModel,Action{TModel,T},string)"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of model whose property (or field) to set.</typeparam>
+        /// <typeparam name="T">The type of property (or field) to set.</typeparam>
+        /// <param name="oldValue">The current property value.</param>
+        /// <param name="newValue">The property's value after the change occurred.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
+        /// <param name="model">The model </param>
+        /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
+        /// <param name="validate">If <see langword="true"/>, <paramref name="newValue"/> will also be validated.</param>
+        /// <param name="propertyName">(optional) The name of the property that changed.</param>
+        /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
+        protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+        {
+            if (validate)
+            {
+                ValidateProperty(newValue, propertyName);
+            }
+
+            return SetProperty(oldValue, newValue, comparer, model, callback, propertyName);
+        }
+
         /// <inheritdoc/>
         [Pure]
         public IEnumerable GetErrors(string? propertyName)
@@ -77,9 +238,8 @@ private IEnumerable GetAllErrors()
         /// </summary>
         /// <param name="value">The value to test for the specified property.</param>
         /// <param name="propertyName">The name of the property to validate.</param>
-        /// <returns>Whether or not the validation was successful.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="propertyName"/> is <see langword="null"/>.</exception>
-        protected bool ValidateProperty(object? value, [CallerMemberName] string? propertyName = null)
+        private void ValidateProperty(object? value, string? propertyName)
         {
             if (propertyName is null)
             {
@@ -138,8 +298,6 @@ protected bool ValidateProperty(object? value, [CallerMemberName] string? proper
             {
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
-
-            return isValid;
         }
 
         /// <summary>
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
index 724b7a7d3c7..d5f6e243f40 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
@@ -119,17 +119,27 @@ public void Test_ObservableValidator_GetErrors()
 
         [TestCategory("Mvvm")]
         [TestMethod]
-        public void Test_ObservableValidator_ValidateReturn()
+        [DataRow(null, false)]
+        [DataRow("", false)]
+        [DataRow("No", false)]
+        [DataRow("This text is really, really too long for the target property", false)]
+        [DataRow("1234", true)]
+        [DataRow("01234567890123456789", true)]
+        [DataRow("Hello world", true)]
+        public void Test_ObservableValidator_ValidateReturn(string value, bool isValid)
         {
-            var model = new Person();
+            var model = new Person { Name = value };
+
+            Assert.AreEqual(model.HasErrors, !isValid);
 
-            Assert.IsFalse(model.ValidateName(null));
-            Assert.IsFalse(model.ValidateName(string.Empty));
-            Assert.IsFalse(model.ValidateName("No"));
-            Assert.IsFalse(model.ValidateName("This text is really, really too long for the target property"));
-            Assert.IsTrue(model.ValidateName("1234"));
-            Assert.IsTrue(model.ValidateName("01234567890123456789"));
-            Assert.IsTrue(model.ValidateName("Hello world"));
+            if (isValid)
+            {
+                Assert.IsTrue(!model.GetErrors(nameof(Person.Name)).Cast<object>().Any());
+            }
+            else
+            {
+                Assert.IsTrue(model.GetErrors(nameof(Person.Name)).Cast<object>().Any());
+            }
         }
 
         public class Person : ObservableValidator
@@ -142,17 +152,7 @@ public class Person : ObservableValidator
             public string Name
             {
                 get => this.name;
-                set
-                {
-                    ValidateProperty(value);
-
-                    SetProperty(ref this.name, value);
-                }
-            }
-
-            public bool ValidateName(string value)
-            {
-                return ValidateProperty(value, nameof(Name));
+                set => SetProperty(ref this.name, value, true);
             }
 
             private int age;
@@ -161,12 +161,7 @@ public bool ValidateName(string value)
             public int Age
             {
                 get => this.age;
-                set
-                {
-                    ValidateProperty(value);
-
-                    SetProperty(ref this.age, value);
-                }
+                set => SetProperty(ref this.age, value, true);
             }
         }
     }

From e7a482458b9255d594dc4302dd1732c4e22bacc8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 11:45:04 +0200
Subject: [PATCH 549/595] Removed tracking field for HasErrors

---
 .../ComponentModel/ObservableValidator.cs     | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index f0580cc39de..fcc3f10b38c 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -24,18 +24,28 @@ public abstract class ObservableValidator : ObservableObject, INotifyDataErrorIn
         /// </summary>
         private readonly Dictionary<string, List<ValidationResult>> errors = new Dictionary<string, List<ValidationResult>>();
 
-        /// <summary>
-        /// Indicates the total number of properties with errors (not total errors).
-        /// This is used to allow <see cref="HasErrors"/> to operate in O(1) time, as it can just
-        /// check whether this value is not 0 instead of having to traverse <see cref="errors"/>.
-        /// </summary>
-        private int totalErrors;
-
         /// <inheritdoc/>
         public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
 
         /// <inheritdoc/>
-        public bool HasErrors => this.totalErrors > 0;
+        public bool HasErrors
+        {
+            get
+            {
+                // This uses the value enumerator for Dictionary<TKey, TValue>.ValueCollection, so it doesn't
+                // allocate. Accessing this property is O(n), but we can stop as soon as we find at least one
+                // error in the whole entity, and doing this saves 8 bytes in the object size (no fields needed).
+                foreach (var value in this.errors.Values)
+                {
+                    if (value.Count > 0)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
 
         /// <summary>
         /// Compares the current and new values for a given property. If the value has changed,
@@ -273,28 +283,10 @@ private void ValidateProperty(object? value, string? propertyName)
                 new ValidationContext(this, null, null) { MemberName = propertyName },
                 propertyErrors);
 
-            // Update the state and/or the errors for the property
-            if (isValid)
-            {
-                if (errorsChanged)
-                {
-                    this.totalErrors--;
-                }
-            }
-            else
-            {
-                if (!errorsChanged)
-                {
-                    this.totalErrors++;
-                }
-
-                errorsChanged = true;
-            }
-
             // Only raise the event once if needed. This happens either when the target property
             // had existing errors and is now valid, or if the validation has failed and there are
             // new errors to broadcast, regardless of the previous validation state for the property.
-            if (errorsChanged)
+            if (errorsChanged || !isValid)
             {
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }

From c5a5d5db7635d303c5c267160f045d65c43d334e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 12:10:49 +0200
Subject: [PATCH 550/595] Fixed build error due to StyleCop

---
 .../ComponentModel/ObservableValidator.cs           | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index fcc3f10b38c..6192af3a51a 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -253,6 +253,11 @@ private void ValidateProperty(object? value, string? propertyName)
         {
             if (propertyName is null)
             {
+                static void ThrowArgumentNullExceptionForNullPropertyName()
+                {
+                    throw new ArgumentNullException(nameof(propertyName), "The input property name cannot be null when validating a property");
+                }
+
                 ThrowArgumentNullExceptionForNullPropertyName();
             }
 
@@ -291,13 +296,5 @@ private void ValidateProperty(object? value, string? propertyName)
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
         }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> when a property name given as input is <see langword="null"/>.
-        /// </summary>
-        private static void ThrowArgumentNullExceptionForNullPropertyName()
-        {
-            throw new ArgumentNullException("propertyName", "The input property name cannot be null when validating a property");
-        }
     }
 }
\ No newline at end of file

From fec4b22d8958b61af6bd33a4cfe9e9663657c36d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 12:15:37 +0200
Subject: [PATCH 551/595] Code refactoring (not a fan of StyleCop here)

---
 .../ComponentModel/ObservableValidator.cs         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index 6192af3a51a..a1c20d82817 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -253,11 +253,6 @@ private void ValidateProperty(object? value, string? propertyName)
         {
             if (propertyName is null)
             {
-                static void ThrowArgumentNullExceptionForNullPropertyName()
-                {
-                    throw new ArgumentNullException(nameof(propertyName), "The input property name cannot be null when validating a property");
-                }
-
                 ThrowArgumentNullExceptionForNullPropertyName();
             }
 
@@ -296,5 +291,15 @@ static void ThrowArgumentNullExceptionForNullPropertyName()
                 ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
             }
         }
+
+#pragma warning disable SA1204
+        /// <summary>
+        /// Throws an <see cref="ArgumentNullException"/> when a property name given as input is <see langword="null"/>.
+        /// </summary>
+        private static void ThrowArgumentNullExceptionForNullPropertyName()
+        {
+            throw new ArgumentNullException("propertyName", "The input property name cannot be null when validating a property");
+        }
+#pragma warning restore SA1204
     }
 }
\ No newline at end of file

From a8de01aae43bc454ec6283eae3a246b2e5313359 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 13:58:53 +0200
Subject: [PATCH 552/595] Added PointExtensions class

---
 .../Extensions/PointExtensions.cs             | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs

diff --git a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
new file mode 100644
index 00000000000..84c4cd19947
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
@@ -0,0 +1,45 @@
+// 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.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using Point = Windows.Foundation.Point;
+using Rect = Windows.Foundation.Rect;
+using Size = Windows.Foundation.Size;
+
+namespace Microsoft.Toolkit.Uwp.Extensions
+{
+    /// <summary>
+    /// Extensions for the <see cref="Point"/> type.
+    /// </summary>
+    public static class PointExtensions
+    {
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at a given point.
+        /// </summary>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="width">The width of the rectangle.</param>
+        /// <param name="height">The height of the rectangle.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given point.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Point point, double width, double height)
+        {
+            return new Rect(point.X, point.Y, width, height);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the given coordinates.
+        /// </summary>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="size">The size of the rectangle to create.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given coordinates.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Point point, Size size)
+        {
+            return new Rect(point, size);
+        }
+    }
+}

From 23e223c5269aefa631dc63a2f0956500af2abbc4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 14:00:51 +0200
Subject: [PATCH 553/595] Added unit tests for Point extensions

---
 .../Extensions/Test_PointExtensions.cs        | 47 +++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
new file mode 100644
index 00000000000..fb462f34d8a
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
@@ -0,0 +1,47 @@
+// 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 Windows.Foundation;
+using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_PointExtensions
+    {
+        [TestCategory("PointExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_PointExtensions_ToRect_FromWidthHeight(double width, double height, int x, int y)
+        {
+            Point p = new Point(x, y);
+            Rect
+                a = p.ToRect(width, height),
+                b = new Rect(x, y, width, height);
+
+            Assert.AreEqual(a, b);
+        }
+
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_PointExtensions_ToRect_FromPoint(double width, double height, int x, int y)
+        {
+            Point p = new Point(x, y);
+            Size s = new Size(width, height);
+            Rect
+                a = p.ToRect(s),
+                b = new Rect(p, s);
+
+            Assert.AreEqual(a, b);
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 690bf146df3..4c5f890a639 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -138,6 +138,7 @@
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
     <Compile Include="Converters\Test_TypeToObjectConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
+    <Compile Include="Extensions\Test_PointExtensions.cs" />
     <Compile Include="Extensions\Test_SizeExtensions.cs" />
     <Compile Include="Extensions\Test_BitmapIconExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_FontIconSourceExtensionMarkupExtension.cs" />

From ad0e6fd2f842778e348e3f752aa62e54e8980bdc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 16:31:25 +0200
Subject: [PATCH 554/595] Minor code refactoring to use the new extensions

---
 .../Render/MarkdownTable.cs                                  | 5 +----
 .../Eyedropper/Eyedropper.Logic.cs                           | 3 ++-
 .../Eyedropper/EyedropperToolButton.cs                       | 5 +++--
 .../ImageCropper/ImageCropper.cs                             | 4 ++--
 .../OrbitView/OrbitViewPanel.cs                              | 3 ++-
 Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs | 4 ++--
 Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs | 5 ++---
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
index b4cab0cd3af..1d77c778e85 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
@@ -155,10 +155,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 var columnIndex = Grid.GetColumn(child);
                 var rowIndex = Grid.GetRow(child);
 
-                var rect = new Rect(0, 0, 0, 0)
-                {
-                    X = _borderThickness
-                };
+                var rect = new Rect(_borderThickness, 0, 0, 0);
 
                 for (int col = 0; col < columnIndex; col++)
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
index c6c894fe5ea..73b2aebdb7e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
@@ -12,6 +12,7 @@
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -98,7 +99,7 @@ private void UpdatePreview(int centerX, int centerY)
                     for (var j = colorStartX; j < colorEndX; j++)
                     {
                         var color = colors[((i - colorStartY) * width) + (j - colorStartX)];
-                        drawingSession.FillRectangle(new Rect(startPoint, size), color);
+                        drawingSession.FillRectangle(startPoint.ToRect(size), color);
                         startPoint.X += PreviewPixelsPerRawPixel;
                     }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs
index 3e67a6b1436..d0f0cf56370 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -216,8 +217,8 @@ private async Task UpdateEyedropperWorkAreaAsync()
                 }
 
                 var transform = TargetElement.TransformToVisual(content);
-                var position = transform.TransformPoint(default(Point));
-                _eyedropper.WorkArea = new Rect(position, new Size(TargetElement.ActualWidth, TargetElement.ActualHeight));
+                var position = transform.TransformPoint(default);
+                _eyedropper.WorkArea = position.ToRect(TargetElement.ActualWidth, TargetElement.ActualHeight);
                 if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
                 {
                     _eyedropper.XamlRoot = XamlRoot;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs
index baa6c8657a4..48eecc3ca48 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
-using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml;
@@ -120,7 +120,7 @@ private Size MinSelectSize
         {
             get
             {
-                var realMinSelectSize = _imageTransform.TransformBounds(new Rect(default(Point), MinCropSize));
+                var realMinSelectSize = _imageTransform.TransformBounds(MinCropSize.ToRect());
                 var minLength = Math.Min(realMinSelectSize.Width, realMinSelectSize.Height);
                 if (minLength < MinSelectedLength)
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
index ee6e75568ba..c39e2311073 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI.Xaml;
@@ -131,7 +132,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 var y_normalized = (finalSize.Height / 2) - y - (element.DesiredSize.Height / 2);
                 var point = new Point(x_normalized, y_normalized);
 
-                element.Arrange(new Rect(point, element.DesiredSize));
+                element.Arrange(point.ToRect(element.DesiredSize));
 
                 var elementProperties = new OrbitViewElementProperties()
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
index 2aab5261187..f89306e336a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
@@ -5,8 +5,8 @@
 using System;
 using System.Collections;
 using System.Collections.Specialized;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
-using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
@@ -143,7 +143,7 @@ private void RotatorTile_SizeChanged(object sender, SizeChangedEventArgs e)
             }
 
             // Set clip to control
-            Clip = new RectangleGeometry() { Rect = new Rect(default(Point), e.NewSize) };
+            Clip = new RectangleGeometry { Rect = e.NewSize.ToRect() };
         }
 
         private void RotatorTile_Loaded(object sender, RoutedEventArgs e)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
index 306e3159fe3..107285bdca9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
@@ -10,7 +10,6 @@
 using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -20,7 +19,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public partial class UniformGrid : Grid
     {
         // Guard for 15063 as Grid Spacing only works on 16299+.
-        private static bool _hasGridSpacing = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.Grid", "ColumnSpacing");
+        private static readonly bool _hasGridSpacing = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.Grid", "ColumnSpacing");
 
         // Internal list we use to keep track of items that we don't have space to layout.
         private List<UIElement> _overflow = new List<UIElement>();
@@ -161,7 +160,7 @@ protected override Size ArrangeOverride(Size finalSize)
             // Make sure all overflown elements have no size.
             foreach (var child in _overflow)
             {
-                child.Arrange(new Rect(0, 0, 0, 0));
+                child.Arrange(default);
             }
 
             _overflow = new List<UIElement>(); // Reset for next time.

From fb6b43c4bf83d62f7199086897a22dc1f54470b5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 16:47:05 +0200
Subject: [PATCH 555/595] Added missing Point extension

---
 .../Carousel/CarouselPanel.cs                  |  3 ++-
 .../ImageCropper/ImageCropper.Animations.cs    |  3 ++-
 .../ImageCropper/ImageCropper.Events.cs        |  7 ++++---
 .../ImageCropper/ImageCropper.Helpers.cs       |  3 ++-
 .../ImageCropper/ImageCropper.Logic.cs         | 10 +++++-----
 .../Extensions/PointExtensions.cs              | 13 +++++++++++++
 .../Extensions/Test_PointExtensions.cs         | 18 ++++++++++++++++++
 7 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
index 378fe7d4a5e..58d553feed6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI;
@@ -283,7 +284,7 @@ protected override Size ArrangeOverride(Size finalSize)
             double centerLeft = 0;
             double centerTop = 0;
 
-            Clip = new RectangleGeometry { Rect = new Rect(0, 0, finalSize.Width, finalSize.Height) };
+            Clip = new RectangleGeometry { Rect = finalSize.ToRect() };
 
             for (int i = 0; i < Children.Count; i++)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs
index 2ad3c7b3243..2cd4581f6cc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -117,7 +118,7 @@ private static List<DiscreteObjectKeyFrame> GetRectKeyframes(Rect from, Rect to,
                 rectKeyframes.Add(new DiscreteObjectKeyFrame
                 {
                     KeyTime = KeyTime.FromTimeSpan(time),
-                    Value = new Rect(startPoint, endPoint)
+                    Value = startPoint.ToRect(endPoint)
                 });
             }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs
index 82614619a95..d019e6df366 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Core;
@@ -98,7 +99,7 @@ private void ImageCropperThumb_KeyDown(object sender, KeyRoutedEventArgs e)
 
         private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
         {
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)
             {
@@ -111,7 +112,7 @@ private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
 
         private void ImageCropperThumb_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
         {
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)
             {
@@ -155,7 +156,7 @@ private void SourceImage_ManipulationDelta(object sender, ManipulationDeltaRoute
                 offsetY = Math.Max(offsetY, _restrictedSelectRect.Y - _startY);
             }
 
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             selectedRect.X += offsetX;
             selectedRect.Y += offsetY;
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
index bab3f27687a..1ea543390eb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
@@ -14,6 +14,7 @@
 using Windows.Storage.Streams;
 using Windows.UI;
 using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -299,7 +300,7 @@ private static Rect GetSafeRect(Point startPoint, Point endPoint, Size minSize,
                     break;
             }
 
-            return new Rect(startPoint, endPoint);
+            return startPoint.ToRect(endPoint);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs
index 44c216e0e7f..18718fc8a6d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Numerics;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
@@ -111,7 +112,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
 
             var startPoint = new Point(_startX, _startY);
             var endPoint = new Point(_endX, _endY);
-            var currentSelectedRect = new Rect(startPoint, endPoint);
+            var currentSelectedRect = startPoint.ToRect(endPoint);
             switch (position)
             {
                 case ThumbPosition.Top:
@@ -251,7 +252,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
 
             var isEffectiveRegion = IsSafePoint(_restrictedSelectRect, startPoint) &&
                                     IsSafePoint(_restrictedSelectRect, endPoint);
-            var selectedRect = new Rect(startPoint, endPoint);
+            var selectedRect = startPoint.ToRect(endPoint);
             if (!isEffectiveRegion)
             {
                 if (!IsCornerThumb(position) && TryGetContainedRect(_restrictedSelectRect, ref selectedRect))
@@ -268,8 +269,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
             selectedRect.Union(CanvasRect);
             if (selectedRect != CanvasRect)
             {
-                var croppedRect = _inverseImageTransform.TransformBounds(
-                    new Rect(startPoint, endPoint));
+                var croppedRect = _inverseImageTransform.TransformBounds(startPoint.ToRect(endPoint));
                 croppedRect.Intersect(_restrictedCropRect);
                 _currentCroppedRect = croppedRect;
                 var viewportRect = GetUniformRect(CanvasRect, selectedRect.Width / selectedRect.Height);
@@ -460,7 +460,7 @@ private void UpdateMaskArea(bool animate = false)
                 case CropShape.Rectangular:
                     if (_innerGeometry is RectangleGeometry rectangleGeometry)
                     {
-                        var to = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+                        var to = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
                         if (animate)
                         {
                             var storyboard = new Storyboard();
diff --git a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
index 84c4cd19947..0da97e4c4ee 100644
--- a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
@@ -29,6 +29,19 @@ public static Rect ToRect(this Point point, double width, double height)
             return new Rect(point.X, point.Y, width, height);
         }
 
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> ending at the specified point, starting at the given coordinates.
+        /// </summary>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="end">The ending position for the rectangle.</param>
+        /// <returns>A <see cref="Rect"/> value between the two specified points.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Point point, Point end)
+        {
+            return new Rect(point, end);
+        }
+
         /// <summary>
         /// Creates a new <see cref="Rect"/> of the specified size, starting at the given coordinates.
         /// </summary>
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
index fb462f34d8a..96a2f8133db 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
@@ -34,6 +34,24 @@ public static void Test_PointExtensions_ToRect_FromWidthHeight(double width, dou
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
         [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
         public static void Test_PointExtensions_ToRect_FromPoint(double width, double height, int x, int y)
+        {
+            Point
+                p1 = new Point(x, y),
+                p2 = new Point(x + width, y + height);
+            Rect
+                a = p1.ToRect(p2),
+                b = new Rect(p1, p2);
+
+            Assert.AreEqual(a, b);
+        }
+
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_PointExtensions_ToRect_FromSize(double width, double height, int x, int y)
         {
             Point p = new Point(x, y);
             Size s = new Size(width, height);

From f250898a133d5e603515c665d598771a84236767 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 24 Sep 2020 19:09:50 +0200
Subject: [PATCH 556/595] Reordered using directives

---
 .../Eyedropper/Eyedropper.Logic.cs                              | 2 +-
 .../ImageCropper/ImageCropper.Helpers.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
index 73b2aebdb7e..be6ba99249a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
@@ -6,13 +6,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Graphics.Canvas;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.Graphics.DirectX;
 using Windows.Graphics.Display;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
-using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
index 1ea543390eb..0b722ea0b53 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
@@ -9,12 +9,12 @@
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Geometry;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.Graphics.Imaging;
 using Windows.Storage.Streams;
 using Windows.UI;
 using Windows.UI.Xaml.Media.Imaging;
-using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {

From 25b6ca7ea66da866783c2f0c26c84e2619b4e9de Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 24 Sep 2020 12:49:32 -0700
Subject: [PATCH 557/595] Added TAEF Logs

---
 .gitignore                                           | 1 +
 UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj | 2 ++
 azure-pipelines.yml                                  | 9 ++++++++-
 build/build.cake                                     | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff0d29ff653..e1269ff7fd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,3 +231,4 @@ msbuild.binlog
 
 # TAEF Log output
 WexLogFileOutput
+*.wtl
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index f7afdf949bd..1fd9fc11c4f 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -39,12 +39,14 @@
   <ItemGroup>
     <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.4" />
     <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
+    <PackageReference Include="MUXCustomBuildTasks" Version="1.0.67" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(PkgMUXCustomBuildTasks)\tools\x86\WttLog.dll"  CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cd180178f5a..75d381267ec 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,11 +59,18 @@ jobs:
     displayName: Publish Test Results
     condition: always()
 
+  - task: PublishPipelineArtifact@1
+    displayName: Publish UI Test Results
+    inputs:
+      targetPath: .\build\UITestResults.wtl
+      artifactName: WexLogFileOutput
+    condition: always()
+
   - task: PublishPipelineArtifact@1
     displayName: Publish Test WexLogFileOutput
     inputs:
       targetPath: .\build\WexLogFileOutput
-      artifactName: WexLogFileOutput
+      artifactName: WexErrorLogFileOutput
     condition: failed()
 
   - task: PowerShell@2
diff --git a/build/build.cake b/build/build.cake
index cad3504f1d6..ee7fc837d29 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -309,7 +309,7 @@ Task("Test")
 {
     Information("\nRunning TAEF Interaction Tests");
 
-    var result = StartProcess(System.IO.Path.GetDirectoryName(file.FullPath) + "/TE.exe", file.FullPath + " /screenCaptureOnError");
+    var result = StartProcess(System.IO.Path.GetDirectoryName(file.FullPath) + "/TE.exe", file.FullPath + " /screenCaptureOnError /enableWttLogging /logFile:UITestResults.wtl");
     if (result != 0)
     {
         throw new InvalidOperationException("TAEF Tests failed!");

From 9849d88b7431278aa5e8dc315ab5108f1454046d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 27 Sep 2020 15:28:16 +0200
Subject: [PATCH 558/595] Fixed two missing XML docs

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index e1f2f36df6f..474dd77bda2 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -227,7 +227,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// <typeparam name="T">The type of property (or field) to set.</typeparam>
         /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
-        /// <param name="model">The model </param>
+        /// <param name="model">The model containing the property being updated.</param>
         /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
@@ -263,7 +263,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Acti
         /// <param name="oldValue">The current property value.</param>
         /// <param name="newValue">The property's value after the change occurred.</param>
         /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</param>
-        /// <param name="model">The model </param>
+        /// <param name="model">The model containing the property being updated.</param>
         /// <param name="callback">The callback to invoke to set the target property value, if a change has occurred.</param>
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>

From ceb016b9832c6ff860966876ca62ae4974c1f57e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 27 Sep 2020 15:38:40 +0200
Subject: [PATCH 559/595] Added missing generic argument constraint

---
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs    | 2 ++
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs | 2 ++
 Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
index 474dd77bda2..f1c9b8989b5 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
@@ -236,6 +236,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// raised if the current and new value for the target property are the same.
         /// </remarks>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
             {
@@ -268,6 +269,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Acti
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             if (comparer.Equals(oldValue, newValue))
             {
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
index c4ec80709ce..5a43d09aea4 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
@@ -257,6 +257,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             bool propertyChanged = SetProperty(oldValue, newValue, model, callback, propertyName);
 
@@ -288,6 +289,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Acti
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             bool propertyChanged = SetProperty(oldValue, newValue, comparer, model, callback, propertyName);
 
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
index a1c20d82817..2a96ab7b837 100644
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
@@ -170,6 +170,7 @@ protected bool SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> compa
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             if (validate)
             {
@@ -199,6 +200,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, TModel model, Acti
         /// <param name="propertyName">(optional) The name of the property that changed.</param>
         /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
         protected bool SetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, bool validate, [CallerMemberName] string? propertyName = null)
+            where TModel : class
         {
             if (validate)
             {

From dc9495d351e863586c3449183521aa764fb0f251 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Mon, 28 Sep 2020 20:08:48 +0200
Subject: [PATCH 560/595] Do some stuff...

---
 .../Pages/SampleController.xaml                          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index 299c4787542..d753f047e33 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -50,13 +50,10 @@
                         Margin="5,0,0,0"
                         Width="50">
                         <AppBarButton.Icon>
-                            <PathIcon
-                                Data="{StaticResource GithubIcon}"
-                                Width="50"
-                                Height="50"
-                                Margin="-10">
+                            <PathIcon Margin="-3" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                Data="{StaticResource GithubIcon}">
                                 <PathIcon.RenderTransform>
-                                    <CompositeTransform TranslateY="8" TranslateX="3" />
+                                    <CompositeTransform TranslateY="5" TranslateX="-5" />
                                 </PathIcon.RenderTransform>
                             </PathIcon>
                         </AppBarButton.Icon>

From 4fa869ba547d6b7b102469ea4653d6ebbfa0bd88 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Fri, 25 Sep 2020 14:09:14 -0700
Subject: [PATCH 561/595] Bump gaze interaction target version.

---
 ...t.Toolkit.Uwp.Input.GazeInteraction.csproj |   2 +-
 Windows Community Toolkit.sln                 | 141 ++++++++----------
 2 files changed, 63 insertions(+), 80 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
index 71d61ad0ef0..770401ef653 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
@@ -5,7 +5,7 @@
     <Title>Windows Community Toolkit Eye Gaze Library</Title>
     <Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
     <PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 371c3a92ec5..2cf8652ee67 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -257,26 +257,6 @@ Global
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x64.Build.0 = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x86.ActiveCfg = Release|Any CPU
 		{B24A296C-B3EB-4E06-A64E-74AC2D1ACC91}.Release|x86.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x64.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Debug|x86.Build.0 = Debug|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|ARM64.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x64.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x64.Build.0 = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x86.ActiveCfg = Release|Any CPU
-		{7189A42D-6F1A-4FA3-8E00-E2C14FDF167A}.Release|x86.Build.0 = Release|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -517,6 +497,7 @@ Global
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.Build.0 = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.ActiveCfg = Debug|x86
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.Build.0 = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.ActiveCfg = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.Build.0 = Debug|x86
 		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|x86
@@ -536,6 +517,7 @@ Global
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.ActiveCfg = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.Build.0 = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.ActiveCfg = Debug|x86
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.Build.0 = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.ActiveCfg = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.Build.0 = Debug|x86
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.ActiveCfg = Debug|x86
@@ -570,45 +552,26 @@ Global
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x64.Build.0 = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x64.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Debug|x86.Build.0 = Debug|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|ARM64.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x64.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x64.Build.0 = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x86.ActiveCfg = Release|Any CPU
-		{292D34E8-0F01-4FA8-951D-8232F75A88D5}.Release|x86.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|ARM64.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x64.Build.0 = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{262BB7CE-EF42-4BF7-B90C-107E6CBB57FF}.Release|x86.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM
@@ -843,26 +806,46 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM.Build.0 = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|ARM64.Build.0 = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 387164cad2054eea7c7329a6be17e264912b2fdf Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Mon, 28 Sep 2020 21:37:44 +0200
Subject: [PATCH 562/595] Update formatting

---
 Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index d753f047e33..f0ad630fd1a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -50,7 +50,9 @@
                         Margin="5,0,0,0"
                         Width="50">
                         <AppBarButton.Icon>
-                            <PathIcon Margin="-3" VerticalAlignment="Center" HorizontalAlignment="Center"
+                            <PathIcon Margin="-3" 
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
                                 Data="{StaticResource GithubIcon}">
                                 <PathIcon.RenderTransform>
                                     <CompositeTransform TranslateY="5" TranslateX="-5" />

From bfdc1f6ce8e83013a76f3f4c6739c66a85cde57b Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 28 Sep 2020 14:12:24 -0700
Subject: [PATCH 563/595] Comment extra debug line

Seems to be 00:00:00 a lot?
---
 Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
index d5df67c55ac..177cca3902c 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs
@@ -771,7 +771,7 @@ private void ProcessGazePoint(TimeSpan timestamp, Point position)
             if (targetItem.ElapsedTime > targetItem.NextStateTime)
             {
                 var prevStateTime = targetItem.NextStateTime;
-                Debug.WriteLine(prevStateTime);
+                ////Debug.WriteLine(prevStateTime);
 
                 // prevent targetItem from ever actually transitioning into the DwellRepeat state so as
                 // to continuously emit the DwellRepeat event

From 05950afa59a9ae694645ddf0f5bf1f2a7c921aec Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 28 Sep 2020 14:31:10 -0700
Subject: [PATCH 564/595] Fixed initialization order of GazeInput's static
 properties.

---
 .../GazeInput.cs                                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
index 9fdd0fab9a9..2991c100256 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs
@@ -16,6 +16,8 @@ namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
     [Windows.Foundation.Metadata.WebHostHidden]
     public class GazeInput
     {
+        internal static readonly TimeSpan UnsetTimeSpan = new TimeSpan(-1);
+
         /// <summary>
         /// Gets the Interaction dependency property
         /// </summary>
@@ -76,7 +78,7 @@ private static void OnCursorRadiusChanged(DependencyObject ob, DependencyPropert
         /// <summary>
         /// Gets the ThresholdDuration dependency property
         /// </summary>
-        public static DependencyProperty ThresholdDurationProperty { get; } = DependencyProperty.RegisterAttached("ThresholdDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(GazeInput.UnsetTimeSpan));
+        public static DependencyProperty ThresholdDurationProperty { get; } = DependencyProperty.RegisterAttached("ThresholdDuration", typeof(TimeSpan), typeof(GazeInput), new PropertyMetadata(UnsetTimeSpan));
 
         /// <summary>
         /// Gets the MaxDwellRepeatCount dependency property
@@ -171,11 +173,11 @@ public static Interaction Interaction
             {
                 if (GazePointer.Instance.Interaction != value)
                 {
-                    if (value == GazeInteraction.Interaction.Enabled)
+                    if (value == Interaction.Enabled)
                     {
                         GazePointer.Instance.AddRoot(0);
                     }
-                    else if (GazePointer.Instance.Interaction == GazeInteraction.Interaction.Enabled)
+                    else if (GazePointer.Instance.Interaction == Interaction.Enabled)
                     {
                         GazePointer.Instance.RemoveRoot(0);
                     }
@@ -426,7 +428,5 @@ public static void LoadSettings(ValueSet settings)
         {
             GazePointer.Instance.LoadSettings(settings);
         }
-
-        internal static readonly TimeSpan UnsetTimeSpan = new TimeSpan(-1);
     }
 }
\ No newline at end of file

From 6119b93b4a0a1dbc9c9541541403a8fcfd9b91e2 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 29 Sep 2020 10:31:07 -0700
Subject: [PATCH 565/595] Changing back
 GazeSettingsHelper.RetrieveSharedSettings to return IAsyncAction, to keep
 this from being a breaking change.

---
 .../GazeSettingsHelper.cs                     | 84 ++++++++++---------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
index 7bc6f69b5a8..7d8ca5f3c08 100644
--- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeSettingsHelper.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.AppService;
+using Windows.Foundation;
 using Windows.Foundation.Collections;
 
 namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
@@ -17,53 +18,58 @@ public class GazeSettingsHelper
         /// <summary>
         /// Retrieves settings as a ValueSet from a shared store.
         /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public static async Task RetrieveSharedSettings(ValueSet settings)
+        /// <returns>An <see cref="IAsyncAction"/> representing the asynchronous operation.</returns>
+        public static IAsyncAction RetrieveSharedSettings(ValueSet settings)
         {
-            // Setup a new app service connection
-            AppServiceConnection connection = new AppServiceConnection();
-            connection.AppServiceName = "com.microsoft.ectksettings";
-            connection.PackageFamilyName = "Microsoft.EyeControlToolkitSettings_s9y1p3hwd5qda";
-
-            // open the connection
-            var status = await connection.OpenAsync();
-            switch (status)
+            async Task InternalRetrieveSharedSettings()
             {
-                case AppServiceConnectionStatus.Success:
-                    // The new connection opened successfully
-                    // Set up the inputs and send a message to the service
-                    var response = await connection.SendMessageAsync(new ValueSet());
+                // Setup a new app service connection
+                AppServiceConnection connection = new AppServiceConnection();
+                connection.AppServiceName = "com.microsoft.ectksettings";
+                connection.PackageFamilyName = "Microsoft.EyeControlToolkitSettings_s9y1p3hwd5qda";
 
-                    if (response == null)
-                    {
-                        return;
-                    }
+                // open the connection
+                var status = await connection.OpenAsync();
+                switch (status)
+                {
+                    case AppServiceConnectionStatus.Success:
+                        // The new connection opened successfully
+                        // Set up the inputs and send a message to the service
+                        var response = await connection.SendMessageAsync(new ValueSet());
+
+                        if (response == null)
+                        {
+                            return;
+                        }
 
-                    switch (response.Status)
-                    {
-                        case AppServiceResponseStatus.Success:
-                            foreach (var item in response.Message)
-                            {
-                                settings.Add(item.Key, item.Value);
-                            }
+                        switch (response.Status)
+                        {
+                            case AppServiceResponseStatus.Success:
+                                foreach (var item in response.Message)
+                                {
+                                    settings.Add(item.Key, item.Value);
+                                }
 
-                            break;
-                        default:
-                        case AppServiceResponseStatus.Failure:
-                        case AppServiceResponseStatus.ResourceLimitsExceeded:
-                        case AppServiceResponseStatus.Unknown:
-                            break;
-                    }
+                                break;
+                            default:
+                            case AppServiceResponseStatus.Failure:
+                            case AppServiceResponseStatus.ResourceLimitsExceeded:
+                            case AppServiceResponseStatus.Unknown:
+                                break;
+                        }
 
-                    break;
+                        break;
 
-                default:
-                case AppServiceConnectionStatus.AppNotInstalled:
-                case AppServiceConnectionStatus.AppUnavailable:
-                case AppServiceConnectionStatus.AppServiceUnavailable:
-                case AppServiceConnectionStatus.Unknown:
-                    return;
+                    default:
+                    case AppServiceConnectionStatus.AppNotInstalled:
+                    case AppServiceConnectionStatus.AppUnavailable:
+                    case AppServiceConnectionStatus.AppServiceUnavailable:
+                    case AppServiceConnectionStatus.Unknown:
+                        return;
+                }
             }
+
+            return InternalRetrieveSharedSettings().AsAsyncAction();
         }
 
         private GazeSettingsHelper()

From 81c4a4af18da714ce0e76d7eccc5134a0a10af29 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 13:48:04 +0200
Subject: [PATCH 566/595] Removed unsafe indexing from StrongReferenceMessenger

---
 .../Messaging/Internals/Object2.cs            | 41 +++++++++++++++++++
 .../Messaging/StrongReferenceMessenger.cs     | 41 ++++++++-----------
 2 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs
new file mode 100644
index 00000000000..230b8fed7cb
--- /dev/null
+++ b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs
@@ -0,0 +1,41 @@
+// 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.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
+{
+    /// <summary>
+    /// A simple type representing an immutable pair of objects.
+    /// </summary>
+    /// <remarks>
+    /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> when specifically dealing with a
+    /// pair of handler and recipient. Unlike <see cref="ValueTuple{T1,T2}"/>, this type is readonly.
+    /// </remarks>
+    internal readonly struct Object2
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Object2"/> struct.
+        /// </summary>
+        /// <param name="handler">The input handler.</param>
+        /// <param name="recipient">The input recipient.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Object2(object handler, object recipient)
+        {
+            Handler = handler;
+            Recipient = recipient;
+        }
+
+        /// <summary>
+        /// The current handler (which is actually some <see cref="MessageHandler{TRecipient,TMessage}"/> instance.
+        /// </summary>
+        public readonly object Handler;
+
+        /// <summary>
+        /// The current recipient (guaranteed to match the type constraints for <see cref="MessageHandler{TRecipient,TMessage}"/>.
+        /// </summary>
+        public readonly object Recipient;
+    }
+}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
index 5f4d5dccdec..40e59100419 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
@@ -325,14 +325,11 @@ public void Unregister<TMessage, TToken>(object recipient, TToken token)
         }
 
         /// <inheritdoc/>
-        public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
+        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            object[] handlers;
-            object[] recipients;
-            ref object handlersRef = ref Unsafe.AsRef<object>(null);
-            ref object recipientsRef = ref Unsafe.AsRef<object>(null);
+            Object2[] pairs;
             int i = 0;
 
             lock (this.recipientsMap)
@@ -358,10 +355,7 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                handlers = ArrayPool<object>.Shared.Rent(totalHandlersCount);
-                recipients = ArrayPool<object>.Shared.Rent(totalHandlersCount);
-                handlersRef = ref handlers[0];
-                recipientsRef = ref recipients[0];
+                pairs = ArrayPool<Object2>.Shared.Rent(totalHandlersCount);
 
                 // Copy the handlers to the local collection.
                 // The array is oversized at this point, since it also includes
@@ -379,40 +373,39 @@ public unsafe TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     // Pick the target handler, if the token is a match for the recipient
                     if (mappingEnumerator.Value.TryGetValue(token, out object? handler))
                     {
-                        // We can manually offset here to skip the bounds checks in this inner loop when
-                        // indexing the array (the size is already verified and guaranteed to be enough).
-                        Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)i) = handler!;
-                        Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)i++) = recipient;
+                        // This array access should always guaranteed to be valid due to the size of the
+                        // array being set according to the current total number of registered handlers,
+                        // which will always be greater or equal than the ones matching the previous test.
+                        // We're still using a checked array access here though to make sure an out of
+                        // bounds write can never happen even if an error was present in the logic above.
+                        pairs[i++] = new Object2(handler!, recipient);
                     }
                 }
             }
 
+            // The rented array is often larger than the number of matching pairs
+            // to process, so we first slice the span with just the items we need.
+            Span<Object2> pendingPairs = pairs.AsSpan(0, i);
+
             try
             {
                 // Invoke all the necessary handlers on the local copy of entries
-                for (int j = 0; j < i; j++)
+                foreach (ref Object2 pair in pendingPairs)
                 {
-                    // We're doing an unsafe cast to skip the type checks again.
-                    // See the comments in the UnregisterAll method for more info.
-                    object handler = Unsafe.Add(ref handlersRef, (IntPtr)(void*)(uint)j);
-                    object recipient = Unsafe.Add(ref recipientsRef, (IntPtr)(void*)(uint)j);
-
                     // Here we perform an unsafe cast to enable covariance for delegate types.
                     // We know that the input recipient will always respect the type constraints
                     // of each original input delegate, and doing so allows us to still invoke
                     // them all from here without worrying about specific generic type arguments.
-                    Unsafe.As<MessageHandler<object, TMessage>>(handler)(recipient, message);
+                    Unsafe.As<MessageHandler<object, TMessage>>(pair.Handler)(pair.Recipient, message);
                 }
             }
             finally
             {
                 // As before, we also need to clear it first to avoid having potentially long
                 // lasting memory leaks due to leftover references being stored in the pool.
-                handlers.AsSpan(0, i).Clear();
-                recipients.AsSpan(0, i).Clear();
+                pendingPairs.Clear();
 
-                ArrayPool<object>.Shared.Return(handlers);
-                ArrayPool<object>.Shared.Return(recipients);
+                ArrayPool<Object2>.Shared.Return(pairs);
             }
 
             return message;

From 0bc0648624fc277702cae8e399bb3f3d440f3e1b Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 14:53:17 +0200
Subject: [PATCH 567/595] Code refactoring to WeakReferenceMessenger

---
 .../Messaging/WeakReferenceMessenger.cs       | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
index 72b1683f577..558b945f4b6 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
@@ -169,8 +169,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            ArrayPoolBufferWriter<object> recipients;
-            ArrayPoolBufferWriter<object> handlers;
+            ArrayPoolBufferWriter<Object2> pairs;
 
             lock (this.recipientsMap)
             {
@@ -182,8 +181,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                recipients = ArrayPoolBufferWriter<object>.Create();
-                handlers = ArrayPoolBufferWriter<object>.Create();
+                pairs = ArrayPoolBufferWriter<Object2>.Create();
 
                 // We need a local, temporary copy of all the pending recipients and handlers to
                 // invoke, to avoid issues with handlers unregistering from messages while we're
@@ -197,32 +195,26 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
 
                     if (map.TryGetValue(token, out object? handler))
                     {
-                        recipients.Add(pair.Key);
-                        handlers.Add(handler!);
+                        pairs.Add(new Object2(handler!, pair.Key));
                     }
                 }
             }
 
             try
             {
-                ReadOnlySpan<object>
-                    recipientsSpan = recipients.Span,
-                    handlersSpan = handlers.Span;
-
-                for (int i = 0; i < recipientsSpan.Length; i++)
+                foreach (ref readonly Object2 pair in pairs.Span)
                 {
                     // Just like in the other messenger, here we need an unsafe cast to be able to
                     // invoke a generic delegate with a contravariant input argument, with a less
                     // derived reference, without reflection. This is guaranteed to work by how the
                     // messenger tracks registered recipients and their associated handlers, so the
                     // type conversion will always be valid (the recipients are the rigth instances).
-                    Unsafe.As<MessageHandler<object, TMessage>>(handlersSpan[i])(recipientsSpan[i], message);
+                    Unsafe.As<MessageHandler<object, TMessage>>(pair.Handler)(pair.Recipient, message);
                 }
             }
             finally
             {
-                recipients.Dispose();
-                handlers.Dispose();
+                pairs.Dispose();
             }
 
             return message;

From c31b45f924393ca34ad2b763d7d72c4b9e8526fb Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 17:11:25 +0200
Subject: [PATCH 568/595] Fixed incorrect uppercase for Guard APIs

---
 Microsoft.Toolkit/Diagnostics/Guard.String.cs | 82 ++++++++++++++++++-
 .../Internals/ThrowHelper.Guard.String.cs     |  8 +-
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Guard.String.cs b/Microsoft.Toolkit/Diagnostics/Guard.String.cs
index 15a4a5c64be..2488ad7dfa8 100644
--- a/Microsoft.Toolkit/Diagnostics/Guard.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/Guard.String.cs
@@ -58,6 +58,24 @@ public static void IsNotNullOrEmpty([NotNull] string? text, string name)
         /// <param name="name">The name of the input parameter being tested.</param>
         /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is neither <see langword="null"/> nor whitespace.</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void IsNullOrWhiteSpace(string? text, string name)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return;
+            }
+
+            ThrowHelper.ThrowArgumentExceptionForIsNullOrWhiteSpace(text, name);
+        }
+
+        /// <summary>
+        /// Asserts that the input <see cref="string"/> instance must be <see langword="null"/> or whitespace.
+        /// </summary>
+        /// <param name="text">The input <see cref="string"/> instance to test.</param>
+        /// <param name="name">The name of the input parameter being tested.</param>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is neither <see langword="null"/> nor whitespace.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [Obsolete("Use " + nameof(IsNullOrWhiteSpace))]
         public static void IsNullOrWhitespace(string? text, string name)
         {
             if (string.IsNullOrWhiteSpace(text))
@@ -65,8 +83,27 @@ public static void IsNullOrWhitespace(string? text, string name)
                 return;
             }
 
-            ThrowHelper.ThrowArgumentExceptionForIsNullOrWhitespace(text, name);
+            ThrowHelper.ThrowArgumentExceptionForIsNullOrWhiteSpace(text, name);
+        }
+
+        /// <summary>
+        /// Asserts that the input <see cref="string"/> instance must not be <see langword="null"/> or whitespace.
+        /// </summary>
+        /// <param name="text">The input <see cref="string"/> instance to test.</param>
+        /// <param name="name">The name of the input parameter being tested.</param>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is <see langword="null"/> or whitespace.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void IsNotNullOrWhiteSpace([NotNull] string? text, string name)
+        {
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                return;
+            }
+
+            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(text, name);
+#pragma warning disable CS8777 // Does not return when text is null
         }
+#pragma warning restore CS8777
 
         /// <summary>
         /// Asserts that the input <see cref="string"/> instance must not be <see langword="null"/> or whitespace.
@@ -75,6 +112,7 @@ public static void IsNullOrWhitespace(string? text, string name)
         /// <param name="name">The name of the input parameter being tested.</param>
         /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is <see langword="null"/> or whitespace.</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [Obsolete("Use " + nameof(IsNotNullOrWhiteSpace))]
         public static void IsNotNullOrWhitespace([NotNull] string? text, string name)
         {
             if (!string.IsNullOrWhiteSpace(text))
@@ -82,7 +120,7 @@ public static void IsNotNullOrWhitespace([NotNull] string? text, string name)
                 return;
             }
 
-            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhitespace(text, name);
+            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(text, name);
 #pragma warning disable CS8777 // Does not return when text is null
         }
 #pragma warning restore CS8777
@@ -128,6 +166,24 @@ public static void IsNotEmpty(string text, string name)
         /// <param name="name">The name of the input parameter being tested.</param>
         /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is neither <see langword="null"/> nor whitespace.</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void IsWhiteSpace(string text, string name)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return;
+            }
+
+            ThrowHelper.ThrowArgumentExceptionForIsWhiteSpace(text, name);
+        }
+
+        /// <summary>
+        /// Asserts that the input <see cref="string"/> instance must be whitespace.
+        /// </summary>
+        /// <param name="text">The input <see cref="string"/> instance to test.</param>
+        /// <param name="name">The name of the input parameter being tested.</param>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is neither <see langword="null"/> nor whitespace.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [Obsolete("Use " + nameof(IsWhiteSpace))]
         public static void IsWhitespace(string text, string name)
         {
             if (string.IsNullOrWhiteSpace(text))
@@ -135,7 +191,24 @@ public static void IsWhitespace(string text, string name)
                 return;
             }
 
-            ThrowHelper.ThrowArgumentExceptionForIsWhitespace(text, name);
+            ThrowHelper.ThrowArgumentExceptionForIsWhiteSpace(text, name);
+        }
+
+        /// <summary>
+        /// Asserts that the input <see cref="string"/> instance must not be <see langword="null"/> or whitespace.
+        /// </summary>
+        /// <param name="text">The input <see cref="string"/> instance to test.</param>
+        /// <param name="name">The name of the input parameter being tested.</param>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is <see langword="null"/> or whitespace.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void IsNotWhiteSpace(string text, string name)
+        {
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                return;
+            }
+
+            ThrowHelper.ThrowArgumentExceptionForIsNotWhiteSpace(text, name);
         }
 
         /// <summary>
@@ -145,6 +218,7 @@ public static void IsWhitespace(string text, string name)
         /// <param name="name">The name of the input parameter being tested.</param>
         /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is <see langword="null"/> or whitespace.</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [Obsolete("Use " + nameof(IsNotWhiteSpace))]
         public static void IsNotWhitespace(string text, string name)
         {
             if (!string.IsNullOrWhiteSpace(text))
@@ -152,7 +226,7 @@ public static void IsNotWhitespace(string text, string name)
                 return;
             }
 
-            ThrowHelper.ThrowArgumentExceptionForIsNotWhitespace(text, name);
+            ThrowHelper.ThrowArgumentExceptionForIsNotWhiteSpace(text, name);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs
index bfcbed6f835..2469466b5e6 100644
--- a/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/Internals/ThrowHelper.Guard.String.cs
@@ -40,7 +40,7 @@ internal static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, str
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNullOrWhiteSpace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be null or whitespace, was {text.ToAssertString()}");
         }
@@ -50,7 +50,7 @@ internal static void ThrowArgumentExceptionForIsNullOrWhitespace(string? text, s
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotNullOrWhitespace(string? text, string name)
+        internal static void ThrowArgumentExceptionForIsNotNullOrWhiteSpace(string? text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be null or whitespace, was {(text is null ? "null" : "whitespace")}");
         }
@@ -80,7 +80,7 @@ internal static void ThrowArgumentExceptionForIsNotEmpty(string text, string nam
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsWhitespace(string text, string name)
+        internal static void ThrowArgumentExceptionForIsWhiteSpace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must be whitespace, was {text.ToAssertString()}");
         }
@@ -90,7 +90,7 @@ internal static void ThrowArgumentExceptionForIsWhitespace(string text, string n
         /// </summary>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DoesNotReturn]
-        internal static void ThrowArgumentExceptionForIsNotWhitespace(string text, string name)
+        internal static void ThrowArgumentExceptionForIsNotWhiteSpace(string text, string name)
         {
             ThrowArgumentException(name, $"Parameter {name.ToAssertString()} (string) must not be whitespace, was {text.ToAssertString()}");
         }

From 7839c1b8a8d19c74f6cb1b80c6f20f590e3f9c0d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 17:14:16 +0200
Subject: [PATCH 569/595] Fixed position of disabled warnings

---
 Microsoft.Toolkit/Diagnostics/Guard.String.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit/Diagnostics/Guard.String.cs b/Microsoft.Toolkit/Diagnostics/Guard.String.cs
index 2488ad7dfa8..665697f6423 100644
--- a/Microsoft.Toolkit/Diagnostics/Guard.String.cs
+++ b/Microsoft.Toolkit/Diagnostics/Guard.String.cs
@@ -43,13 +43,13 @@ public static void IsNotNullOrEmpty([NotNull] string? text, string name)
         {
             if (!string.IsNullOrEmpty(text))
             {
+#pragma warning disable CS8777 // Does not return when text is null
                 return;
+#pragma warning restore CS8777
             }
 
             ThrowHelper.ThrowArgumentExceptionForIsNotNullOrEmpty(text, name);
-#pragma warning disable CS8777 // Does not return when text is null (.NET Standard 2.0 string.IsNullOrEmpty lacks flow attribute)
         }
-#pragma warning restore CS8777
 
         /// <summary>
         /// Asserts that the input <see cref="string"/> instance must be <see langword="null"/> or whitespace.
@@ -97,13 +97,13 @@ public static void IsNotNullOrWhiteSpace([NotNull] string? text, string name)
         {
             if (!string.IsNullOrWhiteSpace(text))
             {
+#pragma warning disable CS8777 // Does not return when text is null
                 return;
+#pragma warning restore CS8777
             }
 
             ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(text, name);
-#pragma warning disable CS8777 // Does not return when text is null
         }
-#pragma warning restore CS8777
 
         /// <summary>
         /// Asserts that the input <see cref="string"/> instance must not be <see langword="null"/> or whitespace.
@@ -117,13 +117,13 @@ public static void IsNotNullOrWhitespace([NotNull] string? text, string name)
         {
             if (!string.IsNullOrWhiteSpace(text))
             {
+#pragma warning disable CS8777 // Does not return when text is null
                 return;
+#pragma warning restore CS8777
             }
 
             ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(text, name);
-#pragma warning disable CS8777 // Does not return when text is null
         }
-#pragma warning restore CS8777
 
         /// <summary>
         /// Asserts that the input <see cref="string"/> instance must be empty.

From 137c6bddaea7477dd3b4bf2858b6bc988ed1466c Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 19:14:58 +0200
Subject: [PATCH 570/595] Code refactoring to StrongReferenceMessenger

---
 .../Messaging/StrongReferenceMessenger.cs     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
index 40e59100419..a8e45b15c2e 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
@@ -329,7 +329,8 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            Object2[] pairs;
+            object[] rentedArray;
+            Span<object> pairs;
             int i = 0;
 
             lock (this.recipientsMap)
@@ -355,7 +356,9 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                pairs = ArrayPool<Object2>.Shared.Rent(totalHandlersCount);
+                // Rent the array and also assign it to a span, which will be used to access values.
+                // We're doing this to avoid the array covariance checks slowdown in the loops below.
+                pairs = rentedArray = ArrayPool<object>.Shared.Rent(2 * totalHandlersCount);
 
                 // Copy the handlers to the local collection.
                 // The array is oversized at this point, since it also includes
@@ -373,39 +376,37 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     // Pick the target handler, if the token is a match for the recipient
                     if (mappingEnumerator.Value.TryGetValue(token, out object? handler))
                     {
-                        // This array access should always guaranteed to be valid due to the size of the
+                        // This span access should always guaranteed to be valid due to the size of the
                         // array being set according to the current total number of registered handlers,
                         // which will always be greater or equal than the ones matching the previous test.
-                        // We're still using a checked array access here though to make sure an out of
+                        // We're still using a checked span accesses here though to make sure an out of
                         // bounds write can never happen even if an error was present in the logic above.
-                        pairs[i++] = new Object2(handler!, recipient);
+                        pairs[2 * i] = handler!;
+                        pairs[(2 * i) + 1] = recipient;
+                        i++;
                     }
                 }
             }
 
-            // The rented array is often larger than the number of matching pairs
-            // to process, so we first slice the span with just the items we need.
-            Span<Object2> pendingPairs = pairs.AsSpan(0, i);
-
             try
             {
                 // Invoke all the necessary handlers on the local copy of entries
-                foreach (ref Object2 pair in pendingPairs)
+                for (int j = 0; j < i; j++)
                 {
                     // Here we perform an unsafe cast to enable covariance for delegate types.
                     // We know that the input recipient will always respect the type constraints
                     // of each original input delegate, and doing so allows us to still invoke
                     // them all from here without worrying about specific generic type arguments.
-                    Unsafe.As<MessageHandler<object, TMessage>>(pair.Handler)(pair.Recipient, message);
+                    Unsafe.As<MessageHandler<object, TMessage>>(pairs[2 * j])(pairs[(2 * j) + 1], message);
                 }
             }
             finally
             {
                 // As before, we also need to clear it first to avoid having potentially long
                 // lasting memory leaks due to leftover references being stored in the pool.
-                pendingPairs.Clear();
+                Array.Clear(rentedArray, 0, 2 * i);
 
-                ArrayPool<Object2>.Shared.Return(pairs);
+                ArrayPool<object>.Shared.Return(rentedArray);
             }
 
             return message;

From a99d6207b48627f6f5a7bc5c2ead5d862171991f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 1 Oct 2020 19:15:05 +0200
Subject: [PATCH 571/595] Code refactoring to WeakReferenceMessenger

---
 .../Messaging/Internals/Object2.cs            | 41 -------------------
 .../Messaging/WeakReferenceMessenger.cs       | 17 +++++---
 2 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs

diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs
deleted file mode 100644
index 230b8fed7cb..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Object2.cs
+++ /dev/null
@@ -1,41 +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 System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
-{
-    /// <summary>
-    /// A simple type representing an immutable pair of objects.
-    /// </summary>
-    /// <remarks>
-    /// This type replaces a simple <see cref="ValueTuple{T1,T2}"/> when specifically dealing with a
-    /// pair of handler and recipient. Unlike <see cref="ValueTuple{T1,T2}"/>, this type is readonly.
-    /// </remarks>
-    internal readonly struct Object2
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Object2"/> struct.
-        /// </summary>
-        /// <param name="handler">The input handler.</param>
-        /// <param name="recipient">The input recipient.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Object2(object handler, object recipient)
-        {
-            Handler = handler;
-            Recipient = recipient;
-        }
-
-        /// <summary>
-        /// The current handler (which is actually some <see cref="MessageHandler{TRecipient,TMessage}"/> instance.
-        /// </summary>
-        public readonly object Handler;
-
-        /// <summary>
-        /// The current recipient (guaranteed to match the type constraints for <see cref="MessageHandler{TRecipient,TMessage}"/>.
-        /// </summary>
-        public readonly object Recipient;
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
index 558b945f4b6..d17e332ba5d 100644
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
+++ b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
@@ -169,7 +169,8 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
             where TMessage : class
             where TToken : IEquatable<TToken>
         {
-            ArrayPoolBufferWriter<Object2> pairs;
+            ArrayPoolBufferWriter<object> bufferWriter;
+            int i = 0;
 
             lock (this.recipientsMap)
             {
@@ -181,7 +182,7 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
                     return message;
                 }
 
-                pairs = ArrayPoolBufferWriter<Object2>.Create();
+                bufferWriter = ArrayPoolBufferWriter<object>.Create();
 
                 // We need a local, temporary copy of all the pending recipients and handlers to
                 // invoke, to avoid issues with handlers unregistering from messages while we're
@@ -195,26 +196,30 @@ public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
 
                     if (map.TryGetValue(token, out object? handler))
                     {
-                        pairs.Add(new Object2(handler!, pair.Key));
+                        bufferWriter.Add(handler!);
+                        bufferWriter.Add(pair.Key);
+                        i++;
                     }
                 }
             }
 
             try
             {
-                foreach (ref readonly Object2 pair in pairs.Span)
+                ReadOnlySpan<object> pairs = bufferWriter.Span;
+
+                for (int j = 0; j < i; j++)
                 {
                     // Just like in the other messenger, here we need an unsafe cast to be able to
                     // invoke a generic delegate with a contravariant input argument, with a less
                     // derived reference, without reflection. This is guaranteed to work by how the
                     // messenger tracks registered recipients and their associated handlers, so the
                     // type conversion will always be valid (the recipients are the rigth instances).
-                    Unsafe.As<MessageHandler<object, TMessage>>(pair.Handler)(pair.Recipient, message);
+                    Unsafe.As<MessageHandler<object, TMessage>>(pairs[2 * j])(pairs[(2 * j) + 1], message);
                 }
             }
             finally
             {
-                pairs.Dispose();
+                bufferWriter.Dispose();
             }
 
             return message;

From a1e8dd66bf965207552aec844c21c4e93a6d9872 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 6 Oct 2020 10:32:12 -0700
Subject: [PATCH 572/595] Update
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs

Co-authored-by: Rosario Pulella <Rosariopulella@gmail.com>
---
 Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
index 4fb8a1fc50d..aa326e6b33d 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
-
 using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;

From 23deea8230908e63519948a169ecb8120784f7bc Mon Sep 17 00:00:00 2001
From: hansmbakker <hansmbakker@hotmail.com>
Date: Tue, 6 Oct 2020 22:32:30 +0200
Subject: [PATCH 573/595] Mutable and subclassable version of ObservableGroup

---
 .../Collections/ObservableGroup.cs            | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
index 304be89e496..542f943d7ef 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroup.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 
@@ -16,8 +17,10 @@ namespace Microsoft.Toolkit.Collections
     /// <typeparam name="TKey">The type of the group key.</typeparam>
     /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
     [DebuggerDisplay("Key = {Key}, Count = {Count}")]
-    public sealed class ObservableGroup<TKey, TValue> : ObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
+    public class ObservableGroup<TKey, TValue> : ObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
     {
+        private TKey _key;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservableGroup{TKey, TValue}"/> class.
         /// </summary>
@@ -49,9 +52,21 @@ public ObservableGroup(TKey key, IEnumerable<TValue> collection)
         }
 
         /// <summary>
-        /// Gets the key of the group.
+        /// Gets or sets the key of the group.
         /// </summary>
-        public TKey Key { get; }
+        public TKey Key
+        {
+            get
+            {
+                return _key;
+            }
+
+            set
+            {
+                _key = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(Key)));
+            }
+        }
 
         /// <inheritdoc/>
         object IReadOnlyObservableGroup.Key => Key;

From da68b72b70af91623b57db10d8e1098aa54f6ca6 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 7 Oct 2020 01:29:09 +0200
Subject: [PATCH 574/595] Added comment to explain the (IntPtr)(void*)(uint)
 casts

---
 .../Extensions/ReadOnlySpanExtensions.cs      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
index ac09a4f7d83..47428db40a2 100644
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
@@ -42,6 +42,36 @@ public static ref T DangerousGetReference<T>(this ReadOnlySpan<T> span)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe ref T DangerousGetReferenceAt<T>(this ReadOnlySpan<T> span, int i)
         {
+            // Here we assume the input index will never be negative, so we do an unsafe cast to
+            // force the JIT to skip the sign extension when going from int to native int.
+            // On .NET Core 3.1, if we only use Unsafe.Add(ref r0, i), we get the following:
+            // =============================
+            // L0000: mov rax, [rcx]
+            // L0003: movsxd rdx, edx
+            // L0006: lea rax, [rax+rdx*4]
+            // L000a: ret
+            // =============================
+            // Note the movsxd (move with sign extension) to expand the index passed in edx to
+            // the whole rdx register. This is unnecessary and more expensive than just a mov,
+            // which when done to a large register size automatically zeroes the upper bits.
+            // With the (IntPtr)(void*)(uint) cast, we get the following codegen instead:
+            // =============================
+            // L0000: mov rax, [rcx]
+            // L0003: mov edx, edx
+            // L0005: lea rax, [rax+rdx*4]
+            // L0009: ret
+            // =============================
+            // Here we can see how the index is extended to a native integer with just a mov,
+            // which effectively only zeroes the upper bits of the same register used as source.
+            // These three casts are a bit verbose, but they do the trick on both 32 bit and 64
+            // bit architectures, producing optimal code in both cases (they are either completely
+            // elided on 32 bit systems, or result in the correct register expansion when on 64 bit).
+            // We first do an unchecked conversion to uint (which is just a reinterpret-cast). We
+            // then cast to void*, which lets the following IntPtr cast avoid the range check on 32 bit
+            // (since uint could be out of range there if the original index was negative). The final
+            // result is a clean mov as shown above. This will eventually be natively supported by the
+            // JIT compiler (see https://github.com/dotnet/runtime/issues/38794), but doing this here
+            // still ensures the optimal codegen even on existing runtimes (eg. .NET Core 2.1 and 3.1).
             ref T r0 = ref MemoryMarshal.GetReference(span);
             ref T ri = ref Unsafe.Add(ref r0, (IntPtr)(void*)(uint)i);
 

From f95595d06b130161220c8c83040fae9c27ae582f Mon Sep 17 00:00:00 2001
From: Hans Bakker <hansmbakker+github@gmail.com>
Date: Wed, 7 Oct 2020 09:48:31 +0200
Subject: [PATCH 575/595] Prevent unnecessary OnPropertyChanged

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Collections/ObservableGroup.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
index 542f943d7ef..996a90ecc9b 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroup.cs
@@ -60,11 +60,14 @@ public TKey Key
             {
                 return _key;
             }
-
             set
             {
-                _key = value;
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(Key)));
+                if (!EqualityComparer<TKey>.Default.Equals(this.key, value))
+                {
+                    this.key = value;
+                    
+                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(Key)));
+                }
             }
         }
 

From 46d9d343dfef339bc74b55a4e51986f64aebb8bd Mon Sep 17 00:00:00 2001
From: Hans Bakker <hansmbakker+github@gmail.com>
Date: Wed, 7 Oct 2020 09:48:48 +0200
Subject: [PATCH 576/595] Code style suggestion

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Collections/ObservableGroup.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
index 996a90ecc9b..78a5a8bbcaf 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroup.cs
@@ -56,10 +56,7 @@ public ObservableGroup(TKey key, IEnumerable<TValue> collection)
         /// </summary>
         public TKey Key
         {
-            get
-            {
-                return _key;
-            }
+            get => this.key;
             set
             {
                 if (!EqualityComparer<TKey>.Default.Equals(this.key, value))

From eeb1ff98019f4ddee1919295030abd522065c0e7 Mon Sep 17 00:00:00 2001
From: Hans Bakker <hansmbakker+github@gmail.com>
Date: Wed, 7 Oct 2020 09:48:57 +0200
Subject: [PATCH 577/595] Code style suggestion

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit/Collections/ObservableGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
index 78a5a8bbcaf..a247fe6895f 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroup.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Toolkit.Collections
     [DebuggerDisplay("Key = {Key}, Count = {Count}")]
     public class ObservableGroup<TKey, TValue> : ObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
     {
-        private TKey _key;
+        private TKey key;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservableGroup{TKey, TValue}"/> class.

From b601e57d89f665ac0211cf64ebcde504bac16aa7 Mon Sep 17 00:00:00 2001
From: hansmbakker <hansmbakker@hotmail.com>
Date: Wed, 7 Oct 2020 14:34:09 +0200
Subject: [PATCH 578/595] code styling and perf improvement

---
 Microsoft.Toolkit/Collections/ObservableGroup.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
index a247fe6895f..ce828934917 100644
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ b/Microsoft.Toolkit/Collections/ObservableGroup.cs
@@ -19,7 +19,10 @@ namespace Microsoft.Toolkit.Collections
     [DebuggerDisplay("Key = {Key}, Count = {Count}")]
     public class ObservableGroup<TKey, TValue> : ObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
     {
-        private TKey key;
+        /// <summary>
+        /// The cached <see cref="PropertyChangedEventArgs"/> for <see cref="Key"/>
+        /// </summary>
+        private static readonly PropertyChangedEventArgs KeyChangedEventArgs = new PropertyChangedEventArgs(nameof(Key));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservableGroup{TKey, TValue}"/> class.
@@ -51,6 +54,8 @@ public ObservableGroup(TKey key, IEnumerable<TValue> collection)
             Key = key;
         }
 
+        private TKey key;
+
         /// <summary>
         /// Gets or sets the key of the group.
         /// </summary>
@@ -62,8 +67,8 @@ public TKey Key
                 if (!EqualityComparer<TKey>.Default.Equals(this.key, value))
                 {
                     this.key = value;
-                    
-                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(Key)));
+
+                    OnPropertyChanged(KeyChangedEventArgs);
                 }
             }
         }

From aef54c66fad6d3b5bbc080997e155b7e1125f826 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 8 Oct 2020 11:51:23 +0200
Subject: [PATCH 579/595] Added StringPool info in package description

---
 .../Microsoft.Toolkit.HighPerformance.csproj                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
index a0d6bcb991c..7f2d3956c53 100644
--- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
+++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
@@ -12,6 +12,7 @@
       - MemoryBufferWriter&lt;T&gt;: an IBufferWriter&lt;T&gt;: implementation that can wrap external Memory&lt;T&gt;: instances.
       - MemoryOwner&lt;T&gt;: an IMemoryOwner&lt;T&gt; implementation with an embedded length and a fast Span&lt;T&gt; accessor.
       - SpanOwner&lt;T&gt;: a stack-only type with the ability to rent a buffer of a specified length and getting a Span&lt;T&gt; from it.
+      - StringPool: a configurable pool for string instances that be used to minimize allocations when creating multiple strings from char buffers.
       - String, array, Span&lt;T&gt;, Memory&lt;T&gt; extensions and more, all focused on high performance.
       - HashCode&lt;T&gt;: a SIMD-enabled extension of HashCode to quickly process sequences of values.
       - BitHelper: a class with helper methods to perform bit operations on numeric types.

From dd52af50e7fd444889a6040d6eb70c235943eeb3 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 8 Oct 2020 14:39:56 -0500
Subject: [PATCH 580/595] UITest: ref csproj indead of vcxproj

---
 UITests/UITests.App/UITests.App.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 060949e98e7..48fc8de5936 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -196,7 +196,7 @@
       <Project>{e7697922-9555-4cfb-aee0-c5f4d657e559}</Project>
       <Name>Microsoft.Toolkit.Uwp.DeveloperTools</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.vcxproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.UWP.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">
       <Project>{a5e98964-45b1-442d-a07a-298a3221d81e}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>

From 49760c325ecbddab254b61214e5a808e866e51d6 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 8 Oct 2020 13:44:31 -0700
Subject: [PATCH 581/595] Update Bug Submission Template to Ask about
 Reproducing Bugs in Sample App

---
 .github/ISSUE_TEMPLATE/bug_report.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c3f1654249d..714d31eb39d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -18,11 +18,17 @@ A clear and concise description of what the bug is.
 - [ ] Is this bug a regression in the toolkit?  If so, what toolkit version did you last see it work:
 
 ## Steps to Reproduce
+
+- [ ] Can this be reproduced in the Sample App? (Either in a sample as-is or with new XAML pasted in the editor.) If so, please provide custom XAML or steps to reproduce. If not, let us know why it can't be reproduced (e.g. more complex setup, environment, dependencies, etc...) <!-- Being able to reproduce the problem in the sample app, really stream-lines the whole process in being able to discover, resolve, and validate bug fixes. -->
+
 Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+1. Given the following environment (Sample App w/ XAML, Project with Isolated setup, etc...)
+2. Go to '...'
+3. Click on '....'
+4. Scroll down to '....'
+5. See error
+
+<!-- Provide as many code-snippets or XAML snippets where appropriate. -->
 
 ## Expected behavior
 A clear and concise description of what you expected to happen.

From a279ebf0538631499b22868159efbec83e9f172d Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sat, 10 Oct 2020 16:39:03 +0200
Subject: [PATCH 582/595] Fixed ImageEx.CornerRadius property

---
 .../ImageEx/ImageEx.xaml                          |  5 ++++-
 .../ImageEx/ImageExBase.Members.cs                | 15 ---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
index b40eba789ed..2a07e54671e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
@@ -9,7 +9,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:ImageEx">
-                    <Grid Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                    <Grid Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}">
                         <Image Name="PlaceholderImage"
                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
index a32c1f93676..af7da49a066 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
@@ -20,11 +20,6 @@ public partial class ImageExBase
         /// </summary>
         public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(nameof(Stretch), typeof(Stretch), typeof(ImageExBase), new PropertyMetadata(Stretch.Uniform));
 
-        /// <summary>
-        /// Identifies the <see cref="CornerRadius"/> dependency property.
-        /// </summary>
-        public static new readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(ImageExBase), new PropertyMetadata(new CornerRadius(0)));
-
         /// <summary>
         /// Identifies the <see cref="DecodePixelHeight"/> dependency property.
         /// </summary>
@@ -81,16 +76,6 @@ public partial class ImageExBase
         /// </summary>
         public bool IsInitialized { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the CornerRadius for underlying image. <para/>
-        /// Used to created rounded/circular images.
-        /// </summary>
-        public new CornerRadius CornerRadius
-        {
-            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
-            set { SetValue(CornerRadiusProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets DecodePixelHeight for underlying bitmap
         /// </summary>

From b5d2edeb3ad286d36b84346372690f49fac674ea Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Fri, 16 Oct 2020 14:54:23 -0700
Subject: [PATCH 583/595] Update Template Instructions

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6e535dcad28..410c4e15686 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 -->
+
 ## Fixes #
 <!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. -->
 
@@ -38,7 +40,7 @@ Please check if your PR fulfills the following requirements:
 - [ ] 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. -->
+     Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->
 
 
 ## Other information

From 8d2023281b211baec86b88bc28e51b9e7cf59431 Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Fri, 16 Oct 2020 16:20:47 -0700
Subject: [PATCH 584/595] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 714d31eb39d..fffc2d5f23c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,10 +7,7 @@ assignees: ''
 
 ---
 
-<!--
-PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
-ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
--->
+<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to investigate the issue. Issues with missing information may be closed without investigation 🚨 -->
 
 ## Describe the bug
 A clear and concise description of what the bug is.

From c309f17d384772d62d0a98df89ac95ef89e81231 Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:13:24 -0700
Subject: [PATCH 585/595] Update-FR-Temp

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5fc2d21835c..445d3469b97 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+<!-- 🚨 Please provide detailed information and Do Not skip any instructions as they are all required and essential to help us understand the feature 🚨 -->
+
 ## Describe the problem this feature would solve
 <!-- Please describe or link to any existing issues or discussions.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

From 1f464805f6143a65548c2fa4a5f798c8e4b0a03c Mon Sep 17 00:00:00 2001
From: Kyaa Dost <35208324+Kyaa-dost@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:19:23 -0700
Subject: [PATCH 586/595] Update question.md

---
 .github/ISSUE_TEMPLATE/question.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 21b0162dbbc..40779d4b0cc 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -13,6 +13,7 @@ Hi!
 We try and keep our GitHub issue list for bugs and features.
 
 Ideally, it'd be great to post your question on Stack Overflow using the 'windows-community-toolkit' tag here: https://stackoverflow.com/questions/tagged/windows-community-toolkit
+🚨 Please provide detailed information that includes examples, screenshots, and relevant issues if possible 🚨
 
 If this is more about a scenario that you think is missing documentation, please file an issue instead at https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new
 

From 52437e971e165702e04d74d75cda852a0fc242b2 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 19 Oct 2020 11:53:48 -0700
Subject: [PATCH 587/595] Remove duplicate NuGet reference

---
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 24438302b11..f1a1e4726a0 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -122,9 +122,6 @@
     <PackageReference Include="System.Xml.XPath.XmlDocument">
       <Version>4.3.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.3.0</Version>
-    </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>4.7.2</Version>
     </PackageReference>
@@ -501,4 +498,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

From 3da0975e11eeb7babbc640aef691d206f832b16c Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 21 Oct 2020 18:57:33 -0700
Subject: [PATCH 588/595] Add SwitchPresenter control (first-pass)

Made SwitchPresenter inherit from ContentPresenter directly
Updated ColorPicker to use ListBox+SwitchPresenter vs. Pivot
Split out Styles
Removed conditional CornerRadius

TODO:
- [ ] See if 'Parent' can be removed from SwitchPresenter
- [ ] Add margins/padding back to content within SwitchPresenter for each 'tab' of the Color Picker
---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |    2 +-
 .../ColorPicker/ColorPicker.xaml              | 2262 +++++++++--------
 .../SwitchPresenter/Case.cs                   |   83 +
 .../SwitchPresenter/CaseCollection.cs         |  131 +
 .../SwitchPresenter/SwitchPresenter.cs        |  246 ++
 Windows Community Toolkit.sln                 |   29 +-
 6 files changed, 1649 insertions(+), 1104 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 37f8d2e6414..058b072324b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1646,4 +1646,4 @@
     <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
     <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
index b91c9e8aafa..5e953079e99 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
@@ -24,34 +22,32 @@
          The work-around is to create multiple styles as condition XAML still works at the style level.
          This is needed to support CornerRadius properties. -->
 
-    <Style TargetType="controls:ColorPicker"
-           x:Key="BaseColorPickerStyle">
-        <Setter Property="MaxWidth" Value="392" /><!-- TODO: Get rid of this restricton -->
+    <Style TargetType="controls:ColorPicker" BasedOn="{StaticResource DefaultColorPickerStyle}"/>
+
+    <Style x:Key="DefaultColorPickerStyle" TargetType="controls:ColorPicker">
+        <Setter Property="Width" Value="392" />
         <Setter Property="MinWidth" Value="312" />
+        <Setter Property="MinHeight" Value="392"/>
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
         <Setter Property="Template" Value="{StaticResource ColorPickerTemplate}"/>
     </Style>
 
-    <ControlTemplate TargetType="controls:ColorPicker"
-                     x:Key="ColorPickerTemplate">
+    <localconverters:ContrastBrushConverter x:Key="ContrastBrushConverter" />
+
+    <ControlTemplate x:Key="ColorPickerTemplate"
+                     TargetType="controls:ColorPicker">
         <Grid BorderBrush="{TemplateBinding BorderBrush}" 
               BorderThickness="{TemplateBinding BorderThickness}"
               Margin="{TemplateBinding Padding}">
             <Grid.Resources>
-                <localconverters:ColorToColorShadeConverter x:Key="ColorToColorShade" />
-                <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" />
-                <localconverters:ColorToHexConverter x:Key="ColorToHex" />
-                <localconverters:ContrastBrushConverter x:Key="ContrastBrush" />
-
-                <contract7NotPresent:Style TargetType="TextBox"
-                                                       x:Key="InputTextBoxStyle">
-                    <!-- Currently not used -->
-                </contract7NotPresent:Style>
-                <contract7Present:Style TargetType="TextBox"
-                                                    x:Key="InputTextBoxStyle">
-                    <Setter Property="CornerRadius"
-                                        Value="0,2,2,0" />
-                </contract7Present:Style>
+                <localconverters:ColorToColorShadeConverter x:Key="ColorToColorShadeConverter" />
+                <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
+                <localconverters:ColorToHexConverter x:Key="ColorToHexConverter" />
+
+                <Style x:Key="InputTextBoxStyle" TargetType="TextBox">
+                    <Setter Property="CornerRadius" Value="0,2,2,0" /> <!-- TODO: Is there a theme resource we can use for this from the system? -->
+                </Style>
             </Grid.Resources>
             <VisualStateManager.VisualStateGroups>
 
@@ -92,7 +88,7 @@
                     <VisualState x:Name="ColorSpectrumVisible" />
                     <VisualState x:Name="ColorSpectrumCollapsed">
                         <VisualState.Setters>
-                            <Setter Target="SpectrumPivotItem.Visibility"
+                            <Setter Target="SpectrumListBoxItem.Visibility"
                                                 Value="Collapsed" />
                         </VisualState.Setters>
                     </VisualState>
@@ -101,7 +97,7 @@
                     <VisualState x:Name="ColorPaletteVisible" />
                     <VisualState x:Name="ColorPaletteCollapsed">
                         <VisualState.Setters>
-                            <Setter Target="PalettePivotItem.Visibility"
+                            <Setter Target="PaletteListBoxItem.Visibility"
                                                 Value="Collapsed" />
                         </VisualState.Setters>
                     </VisualState>
@@ -160,7 +156,7 @@
                     <VisualState x:Name="ColorChannelTextInputVisible" />
                     <VisualState x:Name="ColorChannelTextInputCollapsed">
                         <VisualState.Setters>
-                            <Setter Target="ChannelsPivotItem.Visibility"
+                            <Setter Target="ChannelsListBoxItem.Visibility"
                                                 Value="Collapsed" />
                         </VisualState.Setters>
                     </VisualState>
@@ -240,50 +236,55 @@
                     Background="{ThemeResource SystemControlAcrylicElementBrush}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Top"/>
-            <Pivot Grid.Row="0"
-                   Grid.RowSpan="2"> <!-- TODO: Remove Pivot -->
-                <Pivot.ItemContainerStyle>
-                    <Style TargetType="PivotItem">
-                        <Setter Property="HorizontalContentAlignment"
-                                                    Value="Stretch" />
-                        <Setter Property="VerticalContentAlignment"
-                                                    Value="Stretch" />
-                        <Setter Property="Margin"
-                                                    Value="12" />
-                        <Setter Property="Padding"
-                                                    Value="0" />
-                    </Style>
-                </Pivot.ItemContainerStyle>
-                <PivotItem x:Name="SpectrumPivotItem"
-                                                AutomationProperties.Name="Spectrum">
-                    <PivotItem.Header>
-                        <FontIcon Glyph="&#xE76D;"
-                                                        Width="108" />
-                    </PivotItem.Header>
-                    <PivotItem.Content>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
+            <ListBox x:Name="ColorPanelSelector"
+                     Grid.Row="0" HorizontalAlignment="Center" Background="Transparent"
+                     ItemContainerStyle="{StaticResource UnderlineListBoxItemStyle}">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal"/>
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBoxItem x:Name="SpectrumListBoxItem" IsSelected="True"
+                             AutomationProperties.Name="Spectrum">
+                    <!-- TODO: Add These via x:Uid -->
+                    <FontIcon Glyph="&#xE76D;" />
+                </ListBoxItem>
+                <ListBoxItem x:Name="PaletteListBoxItem"
+                             AutomationProperties.Name="Palette">
+                    <FontIcon Glyph="&#xE790;" />
+                </ListBoxItem>
+                <ListBoxItem x:Name="ChannelsListBoxItem"
+                             AutomationProperties.Name="Channels">
+                    <FontIcon Glyph="&#xE9E9;" />
+                </ListBoxItem>
+            </ListBox>
+            <controls:SwitchPresenter x:Name="ContentContainer" 
+                                Grid.Row="1"
+                                Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
+                <controls:Case Value="SpectrumListBoxItem">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
                                                                                     Grid.Column="0"
                                                                                     Grid.Row="1"
                                                                                     Grid.RowSpan="2"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
                                                                                     Orientation="Vertical"
                                                                                     Width="20"
                                                                                     HorizontalAlignment="Center"
                                                                                     VerticalAlignment="Stretch"
                                                                                     Margin="0,0,12,0" />
-                            <!-- Keep in mind the spectrum is always HSV -->
-                            <!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
-                            <ColorSpectrum x:Name="ColorSpectrumControl"
+                        <!-- Keep in mind the spectrum is always HSV -->
+                        <!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
+                        <ColorSpectrum x:Name="ColorSpectrumControl"
                                                                 AutomationProperties.Name="Third Dimension"
                                                                 Grid.Column="1"
                                                                 Grid.Row="0"
@@ -299,1109 +300,1220 @@
                                                                 Shape="{TemplateBinding ColorSpectrumShape}"
                                                                 HorizontalAlignment="Stretch"
                                                                 VerticalAlignment="Stretch" />
-                            <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
+                        <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
                                                                                     AutomationProperties.Name="Alpha Channel"
                                                                                     Grid.Column="2"
                                                                                     Grid.Row="1"
                                                                                     Grid.RowSpan="2"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
                                                                                     Orientation="Vertical"
                                                                                     Width="20"
                                                                                     HorizontalAlignment="Center"
                                                                                     VerticalAlignment="Stretch"
                                                                                     Margin="12,0,0,0" />
-                        </Grid>
-                    </PivotItem.Content>
-                </PivotItem>
-                <PivotItem x:Name="PalettePivotItem"
-                                                AutomationProperties.Name="Palette">
-                    <PivotItem.Header>
-                        <FontIcon Glyph="&#xE790;"
-                                                        Width="108" />
-                    </PivotItem.Header>
-                    <PivotItem.Content>
-                        <GridView SelectionMode="Single"
+                    </Grid>
+                </controls:Case>
+                <controls:Case Value="PaletteListBoxItem">
+                    <GridView SelectionMode="Single"
                                   SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=TwoWay}"
                                   ItemsSource="{TemplateBinding CustomPaletteColors}"
+                                  ItemContainerStyle="{StaticResource PaletteGridViewItemStyle}"
                                   Margin="0"
                                   Padding="0"
                                   Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
-                            <GridView.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker" 
+                        <GridView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker" 
                                                           Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}"/>
-                                </ItemsPanelTemplate>
-                            </GridView.ItemsPanel>
-                            <GridView.ItemContainerStyle>
-                                <Style TargetType="GridViewItem">
-                                    <Setter Property="FontFamily"
-                                                                Value="{ThemeResource ContentControlThemeFontFamily}" />
-                                    <Setter Property="FontSize"
-                                                                Value="{ThemeResource ControlContentThemeFontSize}" />
-                                    <Setter Property="Background"
-                                                                Value="Transparent" />
-                                    <Setter Property="Foreground"
-                                                                Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                    <Setter Property="TabNavigation"
-                                                                Value="Local" />
-                                    <Setter Property="IsHoldingEnabled"
-                                                                Value="True" />
-                                    <Setter Property="HorizontalContentAlignment"
-                                                                Value="Stretch" />
-                                    <Setter Property="VerticalContentAlignment"
-                                                                Value="Stretch" />
-                                    <Setter Property="Margin"
-                                                                Value="0" />
-                                    <Setter Property="Padding"
-                                                                Value="0" />
-                                    <Setter Property="MinWidth"
-                                                                Value="10" />
-                                    <Setter Property="MinHeight"
-                                                                Value="10" />
-                                    <Setter Property="AllowDrop"
-                                                                Value="False" />
-                                    <Setter Property="UseSystemFocusVisuals"
-                                                                Value="{StaticResource UseSystemFocusVisuals}" />
-                                    <Setter Property="FocusVisualMargin"
-                                                                Value="-2" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="GridViewItem">
-                                                <Grid x:Name="ContentBorder"
-                                                                            Control.IsTemplateFocusTarget="True"
-                                                                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                                                                            Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{TemplateBinding CornerRadius}"
-                                                                            RenderTransformOrigin="0.5,0.5">
-
-                                                    <Grid.RenderTransform>
-                                                        <ScaleTransform x:Name="ContentBorderScale" />
-                                                    </Grid.RenderTransform>
-
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="FocusStates">
-                                                            <VisualState x:Name="Focused">
-
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Collapsed" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Unfocused" />
-
-                                                        </VisualStateGroup>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal">
-
-                                                                <Storyboard>
-                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="PointerOver">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="Pressed">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <PointerDownThemeAnimation TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="Selected">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="PointerOverSelected">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="PressedSelected">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightAccentBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <PointerDownThemeAnimation TargetName="ContentPresenter" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                        </VisualStateGroup>
-
-                                                        <VisualStateGroup x:Name="DisabledStates">
-                                                            <VisualState x:Name="Enabled" />
-
-                                                            <VisualState x:Name="Disabled">
+                            </ItemsPanelTemplate>
+                        </GridView.ItemsPanel>
+                        <GridView.ItemTemplate>
+                            <DataTemplate>
+                                <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
+                                                                HorizontalAlignment="Stretch"
+                                                                VerticalAlignment="Stretch">
+                                    <Border.Background>
+                                        <SolidColorBrush Color="{Binding}" />
+                                    </Border.Background>
+                                </Border>
+                            </DataTemplate>
+                        </GridView.ItemTemplate>
+                    </GridView>
+                </controls:Case>
+                <controls:Case Value="ChannelsListBoxItem">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="30" />
+                            <ColumnDefinition Width="80" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="24" />
+                            <RowDefinition Height="1*" />
+                            <RowDefinition Height="1*" />
+                            <RowDefinition Height="1*" />
+                            <RowDefinition Height="1*" />
+                            <!-- Note that there is an additional 12px added by the PivotItem -->
+                            <RowDefinition Height="12" />
+                        </Grid.RowDefinitions>
+                        <!-- Top color model & Hex input -->
+                        <Grid Grid.Column="0"
+                                                        Grid.ColumnSpan="3"
+                                                        Grid.Row="0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="12" />
+                                <ColumnDefinition Width="2*" />
+                            </Grid.ColumnDefinitions>
+                            <!-- Content RGB/HSV names are hard-coded in ColorPicker as well -->
+                            <!-- ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                            <ToggleButton x:Name="RgbToggleButton"
+                                                                    Grid.Column="0"
+                                                                    Content="RGB"
+                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                                                    BorderThickness="1"
+                                                                    Background="Transparent"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    IsThreeState="False"
+                                                                    CornerRadius="2,0,0,2"/>
+                            <ToggleButton x:Name="HsvToggleButton"
+                                                                    Grid.Column="1"
+                                                                    Content="HSV"
+                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                                                    BorderThickness="1"
+                                                                    Background="Transparent"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    IsThreeState="False"
+                                                                    CornerRadius="0,2,2,0" />
+                            <Grid x:Name="HexInputGrid"
+                                                            Grid.Column="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="30" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.Column="0"
+                                                                Height="32"
+                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                                BorderThickness="1,1,0,1"
+                                                                CornerRadius="2,0,0,2">
+                                    <TextBlock Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                        FontWeight="SemiBold"
+                                                                        Text="#"
+                                                                        HorizontalAlignment="Center"
+                                                                        VerticalAlignment="Center" />
+                                </Border>
+                                <!-- Name must NOT match what is in ColorPicker 'HexTextBox' -->
+                                <TextBox x:Name="HexInputTextBox"
+                                                                    Style="{StaticResource InputTextBoxStyle}"
+                                                                    AutomationProperties.Name="Hexadecimal Color Input"
+                                                                    Height="32"
+                                                                    Grid.Column="1"
+                                                                    HorizontalAlignment="Stretch" />
+                            </Grid>
+                        </Grid>
+                        <!-- Color channel editing controls -->
+                        <!-- Channel 1 RGB:Red HSV:Hue -->
+                        <Border Grid.Column="0"
+                                                        Grid.Row="2"
+                                                        Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                            <TextBlock x:Name="Channel1TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="R"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                        </Border>
+                        <TextBox x:Name="Channel1TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="2"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Red Channel"
+                                                            VerticalAlignment="Center" />
+                        <controls:ColorPickerSlider x:Name="Channel1Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="2"
+                                                                                    AutomationProperties.Name="Red Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                        <!-- Channel 2 RGB:Green HSV:Saturation -->
+                        <Border Grid.Column="0"
+                                                        Grid.Row="3"
+                                                        Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                            <TextBlock x:Name="Channel2TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="G"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                        </Border>
+                        <TextBox x:Name="Channel2TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="3"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Green Channel"
+                                                            VerticalAlignment="Center" />
+                        <controls:ColorPickerSlider x:Name="Channel2Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="3"
+                                                                                    AutomationProperties.Name="Green Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                        <!-- Channel 3 RGB:Blue HSV:Value -->
+                        <Border Grid.Column="0"
+                                                        Grid.Row="4"
+                                                        Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                            <TextBlock x:Name="Channel3TextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="B"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                        </Border>
+                        <TextBox x:Name="Channel3TextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="4"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Blue Channel"
+                                                            VerticalAlignment="Center" />
+                        <controls:ColorPickerSlider x:Name="Channel3Slider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="4"
+                                                                                    AutomationProperties.Name="Blue Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                        <!-- Alpha channel -->
+                        <Border x:Name="AlphaChannelBorder"
+                                                        Grid.Column="0"
+                                                        Grid.Row="5"
+                                                        Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
+                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                                        BorderThickness="1,1,0,1"
+                                                        CornerRadius="2,0,0,2"
+                                                        VerticalAlignment="Center">
+                            <TextBlock x:Name="AlphaChannelTextBlock"
+                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                                                FontWeight="SemiBold"
+                                                                Text="A"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Center" />
+                        </Border>
+                        <TextBox x:Name="AlphaChannelTextBox"
+                                                            Grid.Column="1"
+                                                            Grid.Row="5"
+                                                            Style="{StaticResource InputTextBoxStyle}"
+                                                            AutomationProperties.Name="Alpha Channel"
+                                                            VerticalAlignment="Center" />
+                        <controls:ColorPickerSlider x:Name="AlphaChannelSlider"
+                                                                                    Grid.Column="2"
+                                                                                    Grid.Row="5"
+                                                                                    AutomationProperties.Name="Alpha Channel"
+                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                                                    Margin="12,0,0,0"
+                                                                                    HorizontalAlignment="Stretch"
+                                                                                    VerticalAlignment="Center" />
+                    </Grid>
+                </controls:Case>
+            </controls:SwitchPresenter>
 
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                        </VisualStateGroup>
-
-                                                        <VisualStateGroup x:Name="MultiSelectStates">
-                                                            <VisualState x:Name="MultiSelectDisabled">
-
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
-                                                                        <DiscreteObjectKeyFrame KeyTime="0:0:0.333"
-                                                                                                                    Value="Collapsed" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <FadeOutThemeAnimation TargetName="MultiSelectSquare" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="MultiSelectEnabled">
-
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <FadeInThemeAnimation TargetName="MultiSelectSquare" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                        </VisualStateGroup>
-
-                                                        <VisualStateGroup x:Name="DataVirtualizationStates">
-                                                            <VisualState x:Name="DataAvailable" />
-
-                                                            <VisualState x:Name="DataPlaceholder">
-
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                        </VisualStateGroup>
-
-                                                        <VisualStateGroup x:Name="ReorderHintStates">
-                                                            <VisualState x:Name="NoReorderHint" />
+            <!-- TODO: Expose resources for the height of this part and the margin -->
+            <Grid x:Name="ColorPreviewGrid"
+                  Grid.Row="2"
+                  Height="48"
+                  Margin="12,0,12,12">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="4"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="4"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="3*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Left-side Preview Darker Shades -->
+                <Border x:Name="CheckeredBackground2Border"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Stretch" />
+                <Border x:Name="N2PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            VerticalAlignment="Stretch"
+                                            CornerRadius="2,0,0,2">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='-2'}" />
+                    </Border.Background>
+                </Border>
+                <!-- The -1 and +1 accent preview originally had a drop shadow as well.
+                                            However, due to Z-order issues with the checkered background,
+                                            shadow and preview border, it would have required it's own
+                                            checkered background. This was judged not worth the performance 
+                                            trade-off so shadows were removed. -->
+                <Border x:Name="N1PreviewBorder"
+                                                Grid.Row="1"
+                                                Grid.Column="1">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='-1'}" />
+                    </Border.Background>
+                </Border>
+                <!-- Right-side Preview Lighter Shades -->
+                <Border x:Name="CheckeredBackground4Border"
+                                                Grid.Row="1"
+                                                Grid.Column="3"
+                                                Grid.ColumnSpan="2"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch" />
+                <Border x:Name="P1PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="3">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='1'}" />
+                    </Border.Background>
+                </Border>
+                <Border x:Name="P2PreviewBorder"
+                                            Grid.Row="1"
+                                            Grid.Column="4"
+                                            CornerRadius="0,2,2,0">
+                    <Border.Background>
+                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='2'}" />
+                    </Border.Background>
+                </Border>
+                <!-- Main Color Preview Box at Bottom -->
+                <!-- Must be last for drop shadow Z-index -->
+                <controls:DropShadowPanel Grid.RowSpan="3"
+                                          Grid.Column="2"
+                                          BlurRadius="10.0"
+                                          ShadowOpacity="0.75"
+                                          OffsetX="0.0"
+                                          OffsetY="0.0"
+                                          Color="Black"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Stretch">
+                    <Grid>
+                        <Border Background="{ThemeResource FlyoutPresenterBackground}"
+                                                    CornerRadius="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch" />
+                        <Border x:Name="CheckeredBackground3Border"
+                                                    CornerRadius="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch" />
+                        <Border x:Name="PreviewBorder"
+                                                    CornerRadius="2">
+                            <Border.Background>
+                                <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
+                            </Border.Background>
+                        </Border>
+                    </Grid>
+                </controls:DropShadowPanel>
+            </Grid>
+        </Grid>
+    </ControlTemplate>
 
-                                                            <VisualState x:Name="BottomReorderHint">
+    <!-- TODO: Pull into separate file? -->
+    <Style TargetType="controls:ColorPickerSlider" BasedOn="{StaticResource ColorPickerSliderStyle}"/>
 
-                                                                <Storyboard>
-                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Bottom" />
-                                                                </Storyboard>
-                                                            </VisualState>
+    <Style x:Key="ColorPickerSliderStyle" TargetType="controls:ColorPickerSlider">
+        <Setter Property="VerticalAlignment"
+                                        Value="Center" />
+        <Setter Property="IsThumbToolTipEnabled"
+                                        Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <!-- Based on WinUI version 2.4.2 -->
+                <ControlTemplate TargetType="controls:ColorPickerSlider">
+                    <Grid Margin="{TemplateBinding Padding}">
+                        <Grid.Resources>
+                            <Style TargetType="Thumb"
+                                                           x:Key="SliderThumbStyle">
+                                <Setter Property="BorderThickness"
+                                                                Value="3" />
+                                <Setter Property="Background"
+                                                                Value="Transparent" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Thumb">
+                                            <Border Background="{TemplateBinding Background}"
+                                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                                            CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Grid.Resources>
 
-                                                            <VisualState x:Name="TopReorderHint">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
 
-                                                                <Storyboard>
-                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Top" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                <!-- The Pressed state is purposely the same as normal.
+                                                             This ensures that the thumb always has the correct contrast with 
+                                                             the selected color underneath it when dragging or moving. -->
+                                <VisualState x:Name="Pressed" />
 
-                                                            <VisualState x:Name="RightReorderHint">
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="VerticalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="SliderContainer.Background"
+                                                                        Value="{ThemeResource SliderContainerBackgroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                                                                <Storyboard>
-                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Right" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="VerticalThumb.BorderBrush"
+                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="SliderContainer.Background"
+                                                                        Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                                                            <VisualState x:Name="LeftReorderHint">
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusEngagementStates">
+                                <VisualState x:Name="FocusDisengaged" />
+                                <VisualState x:Name="FocusEngagedHorizontal">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
+                                                                        Value="False" />
+                                        <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)"
+                                                                        Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="FocusEngagedVertical">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
+                                                                        Value="False" />
+                                        <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)"
+                                                                        Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                                                                <Storyboard>
-                                                                    <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Left" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                            </VisualStateGroup>
 
-                                                            <VisualStateGroup.Transitions>
-                                                                <VisualTransition To="NoReorderHint"
-                                                                                                        GeneratedDuration="0:0:0.2" />
-                                                            </VisualStateGroup.Transitions>
+                        </VisualStateManager.VisualStateGroups>
 
-                                                        </VisualStateGroup>
+                        <Grid x:Name="SliderContainer"
+                                                      Background="{ThemeResource SliderContainerBackground}"
+                                                      Control.IsTemplateFocusTarget="True">
+                            <Grid x:Name="HorizontalTemplate"
+                                                          MinHeight="20">
 
-                                                        <VisualStateGroup x:Name="DragStates">
-                                                            <VisualState x:Name="NotDragging" />
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
 
-                                                            <VisualState x:Name="Dragging">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="0" />
+                                </Grid.RowDefinitions>
 
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                    <DragItemThemeAnimation TargetName="ContentBorder" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                <Rectangle x:Name="HorizontalTrackRect"
+                                                                   Fill="{TemplateBinding Background}"
+                                                                   Height="20"
+                                                                   Grid.Row="1"
+                                                                   Grid.ColumnSpan="3"
+                                                                   RadiusX="10"
+                                                                   RadiusY="10" />
+                                <Rectangle x:Name="HorizontalDecreaseRect"
+                                                                   Fill="Transparent"
+                                                                   Grid.Row="1"
+                                                                   RadiusX="8"
+                                                                   RadiusY="8" />
+                                <Thumb x:Name="HorizontalThumb"
+                                                               Style="{StaticResource SliderThumbStyle}"
+                                                               DataContext="{TemplateBinding Value}"
+                                                               BorderBrush="{TemplateBinding BorderBrush}"
+                                                               Height="20"
+                                                               Width="20"
+                                                               CornerRadius="10"
+                                                               Grid.Row="0"
+                                                               Grid.RowSpan="3"
+                                                               Grid.Column="1"
+                                                               FocusVisualMargin="-14,-6,-14,-6"
+                                                               AutomationProperties.AccessibilityView="Raw" />
+                            </Grid>
+                            <Grid x:Name="VerticalTemplate"
+                                                          MinWidth="20"
+                                                          Visibility="Collapsed">
 
-                                                            <VisualState x:Name="DraggingTarget" />
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
 
-                                                            <VisualState x:Name="MultipleDraggingPrimary">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="0" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="0" />
+                                </Grid.ColumnDefinitions>
 
-                                                                <Storyboard>
-                                                                    <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                on the same elements animate an internal Opacity. -->
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                <Rectangle x:Name="VerticalTrackRect"
+                                                                   Fill="{TemplateBinding Background}"
+                                                                   Width="20"
+                                                                   Grid.Column="1"
+                                                                   Grid.RowSpan="3"
+                                                                   RadiusX="10"
+                                                                   RadiusY="10" />
+                                <Rectangle x:Name="VerticalDecreaseRect"
+                                                                   Fill="Transparent"
+                                                                   Grid.Column="1"
+                                                                   Grid.Row="2"
+                                                                   RadiusX="8"
+                                                                   RadiusY="8" />
+                                <Thumb x:Name="VerticalThumb"
+                                                               Style="{StaticResource SliderThumbStyle}"
+                                                               DataContext="{TemplateBinding Value}"
+                                                               BorderBrush="{TemplateBinding BorderBrush}"
+                                                               Height="20"
+                                                               Width="20"
+                                                               CornerRadius="10"
+                                                               Grid.Row="1"
+                                                               Grid.Column="0"
+                                                               Grid.ColumnSpan="3"
+                                                               FocusVisualMargin="-6,-14,-6,-14"
+                                                               AutomationProperties.AccessibilityView="Raw" />
+                            </Grid>
+                        </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="PaletteGridViewItemStyle" TargetType="GridViewItem">
+        <Setter Property="FontFamily"
+                                                                Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize"
+                                                                Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Background"
+                                                                Value="Transparent" />
+        <Setter Property="Foreground"
+                                                                Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+        <Setter Property="TabNavigation"
+                                                                Value="Local" />
+        <Setter Property="IsHoldingEnabled"
+                                                                Value="True" />
+        <Setter Property="HorizontalContentAlignment"
+                                                                Value="Stretch" />
+        <Setter Property="VerticalContentAlignment"
+                                                                Value="Stretch" />
+        <Setter Property="Margin"
+                                                                Value="0" />
+        <Setter Property="Padding"
+                                                                Value="0" />
+        <Setter Property="MinWidth"
+                                                                Value="10" />
+        <Setter Property="MinHeight"
+                                                                Value="10" />
+        <Setter Property="AllowDrop"
+                                                                Value="False" />
+        <Setter Property="UseSystemFocusVisuals"
+                                                                Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin"
+                                                                Value="-2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GridViewItem">
+                    <Grid x:Name="ContentBorder"
+                                                                            Control.IsTemplateFocusTarget="True"
+                                                                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+                                                                            Background="{TemplateBinding Background}"
+                                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                                            CornerRadius="{TemplateBinding CornerRadius}"
+                                                                            RenderTransformOrigin="0.5,0.5">
+
+                        <Grid.RenderTransform>
+                            <ScaleTransform x:Name="ContentBorderScale" />
+                        </Grid.RenderTransform>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Collapsed" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="BorderRectangle"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
                                                                                                             To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="BorderRectangle"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
                                                                                                             To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerDownThemeAnimation TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Selected">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
-                                                                                                            To="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="BorderRectangle"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
-                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
-                                                                    <DragItemThemeAnimation TargetName="ContentBorder" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="MultipleDraggingSecondary" />
-
-                                                            <VisualState x:Name="DraggedPlaceholder" />
+                                                                                                            To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                                            <VisualState x:Name="Reordering">
+                                <VisualState x:Name="PointerOverSelected">
 
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
                                                                                                             Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderThemeOpacity}" />
-                                                                </Storyboard>
-                                                            </VisualState>
-
-                                                            <VisualState x:Name="ReorderingTarget">
-
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="BorderRectangle"
                                                                                                             Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeOpacity}" />
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                            Storyboard.TargetProperty="ScaleX"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                            Storyboard.TargetProperty="ScaleY"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                                            <VisualState x:Name="MultipleReorderingPrimary">
+                                <VisualState x:Name="PressedSelected">
 
-                                                                <Storyboard>
-                                                                    <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                on the same elements animate an internal Opacity. -->
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
                                                                                                             To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                        <DoubleAnimation Storyboard.TargetName="BorderRectangle"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
                                                                                                             To="1" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
+                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
+                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="2" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <PointerDownThemeAnimation TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="DisabledStates">
+                                <VisualState x:Name="Enabled" />
+
+                                <VisualState x:Name="Disabled">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
                                                                                                             Storyboard.TargetProperty="Opacity"
                                                                                                             Duration="0"
-                                                                                                            To="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
-                                                                    <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                                                                                            To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="MultiSelectStates">
+                                <VisualState x:Name="MultiSelectDisabled">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.333"
+                                                                                                                    Value="Collapsed" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <FadeOutThemeAnimation TargetName="MultiSelectSquare" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="MultiSelectEnabled">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <FadeInThemeAnimation TargetName="MultiSelectSquare" />
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="DataVirtualizationStates">
+                                <VisualState x:Name="DataAvailable" />
+
+                                <VisualState x:Name="DataPlaceholder">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
+                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                                                    Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="ReorderHintStates">
+                                <VisualState x:Name="NoReorderHint" />
+
+                                <VisualState x:Name="BottomReorderHint">
+
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Bottom" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                                            <VisualState x:Name="ReorderedPlaceholder">
+                                <VisualState x:Name="TopReorderHint">
 
-                                                                <Storyboard>
-                                                                    <FadeOutThemeAnimation TargetName="ContentBorder" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Top" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="RightReorderHint">
+
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Right" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                                            <VisualState x:Name="DragOver">
+                                <VisualState x:Name="LeftReorderHint">
 
-                                                                <Storyboard>
-                                                                    <DropTargetItemThemeAnimation TargetName="ContentBorder" />
-                                                                </Storyboard>
-                                                            </VisualState>
+                                    <Storyboard>
+                                        <DragOverThemeAnimation TargetName="ContentBorder"
+                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                                                                Direction="Left" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                                            <VisualStateGroup.Transitions>
-                                                                <VisualTransition To="NotDragging"
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition To="NoReorderHint"
                                                                                                         GeneratedDuration="0:0:0.2" />
-                                                            </VisualStateGroup.Transitions>
+                                </VisualStateGroup.Transitions>
 
-                                                        </VisualStateGroup>
+                            </VisualStateGroup>
 
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <ContentPresenter x:Name="ContentPresenter"
-                                                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                                            Margin="{TemplateBinding Padding}" />
-                                                    <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
-                                                                                In the DataPlaceholder state, the Content is not loaded yet so we
-                                                                                approximate the size of the item using placeholder text. -->
-                                                    <TextBlock x:Name="PlaceholderTextBlock"
-                                                                                    Visibility="Collapsed"
-                                                                                    Text="Xg"
-                                                                                    Foreground="{x:Null}"
-                                                                                    Margin="{TemplateBinding Padding}"
-                                                                                    IsHitTestVisible="False"
-                                                                                    AutomationProperties.AccessibilityView="Raw" />
-                                                    <Rectangle x:Name="PlaceholderRect"
-                                                                                    Visibility="Collapsed"
-                                                                                    Fill="{ThemeResource ListViewItemPlaceholderBackground}" />
-                                                    <Rectangle x:Name="BorderRectangle"
-                                                                                    IsHitTestVisible="False"
-                                                                                    Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
-                                                                                    StrokeThickness="2"
-                                                                                    Opacity="0" />
-                                                    <Border x:Name="MultiSelectSquare"
-                                                                                Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
-                                                                                Width="20"
-                                                                                Height="20"
-                                                                                Margin="0,2,2,0"
-                                                                                VerticalAlignment="Top"
-                                                                                HorizontalAlignment="Right"
-                                                                                Visibility="Collapsed">
-                                                        <FontIcon x:Name="MultiSelectCheck"
-                                                                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                                                        Glyph="&#xE73E;"
-                                                                                        FontSize="16"
-                                                                                        Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
-                                                                                        Opacity="0" />
-                                                    </Border>
-                                                    <Border x:Name="MultiArrangeOverlayTextBorder"
-                                                                                Opacity="0"
-                                                                                IsHitTestVisible="False"
-                                                                                MinWidth="20"
-                                                                                Height="20"
-                                                                                VerticalAlignment="Center"
-                                                                                HorizontalAlignment="Center"
-                                                                                Background="{ThemeResource SystemControlBackgroundAccentBrush}"
-                                                                                BorderThickness="2"
-                                                                                BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}">
-                                                        <TextBlock x:Name="MultiArrangeOverlayText"
-                                                                                        Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
-                                                                                        Style="{ThemeResource CaptionTextBlockStyle}"
-                                                                                        IsHitTestVisible="False"
-                                                                                        Opacity="0"
-                                                                                        VerticalAlignment="Center"
-                                                                                        HorizontalAlignment="Center"
-                                                                                        AutomationProperties.AccessibilityView="Raw" />
-                                                    </Border>
-
-                                                </Grid>
-
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </GridView.ItemContainerStyle>
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayName}}"
-                                                                HorizontalAlignment="Stretch"
-                                                                VerticalAlignment="Stretch">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{Binding}" />
-                                        </Border.Background>
-                                    </Border>
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-                        </GridView>
-                    </PivotItem.Content>
-                </PivotItem>
-                <PivotItem x:Name="ChannelsPivotItem"
-                                                AutomationProperties.Name="Channels">
-                    <PivotItem.Header>
-                        <FontIcon Glyph="&#xE9E9;"
-                                                        Width="108" />
-                    </PivotItem.Header>
-                    <PivotItem.Content>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="30" />
-                                <ColumnDefinition Width="80" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="24" />
-                                <RowDefinition Height="1*" />
-                                <RowDefinition Height="1*" />
-                                <RowDefinition Height="1*" />
-                                <RowDefinition Height="1*" />
-                                <!-- Note that there is an additional 12px added by the PivotItem -->
-                                <RowDefinition Height="12" />
-                            </Grid.RowDefinitions>
-                            <!-- Top color model & Hex input -->
-                            <Grid Grid.Column="0"
-                                                        Grid.ColumnSpan="3"
-                                                        Grid.Row="0">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="12" />
-                                    <ColumnDefinition Width="2*" />
-                                </Grid.ColumnDefinitions>
-                                <!-- Content RGB/HSV names are hard-coded in ColorPicker as well -->
-                                <!-- ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
-                                <ToggleButton x:Name="RgbToggleButton"
-                                                                    Grid.Column="0"
-                                                                    Content="RGB"
-                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                    BorderThickness="1"
-                                                                    Background="Transparent"
-                                                                    HorizontalAlignment="Stretch"
-                                                                    IsThreeState="False"
-                                                                    contract7Present:CornerRadius="2,0,0,2"/>
-                                <ToggleButton x:Name="HsvToggleButton"
-                                                                    Grid.Column="1"
-                                                                    Content="HSV"
-                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                    BorderThickness="1"
-                                                                    Background="Transparent"
-                                                                    HorizontalAlignment="Stretch"
-                                                                    IsThreeState="False"
-                                                                    contract7Present:CornerRadius="0,2,2,0" />
-                                <Grid x:Name="HexInputGrid"
-                                                            Grid.Column="3">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="30" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Border Grid.Column="0"
-                                                                Height="32"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2">
-                                        <TextBlock Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                        FontWeight="SemiBold"
-                                                                        Text="#"
-                                                                        HorizontalAlignment="Center"
-                                                                        VerticalAlignment="Center" />
-                                    </Border>
-                                    <!-- Name must NOT match what is in ColorPicker 'HexTextBox' -->
-                                    <TextBox x:Name="HexInputTextBox"
-                                                                    Style="{StaticResource InputTextBoxStyle}"
-                                                                    AutomationProperties.Name="Hexadecimal Color Input"
-                                                                    Height="32"
-                                                                    Grid.Column="1"
-                                                                    HorizontalAlignment="Stretch" />
-                                </Grid>
-                            </Grid>
-                            <!-- Color channel editing controls -->
-                            <!-- Channel 1 RGB:Red HSV:Hue -->
-                            <Border Grid.Column="0"
-                                                        Grid.Row="2"
-                                                        Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
-                                <TextBlock x:Name="Channel1TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="R"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
-                            </Border>
-                            <TextBox x:Name="Channel1TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="2"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Red Channel"
-                                                            VerticalAlignment="Center" />
-                            <controls:ColorPickerSlider x:Name="Channel1Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="2"
-                                                                                    AutomationProperties.Name="Red Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                            <!-- Channel 2 RGB:Green HSV:Saturation -->
-                            <Border Grid.Column="0"
-                                                        Grid.Row="3"
-                                                        Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
-                                <TextBlock x:Name="Channel2TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="G"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
-                            </Border>
-                            <TextBox x:Name="Channel2TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="3"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Green Channel"
-                                                            VerticalAlignment="Center" />
-                            <controls:ColorPickerSlider x:Name="Channel2Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="3"
-                                                                                    AutomationProperties.Name="Green Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                            <!-- Channel 3 RGB:Blue HSV:Value -->
-                            <Border Grid.Column="0"
-                                                        Grid.Row="4"
-                                                        Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
-                                <TextBlock x:Name="Channel3TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="B"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
-                            </Border>
-                            <TextBox x:Name="Channel3TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="4"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Blue Channel"
-                                                            VerticalAlignment="Center" />
-                            <controls:ColorPickerSlider x:Name="Channel3Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="4"
-                                                                                    AutomationProperties.Name="Blue Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                            <!-- Alpha channel -->
-                            <Border x:Name="AlphaChannelBorder"
-                                                        Grid.Column="0"
-                                                        Grid.Row="5"
-                                                        Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
-                                <TextBlock x:Name="AlphaChannelTextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="A"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
-                            </Border>
-                            <TextBox x:Name="AlphaChannelTextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="5"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Alpha Channel"
-                                                            VerticalAlignment="Center" />
-                            <controls:ColorPickerSlider x:Name="AlphaChannelSlider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="5"
-                                                                                    AutomationProperties.Name="Alpha Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                        </Grid>
-                    </PivotItem.Content>
-                </PivotItem>
-            </Pivot>
-            <!-- TODO: Expose resources for the height of this part and the margin -->
-            <Grid x:Name="ColorPreviewGrid"
-                                        Grid.Row="2"
-                                        Height="48"
-                                        Margin="12,0,12,12">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="4"/>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="4"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="3*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Left-side Preview Darker Shades -->
-                <Border x:Name="CheckeredBackground2Border"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch" />
-                <Border x:Name="N2PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            VerticalAlignment="Stretch"
-                                            CornerRadius="2,0,0,2">
-                    <Border.Background>
-                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-2'}" />
-                    </Border.Background>
-                </Border>
-                <!-- The -1 and +1 accent preview originally had a drop shadow as well.
-                                            However, due to Z-order issues with the checkered background,
-                                            shadow and preview border, it would have required it's own
-                                            checkered background. This was judged not worth the performance 
-                                            trade-off so shadows were removed. -->
-                <Border x:Name="N1PreviewBorder"
-                                                Grid.Row="1"
-                                                Grid.Column="1">
-                    <Border.Background>
-                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-1'}" />
-                    </Border.Background>
-                </Border>
-                <!-- Right-side Preview Lighter Shades -->
-                <Border x:Name="CheckeredBackground4Border"
-                                                Grid.Row="1"
-                                                Grid.Column="3"
-                                                Grid.ColumnSpan="2"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch" />
-                <Border x:Name="P1PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="3">
-                    <Border.Background>
-                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='1'}" />
-                    </Border.Background>
-                </Border>
-                <Border x:Name="P2PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="4"
-                                            CornerRadius="0,2,2,0">
-                    <Border.Background>
-                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='2'}" />
-                    </Border.Background>
-                </Border>
-                <!-- Main Color Preview Box at Bottom -->
-                <!-- Must be last for drop shadow Z-index -->
-                <controls:DropShadowPanel Grid.RowSpan="3"
-                                          Grid.Column="2"
-                                          BlurRadius="10.0"
-                                          ShadowOpacity="0.75"
-                                          OffsetX="0.0"
-                                          OffsetY="0.0"
-                                          Color="Black"
-                                          HorizontalContentAlignment="Stretch"
-                                          VerticalContentAlignment="Stretch">
-                    <Grid>
-                        <Border Background="{ThemeResource FlyoutPresenterBackground}"
-                                                    CornerRadius="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch" />
-                        <Border x:Name="CheckeredBackground3Border"
-                                                    CornerRadius="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch" />
-                        <Border x:Name="PreviewBorder"
-                                                    CornerRadius="2">
-                            <Border.Background>
-                                <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
-                            </Border.Background>
-                        </Border>
-                    </Grid>
-                </controls:DropShadowPanel>
-            </Grid>
-        </Grid>
-    </ControlTemplate>
+                            <VisualStateGroup x:Name="DragStates">
+                                <VisualState x:Name="NotDragging" />
 
-    <!-- TODO: Remove duplicity here when #3440 is resolved -->
-    <contract7NotPresent:Style TargetType="controls:ColorPicker"
-                               BasedOn="{StaticResource BaseColorPickerStyle}">
-        <!-- Currently not used -->
-    </contract7NotPresent:Style>
+                                <VisualState x:Name="Dragging">
 
-    <contract7Present:Style TargetType="controls:ColorPicker"
-                            BasedOn="{StaticResource BaseColorPickerStyle}">
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-    </contract7Present:Style>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                        <DragItemThemeAnimation TargetName="ContentBorder" />
+                                    </Storyboard>
+                                </VisualState>
 
-    <!-- TODO: Pull into separate file? -->
-    <Style TargetType="controls:ColorPickerSlider" BasedOn="{StaticResource ColorPickerSliderStyle}"/>
+                                <VisualState x:Name="DraggingTarget" />
 
-    <Style x:Key="ColorPickerSliderStyle" TargetType="controls:ColorPickerSlider">
-        <Setter Property="VerticalAlignment"
-                                        Value="Center" />
-        <Setter Property="IsThumbToolTipEnabled"
-                                        Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <!-- Based on WinUI version 2.4.2 -->
-                <ControlTemplate TargetType="controls:ColorPickerSlider">
-                    <Grid Margin="{TemplateBinding Padding}">
-                        <Grid.Resources>
-                            <Style TargetType="Thumb"
-                                                           x:Key="SliderThumbStyle">
-                                <Setter Property="BorderThickness"
-                                                                Value="3" />
-                                <Setter Property="Background"
-                                                                Value="Transparent" />
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="Thumb">
-                                            <Border Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Grid.Resources>
+                                <VisualState x:Name="MultipleDraggingPrimary">
+
+                                    <Storyboard>
+                                        <!-- These two Opacity animations are required - the FadeInThemeAnimations
+                                                                                                on the same elements animate an internal Opacity. -->
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
+                                        <DragItemThemeAnimation TargetName="ContentBorder" />
+                                    </Storyboard>
+                                </VisualState>
 
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MultipleDraggingSecondary" />
 
-                                <!-- The Pressed state is purposely the same as normal.
-                                                             This ensures that the thumb always has the correct contrast with 
-                                                             the selected color underneath it when dragging or moving. -->
-                                <VisualState x:Name="Pressed" />
+                                <VisualState x:Name="DraggedPlaceholder" />
 
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                        <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                        <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundDisabled}" />
-                                    </VisualState.Setters>
-                                </VisualState>
+                                <VisualState x:Name="Reordering">
 
-                                <VisualState x:Name="PointerOver">
-                                    <VisualState.Setters>
-                                        <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                        <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                        <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
-                                    </VisualState.Setters>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderThemeOpacity}" />
+                                    </Storyboard>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusEngagementStates">
-                                <VisualState x:Name="FocusDisengaged" />
-                                <VisualState x:Name="FocusEngagedHorizontal">
-                                    <VisualState.Setters>
-                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                        <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="FocusEngagedVertical">
-                                    <VisualState.Setters>
-                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                        <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                    </VisualState.Setters>
+                                <VisualState x:Name="ReorderingTarget">
+
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeOpacity}" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
+                                                                                                            Storyboard.TargetProperty="ScaleX"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
+                                                                                                            Storyboard.TargetProperty="ScaleY"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                    </Storyboard>
                                 </VisualState>
 
-                            </VisualStateGroup>
+                                <VisualState x:Name="MultipleReorderingPrimary">
 
-                        </VisualStateManager.VisualStateGroups>
+                                    <Storyboard>
+                                        <!-- These two Opacity animations are required - the FadeInThemeAnimations
+                                                                                                on the same elements animate an internal Opacity. -->
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="1" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                        <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0"
+                                                                                                            To="0" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                                                                            Storyboard.TargetProperty="Opacity"
+                                                                                                            Duration="0:0:0.240"
+                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
+                                        <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
+                                    </Storyboard>
+                                </VisualState>
 
-                        <Grid x:Name="SliderContainer"
-                                                      Background="{ThemeResource SliderContainerBackground}"
-                                                      Control.IsTemplateFocusTarget="True">
-                            <Grid x:Name="HorizontalTemplate"
-                                                          MinHeight="20">
+                                <VisualState x:Name="ReorderedPlaceholder">
 
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
+                                    <Storyboard>
+                                        <FadeOutThemeAnimation TargetName="ContentBorder" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="0" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="0" />
-                                </Grid.RowDefinitions>
+                                <VisualState x:Name="DragOver">
 
-                                <Rectangle x:Name="HorizontalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Height="20"
-                                                                   Grid.Row="1"
-                                                                   Grid.ColumnSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
-                                <Rectangle x:Name="HorizontalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Row="1"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
-                                <Thumb x:Name="HorizontalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               contract7Present:CornerRadius="10"
-                                                               Grid.Row="0"
-                                                               Grid.RowSpan="3"
-                                                               Grid.Column="1"
-                                                               FocusVisualMargin="-14,-6,-14,-6"
-                                                               AutomationProperties.AccessibilityView="Raw" />
-                            </Grid>
-                            <Grid x:Name="VerticalTemplate"
-                                                          MinWidth="20"
-                                                          Visibility="Collapsed">
+                                    <Storyboard>
+                                        <DropTargetItemThemeAnimation TargetName="ContentBorder" />
+                                    </Storyboard>
+                                </VisualState>
 
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition To="NotDragging"
+                                                                                                        GeneratedDuration="0:0:0.2" />
+                                </VisualStateGroup.Transitions>
 
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="0" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="0" />
-                                </Grid.ColumnDefinitions>
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                        <ContentPresenter x:Name="ContentPresenter"
+                                                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                                            Margin="{TemplateBinding Padding}" />
+                        <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
+                                                                                In the DataPlaceholder state, the Content is not loaded yet so we
+                                                                                approximate the size of the item using placeholder text. -->
+                        <TextBlock x:Name="PlaceholderTextBlock"
+                                                                                    Visibility="Collapsed"
+                                                                                    Text="Xg"
+                                                                                    Foreground="{x:Null}"
+                                                                                    Margin="{TemplateBinding Padding}"
+                                                                                    IsHitTestVisible="False"
+                                                                                    AutomationProperties.AccessibilityView="Raw" />
+                        <Rectangle x:Name="PlaceholderRect"
+                                                                                    Visibility="Collapsed"
+                                                                                    Fill="{ThemeResource ListViewItemPlaceholderBackground}" />
+                        <Rectangle x:Name="BorderRectangle"
+                                                                                    IsHitTestVisible="False"
+                                                                                    Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
+                                                                                    StrokeThickness="2"
+                                                                                    Opacity="0" />
+                        <Border x:Name="MultiSelectSquare"
+                                                                                Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
+                                                                                Width="20"
+                                                                                Height="20"
+                                                                                Margin="0,2,2,0"
+                                                                                VerticalAlignment="Top"
+                                                                                HorizontalAlignment="Right"
+                                                                                Visibility="Collapsed">
+                            <FontIcon x:Name="MultiSelectCheck"
+                                                                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                                        Glyph="&#xE73E;"
+                                                                                        FontSize="16"
+                                                                                        Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
+                                                                                        Opacity="0" />
+                        </Border>
+                        <Border x:Name="MultiArrangeOverlayTextBorder"
+                                                                                Opacity="0"
+                                                                                IsHitTestVisible="False"
+                                                                                MinWidth="20"
+                                                                                Height="20"
+                                                                                VerticalAlignment="Center"
+                                                                                HorizontalAlignment="Center"
+                                                                                Background="{ThemeResource SystemControlBackgroundAccentBrush}"
+                                                                                BorderThickness="2"
+                                                                                BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}">
+                            <TextBlock x:Name="MultiArrangeOverlayText"
+                                                                                        Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
+                                                                                        Style="{ThemeResource CaptionTextBlockStyle}"
+                                                                                        IsHitTestVisible="False"
+                                                                                        Opacity="0"
+                                                                                        VerticalAlignment="Center"
+                                                                                        HorizontalAlignment="Center"
+                                                                                        AutomationProperties.AccessibilityView="Raw" />
+                        </Border>
 
-                                <Rectangle x:Name="VerticalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Width="20"
-                                                                   Grid.Column="1"
-                                                                   Grid.RowSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
-                                <Rectangle x:Name="VerticalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Column="1"
-                                                                   Grid.Row="2"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
-                                <Thumb x:Name="VerticalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               contract7Present:CornerRadius="10"
-                                                               Grid.Row="1"
-                                                               Grid.Column="0"
-                                                               Grid.ColumnSpan="3"
-                                                               FocusVisualMargin="-6,-14,-6,-14"
-                                                               AutomationProperties.AccessibilityView="Raw" />
-                            </Grid>
-                        </Grid>
                     </Grid>
+
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
+    <Style x:Key="UnderlineListBoxItemStyle" TargetType="ListBoxItem">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="Padding" Value="{StaticResource ListBoxItemPadding}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Margin" Value="8,0,8,0" />
+        <Setter Property="Padding" Value="24,0,24,0" />
+        <Setter Property="MinWidth" Value="108"/>
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="Template" Value="{StaticResource UnderlineListBoxItemTemplate}"/>
+    </Style>
+
+    <ControlTemplate x:Key="UnderlineListBoxItemTemplate" TargetType="ListBoxItem">
+        <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
+
+            <Grid.Resources>
+                <Style x:Key="BaseContentPresenterStyle" TargetType="ContentPresenter">
+                    <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
+                    <Setter Property="FontWeight" Value="SemiBold" />
+                    <Setter Property="TextWrapping" Value="Wrap" />
+                    <Setter Property="LineStackingStrategy" Value="MaxHeight" />
+                    <Setter Property="TextLineBounds" Value="Full" />
+                    <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
+                </Style>
+                <Style x:Key="BodyContentPresenterStyle" TargetType="ContentPresenter" BasedOn="{StaticResource BaseContentPresenterStyle}">
+                    <Setter Property="FontWeight" Value="Normal" />
+                </Style>
+            </Grid.Resources>
+
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+
+                    <VisualState x:Name="Disabled">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="PointerOver">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="Pressed">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="Selected">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="SelectedUnfocused">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="SelectedPointerOver">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentMediumBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="SelectedPressed">
+
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+
+                </VisualStateGroup>
+
+            </VisualStateManager.VisualStateGroups>
+            <Rectangle x:Name="PressedBackground"
+                                       Fill="Transparent"
+                                       Control.IsTemplateFocusTarget="True"
+                                       Margin="4,0,4,2"
+                                       Height="2"
+                                       RadiusX="1" RadiusY="1"
+                                       VerticalAlignment="Bottom" />
+            <ContentPresenter x:Name="ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTransitions="{TemplateBinding ContentTransitions}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Style="{StaticResource BodyContentPresenterStyle}"
+                                TextWrapping="NoWrap"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Margin="{TemplateBinding Padding}" />
+
+        </Grid>
+
+    </ControlTemplate>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs
new file mode 100644
index 00000000000..b0ebd72361f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs
@@ -0,0 +1,83 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Markup;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// <see cref="Case"/> is the value container for the <see cref="SwitchPresenter"/>.
+    /// </summary>
+    [ContentProperty(Name = nameof(Content))]
+    public class Case : DependencyObject
+    {
+        internal SwitchPresenter Parent { get; set; } // TODO: Can we remove Parent need here and just use events?
+
+        /// <summary>
+        /// Event raised when the <see cref="Value"/> property changes.
+        /// </summary>
+        public event EventHandler ValueChanged;
+
+        /// <summary>
+        /// Gets or sets the Content to display when this case is active.
+        /// </summary>
+        public UIElement Content
+        {
+            get { return (UIElement)GetValue(ContentProperty); }
+            set { SetValue(ContentProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Content"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ContentProperty =
+            DependencyProperty.Register(nameof(Content), typeof(UIElement), typeof(Case), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this is the default case to display when no values match the specified value in the <see cref="SwitchPresenter"/>. There should only be a single default case provided. Do not set the <see cref="Value"/> property when setting <see cref="IsDefault"/> to <c>true</c>. Default is <c>false</c>.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (bool)GetValue(IsDefaultProperty); }
+            set { SetValue(IsDefaultProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IsDefault"/> property.
+        /// </summary>
+        public static readonly DependencyProperty IsDefaultProperty =
+            DependencyProperty.Register(nameof(IsDefault), typeof(bool), typeof(Case), new PropertyMetadata(false));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Value"/> that this case represents. If it matches the <see cref="SwitchPresenter.Value"/> this case's <see cref="Content"/> will be displayed in the presenter.
+        /// </summary>
+        public object Value
+        {
+            get { return (object)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Value"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(object), typeof(Case), new PropertyMetadata(null, OnValuePropertyChanged));
+
+        private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var xcase = (Case)d;
+
+            xcase.ValueChanged?.Invoke(xcase, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Case"/> class.
+        /// </summary>
+        public Case()
+        {
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
new file mode 100644
index 00000000000..26051720ad7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
@@ -0,0 +1,131 @@
+// 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;
+using System.Collections.Generic;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// An collection of <see cref="Case"/> to help with XAML interop.
+    /// </summary>
+    public class CaseCollection : IList<Case>, IEnumerable<Case> // TODO: Do we need this or can we use an ObservableCollection directly??? (Or is it useful to have it manage the registration of the child events?)
+    {
+        internal SwitchPresenter Parent { get; set; } // TODO: Can we remove Parent need here and just use events?
+
+        private readonly List<Case> _internalList = new List<Case>();
+
+        /// <inheritdoc/>
+        public int Count => _internalList.Count;
+
+        /// <inheritdoc/>
+        public bool IsReadOnly => false;
+
+        /// <inheritdoc/>
+        public Case this[int index] { get => _internalList[index]; set => Insert(index, value); }
+
+        /// <summary>
+        /// Raised when an animation has been added/removed or modified
+        /// </summary>
+        public event EventHandler CaseCollectionChanged;
+
+        private void ValueChanged(object sender, EventArgs e)
+        {
+            CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        public CaseCollection()
+        {
+        }
+
+        /// <inheritdoc/>
+        public int IndexOf(Case item)
+        {
+            return _internalList.IndexOf(item);
+        }
+
+        /// <inheritdoc/>
+        public void Insert(int index, Case item)
+        {
+            item.ValueChanged += ValueChanged;
+            item.Parent = Parent;
+            _internalList.Insert(index, item);
+            CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public void RemoveAt(int index)
+        {
+            if (index >= 0 && index < _internalList.Count)
+            {
+                var xcase = _internalList[index];
+                xcase.ValueChanged -= ValueChanged;
+                xcase.Parent = null;
+            }
+
+            _internalList.RemoveAt(index);
+            CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public void Add(Case item)
+        {
+            item.ValueChanged += ValueChanged;
+            item.Parent = Parent;
+            _internalList.Add(item);
+            CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public void Clear()
+        {
+            foreach (var xcase in _internalList)
+            {
+                xcase.ValueChanged -= ValueChanged;
+                xcase.Parent = null;
+            }
+
+            _internalList.Clear();
+            CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public bool Contains(Case item)
+        {
+            return _internalList.Contains(item);
+        }
+
+        /// <inheritdoc/>
+        public void CopyTo(Case[] array, int arrayIndex)
+        {
+            _internalList.CopyTo(array, arrayIndex);
+        }
+
+        /// <inheritdoc/>
+        public bool Remove(Case item)
+        {
+            var result = _internalList.Remove(item);
+            if (result)
+            {
+                item.ValueChanged -= ValueChanged;
+                item.Parent = null;
+                CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc/>
+        public IEnumerator<Case> GetEnumerator()
+        {
+            return _internalList.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _internalList.GetEnumerator();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs
new file mode 100644
index 00000000000..8379656683a
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs
@@ -0,0 +1,246 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// The <see cref="SwitchPresenter"/> is a <see cref="ContentPresenter"/> which can allow a developer to mimic a <c>switch</c> statement within XAML.
+    /// When provided a set of <see cref="Case"/>s and a <see cref="Value"/>, it will pick the matching <see cref="Case"/> with the corresponding <see cref="Case.Value"/>.
+    /// </summary>
+    [ContentProperty(Name = nameof(SwitchCases))]
+    public sealed class SwitchPresenter : ContentPresenter
+    {
+        /// <summary>
+        /// Gets the current <see cref="Case"/> which is being displayed.
+        /// </summary>
+        public Case CurrentCase
+        {
+            get { return (Case)GetValue(CurrentCaseProperty); }
+            private set { SetValue(CurrentCaseProperty, value); }
+        }
+
+        /// <summary>
+        /// Indicates the <see cref="CurrentCase"/> property.
+        /// </summary>
+        public static readonly DependencyProperty CurrentCaseProperty =
+            DependencyProperty.Register(nameof(CurrentCase), typeof(Case), typeof(SwitchPresenter), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets a value representing the collection of cases to evaluate.
+        /// </summary>
+        public CaseCollection SwitchCases
+        {
+            get { return (CaseCollection)GetValue(SwitchCasesProperty); }
+            set { SetValue(SwitchCasesProperty, value); }
+        }
+
+        /// <summary>
+        /// Indicates the <see cref="SwitchCases"/> property.
+        /// </summary>
+        public static readonly DependencyProperty SwitchCasesProperty =
+            DependencyProperty.Register(nameof(SwitchCases), typeof(CaseCollection), typeof(SwitchPresenter), new PropertyMetadata(null, new PropertyChangedCallback(OnSwitchCasesPropertyChanged)));
+
+        /// <summary>
+        /// Gets or sets a value indicating the value to compare all cases against. When this value is bound to and changes, the presenter will automatically evaluate cases and select the new appropriate content from the switch.
+        /// </summary>
+        public object Value
+        {
+            get { return (object)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Indicates the <see cref="Value"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(object), typeof(SwitchPresenter), new PropertyMetadata(null, new PropertyChangedCallback(OnValuePropertyChanged)));
+
+        /// <summary>
+        /// Gets or sets a value indicating which type to first cast and compare provided values against.
+        /// </summary>
+        public Type TargetType
+        {
+            get { return (Type)GetValue(DataTypeProperty); }
+            set { SetValue(DataTypeProperty, value); }
+        }
+
+        /// <summary>
+        /// Indicates the <see cref="TargetType"/> property.
+        /// </summary>
+        public static readonly DependencyProperty DataTypeProperty =
+            DependencyProperty.Register(nameof(TargetType), typeof(Type), typeof(SwitchPresenter), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the content is removed from the visual tree when switching between cases.
+        /// </summary>
+        public bool IsVisualTreeDisconnectedOnChange { get; set; }
+
+        private static void OnSwitchCasesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+            {
+                ((SwitchPresenter)e.OldValue).SwitchCases.CaseCollectionChanged -= OnCaseValuePropertyChanged;
+            }
+
+            var xswitch = (SwitchPresenter)d;
+
+            foreach (var xcase in xswitch.SwitchCases)
+            {
+                // Set our parent
+                xcase.Parent = xswitch;
+            }
+
+            // Will trigger on collection change and case value changed
+            xswitch.SwitchCases.Parent = xswitch;
+            xswitch.SwitchCases.CaseCollectionChanged += OnCaseValuePropertyChanged;
+        }
+
+        private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            // When our Switch's expression changes, re-evaluate.
+            var xswitch = (SwitchPresenter)d;
+
+            xswitch.EvaluateCases();
+        }
+
+        private static void OnCaseValuePropertyChanged(object sender, EventArgs e)
+        {
+            // When something about our collection of cases changes, re-evaluate.
+            var collection = (CaseCollection)sender;
+
+            collection.Parent.EvaluateCases();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SwitchPresenter"/> class.
+        /// </summary>
+        public SwitchPresenter()
+        {
+            this.SwitchCases = new CaseCollection();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            EvaluateCases();
+        }
+
+        private void EvaluateCases()
+        {
+            if (CurrentCase != null &&
+                CurrentCase.Value != null &&
+                CurrentCase.Value.Equals(Value))
+            {
+                // If the current case we're on already matches our current value,
+                // then we don't have any work to do.
+                return;
+            }
+
+            Case xdefault = null;
+            Case newcase = null;
+
+            foreach (var xcase in SwitchCases)
+            {
+                if (xcase.IsDefault)
+                {
+                    // If there are multiple default cases provided, this'll override and just grab the last one, the developer will have to fix this in their XAML. We call this out in the case comments.
+                    xdefault = xcase;
+                    continue;
+                }
+
+                if (CompareValues(Value, xcase.Value))
+                {
+                    newcase = xcase;
+                    break;
+                }
+            }
+
+            if (newcase == null && xdefault != null)
+            {
+                // Inject default if we found one.
+                newcase = xdefault;
+            }
+
+            // Only bother changing things around if we have a new case.
+            if (newcase != CurrentCase)
+            {
+                // Disconnect old content from visual tree.
+                if (CurrentCase != null && CurrentCase.Content != null && IsVisualTreeDisconnectedOnChange)
+                {
+                    // TODO: If we disconnect here, we need to recreate later??? Need to Test...
+                    VisualTreeHelper.DisconnectChildrenRecursive(CurrentCase.Content);
+                }
+
+                // Hookup new content.
+                Content = newcase.Content;
+
+                CurrentCase = newcase;
+            }
+        }
+
+        /// <summary>
+        /// Compares two values using the TargetType.
+        /// </summary>
+        /// <param name="compare">Our main value in our SwitchPresenter.</param>
+        /// <param name="value">The value from the case to compare to.</param>
+        /// <returns>true if the two values are equal</returns>
+        private bool CompareValues(object compare, object value)
+        {
+            if (compare == null || value == null)
+            {
+                return compare == value;
+            }
+
+            if (TargetType == null ||
+                (TargetType == compare.GetType() &&
+                 TargetType == value.GetType()))
+            {
+                // Default direct object comparison or we're all the proper type
+                return compare.Equals(value);
+            }
+            else if (compare.GetType() == TargetType)
+            {
+                // If we have a TargetType and the first value is ther right type
+                // Then our 2nd value isn't, so convert to string and coerce.
+                var valueBase2 = ConvertValue(TargetType, value);
+
+                return compare.Equals(valueBase2);
+            }
+
+            // Neither of our two values matches the type so
+            // we'll convert both to a String and try and coerce it to the proper type.
+            var compareBase = ConvertValue(TargetType, compare);
+
+            var valueBase = ConvertValue(TargetType, value);
+
+            return compareBase.Equals(valueBase);
+        }
+
+        /// <summary>
+        /// Helper method to convert a value from a source type to a target type.
+        /// </summary>
+        /// <param name="targetType">The target type</param>
+        /// <param name="value">The value to convert</param>
+        /// <returns>The converted value</returns>
+        internal static object ConvertValue(Type targetType, object value)
+        {
+            if (targetType.IsInstanceOfType(value))
+            {
+                return value;
+            }
+            else
+            {
+                return XamlBindingHelper.ConvertValue(targetType, value);
+            }
+        }
+    }
+}
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index dbb8ef27886..8a84a30043d 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -57,6 +57,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
+		settings.xamlstyler = settings.xamlstyler
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
@@ -569,34 +570,6 @@ Global
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x64.Build.0 = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.Build.0 = Release|Any CPU
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|Any CPU.Build.0 = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM.Build.0 = Debug|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x64.ActiveCfg = Debug|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x64.Build.0 = Debug|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.ActiveCfg = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Debug|x86.Build.0 = Debug|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|Any CPU.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.ActiveCfg = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM.Build.0 = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM64.ActiveCfg = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|ARM64.Build.0 = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x64.ActiveCfg = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x64.Build.0 = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x86.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Native|x86.Build.0 = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM.ActiveCfg = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM.Build.0 = Release|ARM
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|ARM64.Build.0 = Release|ARM64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x64.ActiveCfg = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x64.Build.0 = Release|x64
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x86.ActiveCfg = Release|Win32
-		{A5E98964-45B1-442D-A07A-298A3221D81E}.Release|x86.Build.0 = Release|Win32
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU

From 0680e9b9f5a555d9e10eef1401e33bc6ebf9f896 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 23 Oct 2020 14:38:36 -0700
Subject: [PATCH 589/595] Update Template usage to use nameof and swap default.

---
 .../ColorPicker/ColorPicker.cs                | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
index 65616625b32..6b25acdb40c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
@@ -7,9 +7,9 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Globalization;
+using Microsoft.Toolkit.Diagnostics;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI;
 using Windows.UI.Xaml;
@@ -215,39 +215,39 @@ private static bool IsColorEmpty(Color color)
         /// </summary>
         protected override void OnApplyTemplate()
         {
-            this.ColorSpectrumControl              = this.GetTemplateChild<ColorSpectrum>("ColorSpectrumControl", false);
-            this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<Slider>("ColorSpectrumAlphaSlider", false);
-            this.ColorSpectrumThirdDimensionSlider = this.GetTemplateChild<Slider>("ColorSpectrumThirdDimensionSlider", false);
-
-            this.HexInputTextBox = this.GetTemplateChild<TextBox>("HexInputTextBox", false);
-            this.HsvToggleButton = this.GetTemplateChild<ToggleButton>("HsvToggleButton", false);
-            this.RgbToggleButton = this.GetTemplateChild<ToggleButton>("RgbToggleButton", false);
-
-            this.Channel1TextBox     = this.GetTemplateChild<TextBox>("Channel1TextBox", false);
-            this.Channel2TextBox     = this.GetTemplateChild<TextBox>("Channel2TextBox", false);
-            this.Channel3TextBox     = this.GetTemplateChild<TextBox>("Channel3TextBox", false);
-            this.AlphaChannelTextBox = this.GetTemplateChild<TextBox>("AlphaChannelTextBox", false);
-
-            this.Channel1Slider     = this.GetTemplateChild<Slider>("Channel1Slider", false);
-            this.Channel2Slider     = this.GetTemplateChild<Slider>("Channel2Slider", false);
-            this.Channel3Slider     = this.GetTemplateChild<Slider>("Channel3Slider", false);
-            this.AlphaChannelSlider = this.GetTemplateChild<Slider>("AlphaChannelSlider", false);
-
-            this.N1PreviewBorder = this.GetTemplateChild<Border>("N1PreviewBorder", false);
-            this.N2PreviewBorder = this.GetTemplateChild<Border>("N2PreviewBorder", false);
-            this.P1PreviewBorder = this.GetTemplateChild<Border>("P1PreviewBorder", false);
-            this.P2PreviewBorder = this.GetTemplateChild<Border>("P2PreviewBorder", false);
-
-            this.CheckeredBackground1Border  = this.GetTemplateChild<Border>("CheckeredBackground1Border", false);
-            this.CheckeredBackground2Border  = this.GetTemplateChild<Border>("CheckeredBackground2Border", false);
-            this.CheckeredBackground3Border  = this.GetTemplateChild<Border>("CheckeredBackground3Border", false);
-            this.CheckeredBackground4Border  = this.GetTemplateChild<Border>("CheckeredBackground4Border", false);
-            this.CheckeredBackground5Border  = this.GetTemplateChild<Border>("CheckeredBackground5Border", false);
-            this.CheckeredBackground6Border  = this.GetTemplateChild<Border>("CheckeredBackground6Border", false);
-            this.CheckeredBackground7Border  = this.GetTemplateChild<Border>("CheckeredBackground7Border", false);
-            this.CheckeredBackground8Border  = this.GetTemplateChild<Border>("CheckeredBackground8Border", false);
-            this.CheckeredBackground9Border  = this.GetTemplateChild<Border>("CheckeredBackground9Border", false);
-            this.CheckeredBackground10Border = this.GetTemplateChild<Border>("CheckeredBackground10Border", false);
+            this.ColorSpectrumControl              = this.GetTemplateChild<ColorSpectrum>(nameof(ColorSpectrumControl));
+            this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<Slider>(nameof(ColorSpectrumAlphaSlider));
+            this.ColorSpectrumThirdDimensionSlider = this.GetTemplateChild<Slider>(nameof(ColorSpectrumThirdDimensionSlider));
+
+            this.HexInputTextBox = this.GetTemplateChild<TextBox>(nameof(HexInputTextBox));
+            this.HsvToggleButton = this.GetTemplateChild<ToggleButton>(nameof(HsvToggleButton));
+            this.RgbToggleButton = this.GetTemplateChild<ToggleButton>(nameof(RgbToggleButton));
+
+            this.Channel1TextBox     = this.GetTemplateChild<TextBox>(nameof(Channel1TextBox));
+            this.Channel2TextBox     = this.GetTemplateChild<TextBox>(nameof(Channel2TextBox));
+            this.Channel3TextBox     = this.GetTemplateChild<TextBox>(nameof(Channel3TextBox));
+            this.AlphaChannelTextBox = this.GetTemplateChild<TextBox>(nameof(AlphaChannelTextBox));
+
+            this.Channel1Slider     = this.GetTemplateChild<Slider>(nameof(Channel1Slider));
+            this.Channel2Slider     = this.GetTemplateChild<Slider>(nameof(Channel2Slider));
+            this.Channel3Slider     = this.GetTemplateChild<Slider>(nameof(Channel3Slider));
+            this.AlphaChannelSlider = this.GetTemplateChild<Slider>(nameof(AlphaChannelSlider));
+
+            this.N1PreviewBorder = this.GetTemplateChild<Border>(nameof(N1PreviewBorder));
+            this.N2PreviewBorder = this.GetTemplateChild<Border>(nameof(N2PreviewBorder));
+            this.P1PreviewBorder = this.GetTemplateChild<Border>(nameof(P1PreviewBorder));
+            this.P2PreviewBorder = this.GetTemplateChild<Border>(nameof(P2PreviewBorder));
+
+            this.CheckeredBackground1Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground1Border));
+            this.CheckeredBackground2Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground2Border));
+            this.CheckeredBackground3Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground3Border));
+            this.CheckeredBackground4Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground4Border));
+            this.CheckeredBackground5Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground5Border));
+            this.CheckeredBackground6Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground6Border));
+            this.CheckeredBackground7Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground7Border));
+            this.CheckeredBackground8Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground8Border));
+            this.CheckeredBackground9Border  = this.GetTemplateChild<Border>(nameof(CheckeredBackground9Border));
+            this.CheckeredBackground10Border = this.GetTemplateChild<Border>(nameof(CheckeredBackground10Border));
 
             // Must connect after controls are resolved
             this.ConnectEvents(true);
@@ -265,13 +265,13 @@ protected override void OnApplyTemplate()
         /// <param name="childName">The name of the element to find.</param>
         /// <param name="isRequired">Whether the element is required and will throw an exception if missing.</param>
         /// <returns>The template child matching the given name and type.</returns>
-        private T GetTemplateChild<T>(string childName, bool isRequired = true)
+        private T GetTemplateChild<T>(string childName, bool isRequired = false)
             where T : DependencyObject
         {
             T child = this.GetTemplateChild(childName) as T;
             if ((child == null) && isRequired)
             {
-                throw new NullReferenceException(childName);
+                ThrowHelper.ThrowArgumentNullException(childName);
             }
 
             return child;

From 4bbef930cabfa86ca2353335607eb8f14062f8ca Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 23 Oct 2020 14:40:01 -0700
Subject: [PATCH 590/595] Apply XAML Styler to ColorPicker.xaml

---
 .../ColorPicker/ColorPicker.xaml              | 1703 ++++++++---------
 1 file changed, 845 insertions(+), 858 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
index 5e953079e99..68955118a88 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
-                    xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
+                    xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters">
 
     <SolidColorBrush x:Key="CheckerboardColor0">
         <SolidColorBrush.Color>
@@ -18,235 +18,67 @@
     <SolidColorBrush x:Name="CheckerColorBrush"
                      Color="{ThemeResource SystemListLowColor}" />
 
-    <!-- The XAML compiler has a serious bug that doesn't allow using conditional XAML on Setters...
-         The work-around is to create multiple styles as condition XAML still works at the style level.
-         This is needed to support CornerRadius properties. -->
+    <Style BasedOn="{StaticResource DefaultColorPickerStyle}"
+           TargetType="controls:ColorPicker" />
 
-    <Style TargetType="controls:ColorPicker" BasedOn="{StaticResource DefaultColorPickerStyle}"/>
-
-    <Style x:Key="DefaultColorPickerStyle" TargetType="controls:ColorPicker">
+    <Style x:Key="DefaultColorPickerStyle"
+           TargetType="controls:ColorPicker">
         <Setter Property="Width" Value="392" />
         <Setter Property="MinWidth" Value="312" />
-        <Setter Property="MinHeight" Value="392"/>
+        <Setter Property="MinHeight" Value="392" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template" Value="{StaticResource ColorPickerTemplate}"/>
+        <Setter Property="Template" Value="{StaticResource ColorPickerTemplate}" />
     </Style>
 
     <localconverters:ContrastBrushConverter x:Key="ContrastBrushConverter" />
 
     <ControlTemplate x:Key="ColorPickerTemplate"
                      TargetType="controls:ColorPicker">
-        <Grid BorderBrush="{TemplateBinding BorderBrush}" 
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Margin="{TemplateBinding Padding}">
+        <Grid Margin="{TemplateBinding Padding}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
             <Grid.Resources>
                 <localconverters:ColorToColorShadeConverter x:Key="ColorToColorShadeConverter" />
                 <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
                 <localconverters:ColorToHexConverter x:Key="ColorToHexConverter" />
 
-                <Style x:Key="InputTextBoxStyle" TargetType="TextBox">
-                    <Setter Property="CornerRadius" Value="0,2,2,0" /> <!-- TODO: Is there a theme resource we can use for this from the system? -->
+                <Style x:Key="InputTextBoxStyle"
+                       TargetType="TextBox">
+                    <Setter Property="CornerRadius" Value="0,2,2,0" /> 
+                    <!--  TODO: Is there a theme resource we can use for this from the system?  -->
                 </Style>
             </Grid.Resources>
-            <VisualStateManager.VisualStateGroups>
-
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundDisabled}" />
-                            <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushDisabled}" />
-                            <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="PointerOver">
-                        <VisualState.Setters>
-                            <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundPointerOver}" />
-                            <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushPointerOver}" />
-                            <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundPointerOver}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="Pressed">
-                        <VisualState.Setters>
-                            <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundPressed}" />
-                            <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushPressed}" />
-                            <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundPressed}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ColorSpectrumVisibility">
-                    <VisualState x:Name="ColorSpectrumVisible" />
-                    <VisualState x:Name="ColorSpectrumCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="SpectrumListBoxItem.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ColorPaletteVisibility">
-                    <VisualState x:Name="ColorPaletteVisible" />
-                    <VisualState x:Name="ColorPaletteCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="PaletteListBoxItem.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ColorPreviewVisibility">
-                    <VisualState x:Name="ColorPreviewVisible" />
-                    <VisualState x:Name="ColorPreviewCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="ColorPreviewGrid.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="PreviousColorVisibility">
-                    <!-- Previous color is not currently supported -->
-                    <VisualState x:Name="PreviousColorCollapsedVertical" />
-                    <VisualState x:Name="PreviousColorVisibleVertical" />
-                    <VisualState x:Name="PreviousColorCollapsedHorizontal" />
-                    <VisualState x:Name="PreviousColorVisibleHorizontal" />
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ThirdDimensionSliderVisibility">
-                    <VisualState x:Name="ThirdDimensionSliderVisible" />
-                    <VisualState x:Name="ThirdDimensionSliderCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="ColorSpectrumThirdDimensionSlider.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="AlphaSliderVisibility">
-                    <VisualState x:Name="AlphaSliderVisible" />
-                    <VisualState x:Name="AlphaSliderCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="ColorSpectrumAlphaSlider.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelBorder.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelSlider.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="MoreButtonVisibility">
-                    <!-- More button isn't supported -->
-                    <VisualState x:Name="MoreButtonVisible" />
-                    <VisualState x:Name="MoreButtonCollapsed" />
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="TextEntryGridVisibility">
-                    <!-- Text entry grid is not currently supported -->
-                    <VisualState x:Name="TextEntryGridCollapsed" />
-                    <VisualState x:Name="TextEntryGridVisible" />
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ColorChannelTextInputVisibility">
-                    <VisualState x:Name="ColorChannelTextInputVisible" />
-                    <VisualState x:Name="ColorChannelTextInputCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="ChannelsListBoxItem.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="AlphaTextInputVisibility">
-                    <VisualState x:Name="AlphaTextInputVisible" />
-                    <VisualState x:Name="AlphaTextInputCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="ColorRepresentationSelected">
-                    <VisualState x:Name="RgbSelected" />
-                    <VisualState x:Name="HsvSelected">
-                        <VisualState.Setters>
-                            <Setter Target="Channel1TextBlock.Text"
-                                                Value="H" />
-                            <Setter Target="Channel2TextBlock.Text"
-                                                Value="S" />
-                            <Setter Target="Channel3TextBlock.Text"
-                                                Value="V" />
-                            <Setter Target="Channel1TextBox.(AutomationProperties.Name)"
-                                                Value="Hue Channel" />
-                            <Setter Target="Channel2TextBox.(AutomationProperties.Name)"
-                                                Value="Saturation Channel" />
-                            <Setter Target="Channel3TextBox.(AutomationProperties.Name)"
-                                                Value="Value Channel" />
-                            <Setter Target="Channel1Slider.(AutomationProperties.Name)"
-                                                Value="Hue Channel" />
-                            <Setter Target="Channel2Slider.(AutomationProperties.Name)"
-                                                Value="Saturation Channel" />
-                            <Setter Target="Channel3Slider.(AutomationProperties.Name)"
-                                                Value="Value Channel" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="HexInputVisibility">
-                    <VisualState x:Name="HexInputVisible" />
-                    <VisualState x:Name="HexInputCollapsed">
-                        <VisualState.Setters>
-                            <Setter Target="HexInputGrid.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-                <VisualStateGroup x:Name="AlphaEnabledState">
-                    <!-- Not currently supported -->
-                    <VisualState x:Name="AlphaDisabled">
-                        <VisualState.Setters>
-                            <Setter Target="ColorSpectrumAlphaSlider.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelBorder.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                            <Setter Target="AlphaChannelSlider.Visibility"
-                                                Value="Collapsed" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="AlphaEnabled" />
-                </VisualStateGroup>
-
-            </VisualStateManager.VisualStateGroups>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <!-- The whole background of the pivot header is changed here.
-                                        It's much easier to do this than customize the PivotHeaderItem template.
-                                        Remember PivotHeaderItem has a default height of 48px. -->
+            <!--
+                The whole background of the pivot header is changed here.
+                It's much easier to do this than customize the PivotHeaderItem template.
+                Remember PivotHeaderItem has a default height of 48px.
+            -->
             <Border Grid.Row="0"
-                    CornerRadius="4"
                     Height="48"
-                    Background="{ThemeResource SystemControlAcrylicElementBrush}"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"/>
+                    VerticalAlignment="Top"
+                    Background="{ThemeResource SystemControlAcrylicElementBrush}"
+                    CornerRadius="4" />
             <ListBox x:Name="ColorPanelSelector"
-                     Grid.Row="0" HorizontalAlignment="Center" Background="Transparent"
+                     Grid.Row="0"
+                     HorizontalAlignment="Center"
+                     Background="Transparent"
                      ItemContainerStyle="{StaticResource UnderlineListBoxItemStyle}">
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal"/>
+                        <StackPanel Orientation="Horizontal" />
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
-                <ListBoxItem x:Name="SpectrumListBoxItem" IsSelected="True"
-                             AutomationProperties.Name="Spectrum">
-                    <!-- TODO: Add These via x:Uid -->
+                <ListBoxItem x:Name="SpectrumListBoxItem"
+                             AutomationProperties.Name="Spectrum"
+                             IsSelected="True">
+                    <!--  TODO: Add These via x:Uid  -->
                     <FontIcon Glyph="&#xE76D;" />
                 </ListBoxItem>
                 <ListBoxItem x:Name="PaletteListBoxItem"
@@ -258,9 +90,9 @@
                     <FontIcon Glyph="&#xE9E9;" />
                 </ListBoxItem>
             </ListBox>
-            <controls:SwitchPresenter x:Name="ContentContainer" 
-                                Grid.Row="1"
-                                Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
+            <controls:SwitchPresenter x:Name="ContentContainer"
+                                      Grid.Row="1"
+                                      Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
                 <controls:Case Value="SpectrumListBoxItem">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -273,65 +105,66 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
-                                                                                    Grid.Column="0"
-                                                                                    Grid.Row="1"
-                                                                                    Grid.RowSpan="2"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Orientation="Vertical"
-                                                                                    Width="20"
-                                                                                    HorizontalAlignment="Center"
-                                                                                    VerticalAlignment="Stretch"
-                                                                                    Margin="0,0,12,0" />
-                        <!-- Keep in mind the spectrum is always HSV -->
-                        <!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
+                                                    Grid.Row="1"
+                                                    Grid.RowSpan="2"
+                                                    Grid.Column="0"
+                                                    Width="20"
+                                                    Margin="0,0,12,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Stretch"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                    Orientation="Vertical" />
+                        <!--  Keep in mind the spectrum is always HSV  -->
+                        <!--  This must also not be named 'ColorSpectrum' to differentiate from the base class  -->
                         <ColorSpectrum x:Name="ColorSpectrumControl"
-                                                                AutomationProperties.Name="Third Dimension"
-                                                                Grid.Column="1"
-                                                                Grid.Row="0"
-                                                                Grid.RowSpan="2"
-                                                                MinWidth="256" MinHeight="256"
-                                                                Components="{TemplateBinding ColorSpectrumComponents}"
-                                                                MinHue="{TemplateBinding MinHue}"
-                                                                MaxHue="{TemplateBinding MaxHue}"
-                                                                MinSaturation="{TemplateBinding MinSaturation}"
-                                                                MaxSaturation="{TemplateBinding MaxSaturation}"
-                                                                MinValue="{TemplateBinding MinValue}"
-                                                                MaxValue="{TemplateBinding MaxValue}"
-                                                                Shape="{TemplateBinding ColorSpectrumShape}"
-                                                                HorizontalAlignment="Stretch"
-                                                                VerticalAlignment="Stretch" />
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Grid.Column="1"
+                                       MinWidth="256"
+                                       MinHeight="256"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="Stretch"
+                                       AutomationProperties.Name="Third Dimension"
+                                       Components="{TemplateBinding ColorSpectrumComponents}"
+                                       MaxHue="{TemplateBinding MaxHue}"
+                                       MaxSaturation="{TemplateBinding MaxSaturation}"
+                                       MaxValue="{TemplateBinding MaxValue}"
+                                       MinHue="{TemplateBinding MinHue}"
+                                       MinSaturation="{TemplateBinding MinSaturation}"
+                                       MinValue="{TemplateBinding MinValue}"
+                                       Shape="{TemplateBinding ColorSpectrumShape}" />
                         <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
-                                                                                    AutomationProperties.Name="Alpha Channel"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="1"
-                                                                                    Grid.RowSpan="2"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Orientation="Vertical"
-                                                                                    Width="20"
-                                                                                    HorizontalAlignment="Center"
-                                                                                    VerticalAlignment="Stretch"
-                                                                                    Margin="12,0,0,0" />
+                                                    Grid.Row="1"
+                                                    Grid.RowSpan="2"
+                                                    Grid.Column="2"
+                                                    Width="20"
+                                                    Margin="12,0,0,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Stretch"
+                                                    AutomationProperties.Name="Alpha Channel"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
+                                                    Orientation="Vertical" />
                     </Grid>
                 </controls:Case>
                 <controls:Case Value="PaletteListBoxItem">
-                    <GridView SelectionMode="Single"
-                                  SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=TwoWay}"
-                                  ItemsSource="{TemplateBinding CustomPaletteColors}"
-                                  ItemContainerStyle="{StaticResource PaletteGridViewItemStyle}"
-                                  Margin="0"
-                                  Padding="0"
-                                  Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
+                    <GridView Margin="0"
+                              Padding="0"
+                              ItemContainerStyle="{StaticResource PaletteGridViewItemStyle}"
+                              ItemsSource="{TemplateBinding CustomPaletteColors}"
+                              SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=TwoWay}"
+                              SelectionMode="Single"
+                              Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
                         <GridView.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker" 
-                                                          Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}"/>
+                                <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
+                                                      Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}" />
                             </ItemsPanelTemplate>
                         </GridView.ItemsPanel>
                         <GridView.ItemTemplate>
                             <DataTemplate>
-                                <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}"
-                                                                HorizontalAlignment="Stretch"
-                                                                VerticalAlignment="Stretch">
+                                <Border HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayNameConverter}}">
                                     <Border.Background>
                                         <SolidColorBrush Color="{Binding}" />
                                     </Border.Background>
@@ -354,201 +187,201 @@
                             <RowDefinition Height="1*" />
                             <RowDefinition Height="1*" />
                             <RowDefinition Height="1*" />
-                            <!-- Note that there is an additional 12px added by the PivotItem -->
+                            <!--  Note that there is an additional 12px added by the PivotItem  -->
                             <RowDefinition Height="12" />
                         </Grid.RowDefinitions>
-                        <!-- Top color model & Hex input -->
-                        <Grid Grid.Column="0"
-                                                        Grid.ColumnSpan="3"
-                                                        Grid.Row="0">
+                        <!--  Top color model & Hex input  -->
+                        <Grid Grid.Row="0"
+                              Grid.Column="0"
+                              Grid.ColumnSpan="3">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="1*" />
                                 <ColumnDefinition Width="1*" />
                                 <ColumnDefinition Width="12" />
                                 <ColumnDefinition Width="2*" />
                             </Grid.ColumnDefinitions>
-                            <!-- Content RGB/HSV names are hard-coded in ColorPicker as well -->
-                            <!-- ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
+                            <!--  Content RGB/HSV names are hard-coded in ColorPicker as well  -->
+                            <!--  ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup'  -->
                             <ToggleButton x:Name="RgbToggleButton"
-                                                                    Grid.Column="0"
-                                                                    Content="RGB"
-                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                    BorderThickness="1"
-                                                                    Background="Transparent"
-                                                                    HorizontalAlignment="Stretch"
-                                                                    IsThreeState="False"
-                                                                    CornerRadius="2,0,0,2"/>
+                                          Grid.Column="0"
+                                          HorizontalAlignment="Stretch"
+                                          Background="Transparent"
+                                          BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                          BorderThickness="1"
+                                          Content="RGB"
+                                          CornerRadius="2,0,0,2"
+                                          IsThreeState="False" />
                             <ToggleButton x:Name="HsvToggleButton"
-                                                                    Grid.Column="1"
-                                                                    Content="HSV"
-                                                                    BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                    BorderThickness="1"
-                                                                    Background="Transparent"
-                                                                    HorizontalAlignment="Stretch"
-                                                                    IsThreeState="False"
-                                                                    CornerRadius="0,2,2,0" />
+                                          Grid.Column="1"
+                                          HorizontalAlignment="Stretch"
+                                          Background="Transparent"
+                                          BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
+                                          BorderThickness="1"
+                                          Content="HSV"
+                                          CornerRadius="0,2,2,0"
+                                          IsThreeState="False" />
                             <Grid x:Name="HexInputGrid"
-                                                            Grid.Column="3">
+                                  Grid.Column="3">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="30" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <Border Grid.Column="0"
-                                                                Height="32"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2">
-                                    <TextBlock Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                        FontWeight="SemiBold"
-                                                                        Text="#"
-                                                                        HorizontalAlignment="Center"
-                                                                        VerticalAlignment="Center" />
+                                        Height="32"
+                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                        BorderThickness="1,1,0,1"
+                                        CornerRadius="2,0,0,2">
+                                    <TextBlock HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               FontWeight="SemiBold"
+                                               Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                               Text="#" />
                                 </Border>
-                                <!-- Name must NOT match what is in ColorPicker 'HexTextBox' -->
+                                <!--  Name must NOT match what is in ColorPicker 'HexTextBox'  -->
                                 <TextBox x:Name="HexInputTextBox"
-                                                                    Style="{StaticResource InputTextBoxStyle}"
-                                                                    AutomationProperties.Name="Hexadecimal Color Input"
-                                                                    Height="32"
-                                                                    Grid.Column="1"
-                                                                    HorizontalAlignment="Stretch" />
+                                         Grid.Column="1"
+                                         Height="32"
+                                         HorizontalAlignment="Stretch"
+                                         AutomationProperties.Name="Hexadecimal Color Input"
+                                         Style="{StaticResource InputTextBoxStyle}" />
                             </Grid>
                         </Grid>
-                        <!-- Color channel editing controls -->
-                        <!-- Channel 1 RGB:Red HSV:Hue -->
-                        <Border Grid.Column="0"
-                                                        Grid.Row="2"
-                                                        Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
+                        <!--  Color channel editing controls  -->
+                        <!--  Channel 1 RGB:Red HSV:Hue  -->
+                        <Border Grid.Row="2"
+                                Grid.Column="0"
+                                Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                BorderThickness="1,1,0,1"
+                                CornerRadius="2,0,0,2">
                             <TextBlock x:Name="Channel1TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="R"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                       Text="R" />
                         </Border>
                         <TextBox x:Name="Channel1TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="2"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Red Channel"
-                                                            VerticalAlignment="Center" />
+                                 Grid.Row="2"
+                                 Grid.Column="1"
+                                 VerticalAlignment="Center"
+                                 AutomationProperties.Name="Red Channel"
+                                 Style="{StaticResource InputTextBoxStyle}" />
                         <controls:ColorPickerSlider x:Name="Channel1Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="2"
-                                                                                    AutomationProperties.Name="Red Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                        <!-- Channel 2 RGB:Green HSV:Saturation -->
-                        <Border Grid.Column="0"
-                                                        Grid.Row="3"
-                                                        Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
+                                                    Grid.Row="2"
+                                                    Grid.Column="2"
+                                                    Margin="12,0,0,0"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    AutomationProperties.Name="Red Channel"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                        <!--  Channel 2 RGB:Green HSV:Saturation  -->
+                        <Border Grid.Row="3"
+                                Grid.Column="0"
+                                Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                BorderThickness="1,1,0,1"
+                                CornerRadius="2,0,0,2">
                             <TextBlock x:Name="Channel2TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="G"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                       Text="G" />
                         </Border>
                         <TextBox x:Name="Channel2TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="3"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Green Channel"
-                                                            VerticalAlignment="Center" />
+                                 Grid.Row="3"
+                                 Grid.Column="1"
+                                 VerticalAlignment="Center"
+                                 AutomationProperties.Name="Green Channel"
+                                 Style="{StaticResource InputTextBoxStyle}" />
                         <controls:ColorPickerSlider x:Name="Channel2Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="3"
-                                                                                    AutomationProperties.Name="Green Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                        <!-- Channel 3 RGB:Blue HSV:Value -->
-                        <Border Grid.Column="0"
-                                                        Grid.Row="4"
-                                                        Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
+                                                    Grid.Row="3"
+                                                    Grid.Column="2"
+                                                    Margin="12,0,0,0"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    AutomationProperties.Name="Green Channel"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                        <!--  Channel 3 RGB:Blue HSV:Value  -->
+                        <Border Grid.Row="4"
+                                Grid.Column="0"
+                                Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                BorderThickness="1,1,0,1"
+                                CornerRadius="2,0,0,2">
                             <TextBlock x:Name="Channel3TextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="B"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                       Text="B" />
                         </Border>
                         <TextBox x:Name="Channel3TextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="4"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Blue Channel"
-                                                            VerticalAlignment="Center" />
+                                 Grid.Row="4"
+                                 Grid.Column="1"
+                                 VerticalAlignment="Center"
+                                 AutomationProperties.Name="Blue Channel"
+                                 Style="{StaticResource InputTextBoxStyle}" />
                         <controls:ColorPickerSlider x:Name="Channel3Slider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="4"
-                                                                                    AutomationProperties.Name="Blue Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
-                        <!-- Alpha channel -->
+                                                    Grid.Row="4"
+                                                    Grid.Column="2"
+                                                    Margin="12,0,0,0"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    AutomationProperties.Name="Blue Channel"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                        <!--  Alpha channel  -->
                         <Border x:Name="AlphaChannelBorder"
-                                                        Grid.Column="0"
-                                                        Grid.Row="5"
-                                                        Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
-                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                        BorderThickness="1,1,0,1"
-                                                        CornerRadius="2,0,0,2"
-                                                        VerticalAlignment="Center">
+                                Grid.Row="5"
+                                Grid.Column="0"
+                                Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
+                                BorderBrush="{ThemeResource TextControlBorderBrush}"
+                                BorderThickness="1,1,0,1"
+                                CornerRadius="2,0,0,2">
                             <TextBlock x:Name="AlphaChannelTextBlock"
-                                                                Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                FontWeight="SemiBold"
-                                                                Text="A"
-                                                                HorizontalAlignment="Center"
-                                                                VerticalAlignment="Center" />
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       FontWeight="SemiBold"
+                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
+                                       Text="A" />
                         </Border>
                         <TextBox x:Name="AlphaChannelTextBox"
-                                                            Grid.Column="1"
-                                                            Grid.Row="5"
-                                                            Style="{StaticResource InputTextBoxStyle}"
-                                                            AutomationProperties.Name="Alpha Channel"
-                                                            VerticalAlignment="Center" />
+                                 Grid.Row="5"
+                                 Grid.Column="1"
+                                 VerticalAlignment="Center"
+                                 AutomationProperties.Name="Alpha Channel"
+                                 Style="{StaticResource InputTextBoxStyle}" />
                         <controls:ColorPickerSlider x:Name="AlphaChannelSlider"
-                                                                                    Grid.Column="2"
-                                                                                    Grid.Row="5"
-                                                                                    AutomationProperties.Name="Alpha Channel"
-                                                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                    Margin="12,0,0,0"
-                                                                                    HorizontalAlignment="Stretch"
-                                                                                    VerticalAlignment="Center" />
+                                                    Grid.Row="5"
+                                                    Grid.Column="2"
+                                                    Margin="12,0,0,0"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    AutomationProperties.Name="Alpha Channel"
+                                                    BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                     </Grid>
                 </controls:Case>
             </controls:SwitchPresenter>
 
-            <!-- TODO: Expose resources for the height of this part and the margin -->
+            <!--  TODO: Expose resources for the height of this part and the margin  -->
             <Grid x:Name="ColorPreviewGrid"
                   Grid.Row="2"
                   Height="48"
                   Margin="12,0,12,12">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="4"/>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="4"/>
+                    <RowDefinition Height="4" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="4" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
@@ -557,78 +390,80 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <!-- Left-side Preview Darker Shades -->
+                <!--  Left-side Preview Darker Shades  -->
                 <Border x:Name="CheckeredBackground2Border"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch" />
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" />
                 <Border x:Name="N2PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            VerticalAlignment="Stretch"
-                                            CornerRadius="2,0,0,2">
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        VerticalAlignment="Stretch"
+                        CornerRadius="2,0,0,2">
                     <Border.Background>
                         <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='-2'}" />
                     </Border.Background>
                 </Border>
-                <!-- The -1 and +1 accent preview originally had a drop shadow as well.
-                                            However, due to Z-order issues with the checkered background,
-                                            shadow and preview border, it would have required it's own
-                                            checkered background. This was judged not worth the performance 
-                                            trade-off so shadows were removed. -->
+                <!--
+                    The -1 and +1 accent preview originally had a drop shadow as well.
+                    However, due to Z-order issues with the checkered background,
+                    shadow and preview border, it would have required it's own
+                    checkered background. This was judged not worth the performance
+                    trade-off so shadows were removed.
+                -->
                 <Border x:Name="N1PreviewBorder"
-                                                Grid.Row="1"
-                                                Grid.Column="1">
+                        Grid.Row="1"
+                        Grid.Column="1">
                     <Border.Background>
                         <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='-1'}" />
                     </Border.Background>
                 </Border>
-                <!-- Right-side Preview Lighter Shades -->
+                <!--  Right-side Preview Lighter Shades  -->
                 <Border x:Name="CheckeredBackground4Border"
-                                                Grid.Row="1"
-                                                Grid.Column="3"
-                                                Grid.ColumnSpan="2"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch" />
+                        Grid.Row="1"
+                        Grid.Column="3"
+                        Grid.ColumnSpan="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" />
                 <Border x:Name="P1PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="3">
+                        Grid.Row="1"
+                        Grid.Column="3">
                     <Border.Background>
                         <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='1'}" />
                     </Border.Background>
                 </Border>
                 <Border x:Name="P2PreviewBorder"
-                                            Grid.Row="1"
-                                            Grid.Column="4"
-                                            CornerRadius="0,2,2,0">
+                        Grid.Row="1"
+                        Grid.Column="4"
+                        CornerRadius="0,2,2,0">
                     <Border.Background>
                         <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShadeConverter}, ConverterParameter='2'}" />
                     </Border.Background>
                 </Border>
-                <!-- Main Color Preview Box at Bottom -->
-                <!-- Must be last for drop shadow Z-index -->
+                <!--  Main Color Preview Box at Bottom  -->
+                <!--  Must be last for drop shadow Z-index  -->
                 <controls:DropShadowPanel Grid.RowSpan="3"
                                           Grid.Column="2"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Stretch"
                                           BlurRadius="10.0"
-                                          ShadowOpacity="0.75"
                                           OffsetX="0.0"
                                           OffsetY="0.0"
-                                          Color="Black"
-                                          HorizontalContentAlignment="Stretch"
-                                          VerticalContentAlignment="Stretch">
+                                          ShadowOpacity="0.75"
+                                          Color="Black">
                     <Grid>
-                        <Border Background="{ThemeResource FlyoutPresenterBackground}"
-                                                    CornerRadius="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch" />
+                        <Border HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{ThemeResource FlyoutPresenterBackground}"
+                                CornerRadius="2" />
                         <Border x:Name="CheckeredBackground3Border"
-                                                    CornerRadius="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch" />
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="2" />
                         <Border x:Name="PreviewBorder"
-                                                    CornerRadius="2">
+                                CornerRadius="2">
                             <Border.Background>
                                 <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
                             </Border.Background>
@@ -636,102 +471,185 @@
                     </Grid>
                 </controls:DropShadowPanel>
             </Grid>
+            <VisualStateManager.VisualStateGroups>
+
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background" Value="{ThemeResource ButtonBackgroundDisabled}" />
+                            <Setter Target="RootButton.BorderBrush" Value="{ThemeResource ButtonBorderBrushDisabled}" />
+                            <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="PointerOver">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background" Value="{ThemeResource ButtonBackgroundPointerOver}" />
+                            <Setter Target="RootButton.BorderBrush" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
+                            <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ButtonForegroundPointerOver}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Pressed">
+                        <VisualState.Setters>
+                            <Setter Target="RootButton.Background" Value="{ThemeResource ButtonBackgroundPressed}" />
+                            <Setter Target="RootButton.BorderBrush" Value="{ThemeResource ButtonBorderBrushPressed}" />
+                            <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ButtonForegroundPressed}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorSpectrumVisibility">
+                    <VisualState x:Name="ColorSpectrumVisible" />
+                    <VisualState x:Name="ColorSpectrumCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="SpectrumListBoxItem.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorPaletteVisibility">
+                    <VisualState x:Name="ColorPaletteVisible" />
+                    <VisualState x:Name="ColorPaletteCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="PaletteListBoxItem.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorPreviewVisibility">
+                    <VisualState x:Name="ColorPreviewVisible" />
+                    <VisualState x:Name="ColorPreviewCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorPreviewGrid.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="PreviousColorVisibility">
+                    <!--  Previous color is not currently supported  -->
+                    <VisualState x:Name="PreviousColorCollapsedVertical" />
+                    <VisualState x:Name="PreviousColorVisibleVertical" />
+                    <VisualState x:Name="PreviousColorCollapsedHorizontal" />
+                    <VisualState x:Name="PreviousColorVisibleHorizontal" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ThirdDimensionSliderVisibility">
+                    <VisualState x:Name="ThirdDimensionSliderVisible" />
+                    <VisualState x:Name="ThirdDimensionSliderCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumThirdDimensionSlider.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaSliderVisibility">
+                    <VisualState x:Name="AlphaSliderVisible" />
+                    <VisualState x:Name="AlphaSliderCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumAlphaSlider.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelBorder.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelTextBox.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelSlider.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="MoreButtonVisibility">
+                    <!--  More button isn't supported  -->
+                    <VisualState x:Name="MoreButtonVisible" />
+                    <VisualState x:Name="MoreButtonCollapsed" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="TextEntryGridVisibility">
+                    <!--  Text entry grid is not currently supported  -->
+                    <VisualState x:Name="TextEntryGridCollapsed" />
+                    <VisualState x:Name="TextEntryGridVisible" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorChannelTextInputVisibility">
+                    <VisualState x:Name="ColorChannelTextInputVisible" />
+                    <VisualState x:Name="ColorChannelTextInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="ChannelsListBoxItem.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaTextInputVisibility">
+                    <VisualState x:Name="AlphaTextInputVisible" />
+                    <VisualState x:Name="AlphaTextInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="AlphaChannelTextBox.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ColorRepresentationSelected">
+                    <VisualState x:Name="RgbSelected" />
+                    <VisualState x:Name="HsvSelected">
+                        <VisualState.Setters>
+                            <Setter Target="Channel1TextBlock.Text" Value="H" />
+                            <Setter Target="Channel2TextBlock.Text" Value="S" />
+                            <Setter Target="Channel3TextBlock.Text" Value="V" />
+                            <Setter Target="Channel1TextBox.(AutomationProperties.Name)" Value="Hue Channel" />
+                            <Setter Target="Channel2TextBox.(AutomationProperties.Name)" Value="Saturation Channel" />
+                            <Setter Target="Channel3TextBox.(AutomationProperties.Name)" Value="Value Channel" />
+                            <Setter Target="Channel1Slider.(AutomationProperties.Name)" Value="Hue Channel" />
+                            <Setter Target="Channel2Slider.(AutomationProperties.Name)" Value="Saturation Channel" />
+                            <Setter Target="Channel3Slider.(AutomationProperties.Name)" Value="Value Channel" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="HexInputVisibility">
+                    <VisualState x:Name="HexInputVisible" />
+                    <VisualState x:Name="HexInputCollapsed">
+                        <VisualState.Setters>
+                            <Setter Target="HexInputGrid.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="AlphaEnabledState">
+                    <!--  Not currently supported  -->
+                    <VisualState x:Name="AlphaDisabled">
+                        <VisualState.Setters>
+                            <Setter Target="ColorSpectrumAlphaSlider.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelBorder.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelTextBox.Visibility" Value="Collapsed" />
+                            <Setter Target="AlphaChannelSlider.Visibility" Value="Collapsed" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="AlphaEnabled" />
+                </VisualStateGroup>
+
+            </VisualStateManager.VisualStateGroups>
         </Grid>
     </ControlTemplate>
 
-    <!-- TODO: Pull into separate file? -->
-    <Style TargetType="controls:ColorPickerSlider" BasedOn="{StaticResource ColorPickerSliderStyle}"/>
+    <!--  TODO: Pull into separate file?  -->
+    <Style BasedOn="{StaticResource ColorPickerSliderStyle}"
+           TargetType="controls:ColorPickerSlider" />
 
-    <Style x:Key="ColorPickerSliderStyle" TargetType="controls:ColorPickerSlider">
-        <Setter Property="VerticalAlignment"
-                                        Value="Center" />
-        <Setter Property="IsThumbToolTipEnabled"
-                                        Value="False" />
+    <Style x:Key="ColorPickerSliderStyle"
+           TargetType="controls:ColorPickerSlider">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="IsThumbToolTipEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <!-- Based on WinUI version 2.4.2 -->
+                <!--  Based on WinUI version 2.4.2  -->
                 <ControlTemplate TargetType="controls:ColorPickerSlider">
                     <Grid Margin="{TemplateBinding Padding}">
                         <Grid.Resources>
-                            <Style TargetType="Thumb"
-                                                           x:Key="SliderThumbStyle">
-                                <Setter Property="BorderThickness"
-                                                                Value="3" />
-                                <Setter Property="Background"
-                                                                Value="Transparent" />
+                            <Style x:Key="SliderThumbStyle"
+                                   TargetType="Thumb">
+                                <Setter Property="BorderThickness" Value="3" />
+                                <Setter Property="Background" Value="Transparent" />
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Thumb">
                                             <Border Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="{ThemeResource SliderThumbCornerRadius}" />
                                         </ControlTemplate>
                                     </Setter.Value>
                                 </Setter>
                             </Style>
                         </Grid.Resources>
 
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-
-                                <!-- The Pressed state is purposely the same as normal.
-                                                             This ensures that the thumb always has the correct contrast with 
-                                                             the selected color underneath it when dragging or moving. -->
-                                <VisualState x:Name="Pressed" />
-
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                        <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundDisabled}" />
-                                        <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundDisabled}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                                <VisualState x:Name="PointerOver">
-                                    <VisualState.Setters>
-                                        <Setter Target="HorizontalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                        <Setter Target="VerticalThumb.BorderBrush"
-                                                                        Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
-                                        <Setter Target="SliderContainer.Background"
-                                                                        Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusEngagementStates">
-                                <VisualState x:Name="FocusDisengaged" />
-                                <VisualState x:Name="FocusEngagedHorizontal">
-                                    <VisualState.Setters>
-                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                        <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="FocusEngagedVertical">
-                                    <VisualState.Setters>
-                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)"
-                                                                        Value="False" />
-                                        <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)"
-                                                                        Value="True" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-
                         <Grid x:Name="SliderContainer"
-                                                      Background="{ThemeResource SliderContainerBackground}"
-                                                      Control.IsTemplateFocusTarget="True">
+                              Background="{ThemeResource SliderContainerBackground}"
+                              Control.IsTemplateFocusTarget="True">
                             <Grid x:Name="HorizontalTemplate"
-                                                          MinHeight="20">
+                                  MinHeight="20">
 
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
@@ -746,33 +664,33 @@
                                 </Grid.RowDefinitions>
 
                                 <Rectangle x:Name="HorizontalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Height="20"
-                                                                   Grid.Row="1"
-                                                                   Grid.ColumnSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
+                                           Grid.Row="1"
+                                           Grid.ColumnSpan="3"
+                                           Height="20"
+                                           Fill="{TemplateBinding Background}"
+                                           RadiusX="10"
+                                           RadiusY="10" />
                                 <Rectangle x:Name="HorizontalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Row="1"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
+                                           Grid.Row="1"
+                                           Fill="Transparent"
+                                           RadiusX="8"
+                                           RadiusY="8" />
                                 <Thumb x:Name="HorizontalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               CornerRadius="10"
-                                                               Grid.Row="0"
-                                                               Grid.RowSpan="3"
-                                                               Grid.Column="1"
-                                                               FocusVisualMargin="-14,-6,-14,-6"
-                                                               AutomationProperties.AccessibilityView="Raw" />
+                                       Grid.Row="0"
+                                       Grid.RowSpan="3"
+                                       Grid.Column="1"
+                                       Width="20"
+                                       Height="20"
+                                       AutomationProperties.AccessibilityView="Raw"
+                                       BorderBrush="{TemplateBinding BorderBrush}"
+                                       CornerRadius="10"
+                                       DataContext="{TemplateBinding Value}"
+                                       FocusVisualMargin="-14,-6,-14,-6"
+                                       Style="{StaticResource SliderThumbStyle}" />
                             </Grid>
                             <Grid x:Name="VerticalTemplate"
-                                                          MinWidth="20"
-                                                          Visibility="Collapsed">
+                                  MinWidth="20"
+                                  Visibility="Collapsed">
 
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*" />
@@ -787,84 +705,175 @@
                                 </Grid.ColumnDefinitions>
 
                                 <Rectangle x:Name="VerticalTrackRect"
-                                                                   Fill="{TemplateBinding Background}"
-                                                                   Width="20"
-                                                                   Grid.Column="1"
-                                                                   Grid.RowSpan="3"
-                                                                   RadiusX="10"
-                                                                   RadiusY="10" />
+                                           Grid.RowSpan="3"
+                                           Grid.Column="1"
+                                           Width="20"
+                                           Fill="{TemplateBinding Background}"
+                                           RadiusX="10"
+                                           RadiusY="10" />
                                 <Rectangle x:Name="VerticalDecreaseRect"
-                                                                   Fill="Transparent"
-                                                                   Grid.Column="1"
-                                                                   Grid.Row="2"
-                                                                   RadiusX="8"
-                                                                   RadiusY="8" />
+                                           Grid.Row="2"
+                                           Grid.Column="1"
+                                           Fill="Transparent"
+                                           RadiusX="8"
+                                           RadiusY="8" />
                                 <Thumb x:Name="VerticalThumb"
-                                                               Style="{StaticResource SliderThumbStyle}"
-                                                               DataContext="{TemplateBinding Value}"
-                                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                                               Height="20"
-                                                               Width="20"
-                                                               CornerRadius="10"
-                                                               Grid.Row="1"
-                                                               Grid.Column="0"
-                                                               Grid.ColumnSpan="3"
-                                                               FocusVisualMargin="-6,-14,-6,-14"
-                                                               AutomationProperties.AccessibilityView="Raw" />
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Grid.ColumnSpan="3"
+                                       Width="20"
+                                       Height="20"
+                                       AutomationProperties.AccessibilityView="Raw"
+                                       BorderBrush="{TemplateBinding BorderBrush}"
+                                       CornerRadius="10"
+                                       DataContext="{TemplateBinding Value}"
+                                       FocusVisualMargin="-6,-14,-6,-14"
+                                       Style="{StaticResource SliderThumbStyle}" />
                             </Grid>
                         </Grid>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+
+                                <!--
+                                    The Pressed state is purposely the same as normal.
+                                    This ensures that the thumb always has the correct contrast with
+                                    the selected color underneath it when dragging or moving.
+                                -->
+                                <VisualState x:Name="Pressed" />
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush" Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="VerticalThumb.BorderBrush" Value="{ThemeResource SliderThumbBackgroundDisabled}" />
+                                        <Setter Target="SliderContainer.Background" Value="{ThemeResource SliderContainerBackgroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="HorizontalThumb.BorderBrush" Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="VerticalThumb.BorderBrush" Value="{ThemeResource SliderThumbBackgroundPointerOver}" />
+                                        <Setter Target="SliderContainer.Background" Value="{ThemeResource SliderContainerBackgroundPointerOver}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusEngagementStates">
+                                <VisualState x:Name="FocusDisengaged" />
+                                <VisualState x:Name="FocusEngagedHorizontal">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)" Value="False" />
+                                        <Setter Target="HorizontalThumb.(Control.IsTemplateFocusTarget)" Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="FocusEngagedVertical">
+                                    <VisualState.Setters>
+                                        <Setter Target="SliderContainer.(Control.IsTemplateFocusTarget)" Value="False" />
+                                        <Setter Target="VerticalThumb.(Control.IsTemplateFocusTarget)" Value="True" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="PaletteGridViewItemStyle" TargetType="GridViewItem">
-        <Setter Property="FontFamily"
-                                                                Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize"
-                                                                Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="Background"
-                                                                Value="Transparent" />
-        <Setter Property="Foreground"
-                                                                Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-        <Setter Property="TabNavigation"
-                                                                Value="Local" />
-        <Setter Property="IsHoldingEnabled"
-                                                                Value="True" />
-        <Setter Property="HorizontalContentAlignment"
-                                                                Value="Stretch" />
-        <Setter Property="VerticalContentAlignment"
-                                                                Value="Stretch" />
-        <Setter Property="Margin"
-                                                                Value="0" />
-        <Setter Property="Padding"
-                                                                Value="0" />
-        <Setter Property="MinWidth"
-                                                                Value="10" />
-        <Setter Property="MinHeight"
-                                                                Value="10" />
-        <Setter Property="AllowDrop"
-                                                                Value="False" />
-        <Setter Property="UseSystemFocusVisuals"
-                                                                Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin"
-                                                                Value="-2" />
+    <Style x:Key="PaletteGridViewItemStyle"
+           TargetType="GridViewItem">
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="IsHoldingEnabled" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="MinWidth" Value="10" />
+        <Setter Property="MinHeight" Value="10" />
+        <Setter Property="AllowDrop" Value="False" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewItem">
                     <Grid x:Name="ContentBorder"
-                                                                            Control.IsTemplateFocusTarget="True"
-                                                                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                                                                            Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{TemplateBinding CornerRadius}"
-                                                                            RenderTransformOrigin="0.5,0.5">
-
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Control.IsTemplateFocusTarget="True"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+                          RenderTransformOrigin="0.5,0.5">
                         <Grid.RenderTransform>
                             <ScaleTransform x:Name="ContentBorderScale" />
                         </Grid.RenderTransform>
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <!--
+                            The 'Xg' text simulates the amount of space one line of text will occupy.
+                            In the DataPlaceholder state, the Content is not loaded yet so we
+                            approximate the size of the item using placeholder text.
+                        -->
+                        <TextBlock x:Name="PlaceholderTextBlock"
+                                   Margin="{TemplateBinding Padding}"
+                                   AutomationProperties.AccessibilityView="Raw"
+                                   Foreground="{x:Null}"
+                                   IsHitTestVisible="False"
+                                   Text="Xg"
+                                   Visibility="Collapsed" />
+                        <Rectangle x:Name="PlaceholderRect"
+                                   Fill="{ThemeResource ListViewItemPlaceholderBackground}"
+                                   Visibility="Collapsed" />
+                        <Rectangle x:Name="BorderRectangle"
+                                   IsHitTestVisible="False"
+                                   Opacity="0"
+                                   Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
+                                   StrokeThickness="2" />
+                        <Border x:Name="MultiSelectSquare"
+                                Width="20"
+                                Height="20"
+                                Margin="0,2,2,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
+                                Visibility="Collapsed">
+                            <FontIcon x:Name="MultiSelectCheck"
+                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      FontSize="16"
+                                      Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
+                                      Glyph="&#xE73E;"
+                                      Opacity="0" />
+                        </Border>
+                        <Border x:Name="MultiArrangeOverlayTextBorder"
+                                Height="20"
+                                MinWidth="20"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource SystemControlBackgroundAccentBrush}"
+                                BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}"
+                                BorderThickness="2"
+                                IsHitTestVisible="False"
+                                Opacity="0">
+                            <TextBlock x:Name="MultiArrangeOverlayText"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       AutomationProperties.AccessibilityView="Raw"
+                                       IsHitTestVisible="False"
+                                       Opacity="0"
+                                       Style="{ThemeResource CaptionTextBlockStyle}"
+                                       Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}" />
+                        </Border>
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="FocusStates">
@@ -872,9 +881,9 @@
 
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                       Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Collapsed" />
+                                                                    Value="Collapsed" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -893,28 +902,28 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                       Storyboard.TargetProperty="Stroke">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryThickness">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
+                                                                    Value="2" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
                                     </Storyboard>
@@ -924,28 +933,28 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                       Storyboard.TargetProperty="Stroke">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryThickness">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
+                                                                    Value="2" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerDownThemeAnimation TargetName="ContentPresenter" />
                                     </Storyboard>
@@ -955,37 +964,37 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                       Storyboard.TargetProperty="Stroke">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryThickness">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
+                                                                    Value="2" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
                                     </Storyboard>
@@ -995,37 +1004,37 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                       Storyboard.TargetProperty="Stroke">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryThickness">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
+                                                                    Value="2" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
+                                                                    Value="{Binding Converter={StaticResource ContrastBrushConverter}, ConverterParameter={ThemeResource TextControlForeground}}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
                                     </Storyboard>
@@ -1035,37 +1044,37 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                        Storyboard.TargetProperty="Stroke">
+                                                                       Storyboard.TargetProperty="Stroke">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                        Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryBrush">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                        Storyboard.TargetProperty="FocusVisualSecondaryThickness">
+                                                                       Storyboard.TargetProperty="FocusVisualSecondaryThickness">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="2" />
+                                                                    Value="2" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightAccentBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerDownThemeAnimation TargetName="ContentPresenter" />
                                     </Storyboard>
@@ -1080,9 +1089,9 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemDisabledThemeOpacity}"
+                                                         Duration="0" />
                                     </Storyboard>
                                 </VisualState>
 
@@ -1093,11 +1102,11 @@
 
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                       Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
+                                                                    Value="Visible" />
                                             <DiscreteObjectKeyFrame KeyTime="0:0:0.333"
-                                                                                                                    Value="Collapsed" />
+                                                                    Value="Collapsed" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <FadeOutThemeAnimation TargetName="MultiSelectSquare" />
                                     </Storyboard>
@@ -1107,9 +1116,9 @@
 
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                       Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
+                                                                    Value="Visible" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <FadeInThemeAnimation TargetName="MultiSelectSquare" />
                                     </Storyboard>
@@ -1124,14 +1133,14 @@
 
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                       Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
+                                                                    Value="Visible" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
-                                                                                                                        Storyboard.TargetProperty="Visibility">
+                                                                       Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                    Value="Visible" />
+                                                                    Value="Visible" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -1144,42 +1153,42 @@
                                 <VisualState x:Name="BottomReorderHint">
 
                                     <Storyboard>
-                                        <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Bottom" />
+                                        <DragOverThemeAnimation Direction="Bottom"
+                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                TargetName="ContentBorder" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="TopReorderHint">
 
                                     <Storyboard>
-                                        <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Top" />
+                                        <DragOverThemeAnimation Direction="Top"
+                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                TargetName="ContentBorder" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="RightReorderHint">
 
                                     <Storyboard>
-                                        <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Right" />
+                                        <DragOverThemeAnimation Direction="Right"
+                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                TargetName="ContentBorder" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="LeftReorderHint">
 
                                     <Storyboard>
-                                        <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                Direction="Left" />
+                                        <DragOverThemeAnimation Direction="Left"
+                                                                ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
+                                                                TargetName="ContentBorder" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition To="NoReorderHint"
-                                                                                                        GeneratedDuration="0:0:0.2" />
+                                    <VisualTransition GeneratedDuration="0:0:0.2"
+                                                      To="NoReorderHint" />
                                 </VisualStateGroup.Transitions>
 
                             </VisualStateGroup>
@@ -1191,9 +1200,9 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemDragThemeOpacity}"
+                                                         Duration="0" />
                                         <DragItemThemeAnimation TargetName="ContentBorder" />
                                     </Storyboard>
                                 </VisualState>
@@ -1203,28 +1212,30 @@
                                 <VisualState x:Name="MultipleDraggingPrimary">
 
                                     <Storyboard>
-                                        <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                on the same elements animate an internal Opacity. -->
+                                        <!--
+                                            These two Opacity animations are required - the FadeInThemeAnimations
+                                            on the same elements animate an internal Opacity.
+                                        -->
                                         <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemDragThemeOpacity}"
+                                                         Duration="0" />
                                         <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
                                         <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
                                         <DragItemThemeAnimation TargetName="ContentBorder" />
@@ -1239,9 +1250,9 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemReorderThemeOpacity}"
+                                                         Duration="0:0:0.240" />
                                     </Storyboard>
                                 </VisualState>
 
@@ -1249,45 +1260,47 @@
 
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemReorderTargetThemeOpacity}"
+                                                         Duration="0:0:0.240" />
                                         <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                            Storyboard.TargetProperty="ScaleX"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                                         Storyboard.TargetProperty="ScaleX"
+                                                         To="{ThemeResource ListViewItemReorderTargetThemeScale}"
+                                                         Duration="0:0:0.240" />
                                         <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                            Storyboard.TargetProperty="ScaleY"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
+                                                         Storyboard.TargetProperty="ScaleY"
+                                                         To="{ThemeResource ListViewItemReorderTargetThemeScale}"
+                                                         Duration="0:0:0.240" />
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="MultipleReorderingPrimary">
 
                                     <Storyboard>
-                                        <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                on the same elements animate an internal Opacity. -->
+                                        <!--
+                                            These two Opacity animations are required - the FadeInThemeAnimations
+                                            on the same elements animate an internal Opacity.
+                                        -->
                                         <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="1" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0"
-                                                                                                            To="0" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"
+                                                         Duration="0" />
                                         <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                            Storyboard.TargetProperty="Opacity"
-                                                                                                            Duration="0:0:0.240"
-                                                                                                            To="{ThemeResource ListViewItemDragThemeOpacity}" />
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="{ThemeResource ListViewItemDragThemeOpacity}"
+                                                         Duration="0:0:0.240" />
                                         <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
                                         <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
                                     </Storyboard>
@@ -1308,71 +1321,13 @@
                                 </VisualState>
 
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition To="NotDragging"
-                                                                                                        GeneratedDuration="0:0:0.2" />
+                                    <VisualTransition GeneratedDuration="0:0:0.2"
+                                                      To="NotDragging" />
                                 </VisualStateGroup.Transitions>
 
                             </VisualStateGroup>
 
                         </VisualStateManager.VisualStateGroups>
-                        <ContentPresenter x:Name="ContentPresenter"
-                                                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                                            Margin="{TemplateBinding Padding}" />
-                        <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
-                                                                                In the DataPlaceholder state, the Content is not loaded yet so we
-                                                                                approximate the size of the item using placeholder text. -->
-                        <TextBlock x:Name="PlaceholderTextBlock"
-                                                                                    Visibility="Collapsed"
-                                                                                    Text="Xg"
-                                                                                    Foreground="{x:Null}"
-                                                                                    Margin="{TemplateBinding Padding}"
-                                                                                    IsHitTestVisible="False"
-                                                                                    AutomationProperties.AccessibilityView="Raw" />
-                        <Rectangle x:Name="PlaceholderRect"
-                                                                                    Visibility="Collapsed"
-                                                                                    Fill="{ThemeResource ListViewItemPlaceholderBackground}" />
-                        <Rectangle x:Name="BorderRectangle"
-                                                                                    IsHitTestVisible="False"
-                                                                                    Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
-                                                                                    StrokeThickness="2"
-                                                                                    Opacity="0" />
-                        <Border x:Name="MultiSelectSquare"
-                                                                                Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
-                                                                                Width="20"
-                                                                                Height="20"
-                                                                                Margin="0,2,2,0"
-                                                                                VerticalAlignment="Top"
-                                                                                HorizontalAlignment="Right"
-                                                                                Visibility="Collapsed">
-                            <FontIcon x:Name="MultiSelectCheck"
-                                                                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                                                        Glyph="&#xE73E;"
-                                                                                        FontSize="16"
-                                                                                        Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
-                                                                                        Opacity="0" />
-                        </Border>
-                        <Border x:Name="MultiArrangeOverlayTextBorder"
-                                                                                Opacity="0"
-                                                                                IsHitTestVisible="False"
-                                                                                MinWidth="20"
-                                                                                Height="20"
-                                                                                VerticalAlignment="Center"
-                                                                                HorizontalAlignment="Center"
-                                                                                Background="{ThemeResource SystemControlBackgroundAccentBrush}"
-                                                                                BorderThickness="2"
-                                                                                BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}">
-                            <TextBlock x:Name="MultiArrangeOverlayText"
-                                                                                        Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
-                                                                                        Style="{ThemeResource CaptionTextBlockStyle}"
-                                                                                        IsHitTestVisible="False"
-                                                                                        Opacity="0"
-                                                                                        VerticalAlignment="Center"
-                                                                                        HorizontalAlignment="Center"
-                                                                                        AutomationProperties.AccessibilityView="Raw" />
-                        </Border>
-
                     </Grid>
 
                 </ControlTemplate>
@@ -1380,7 +1335,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="UnderlineListBoxItemStyle" TargetType="ListBoxItem">
+    <Style x:Key="UnderlineListBoxItemStyle"
+           TargetType="ListBoxItem">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="TabNavigation" Value="Local" />
         <Setter Property="Padding" Value="{StaticResource ListBoxItemPadding}" />
@@ -1388,16 +1344,19 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="8,0,8,0" />
         <Setter Property="Padding" Value="24,0,24,0" />
-        <Setter Property="MinWidth" Value="108"/>
+        <Setter Property="MinWidth" Value="108" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="Template" Value="{StaticResource UnderlineListBoxItemTemplate}"/>
+        <Setter Property="Template" Value="{StaticResource UnderlineListBoxItemTemplate}" />
     </Style>
 
-    <ControlTemplate x:Key="UnderlineListBoxItemTemplate" TargetType="ListBoxItem">
-        <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-
+    <ControlTemplate x:Key="UnderlineListBoxItemTemplate"
+                     TargetType="ListBoxItem">
+        <Grid x:Name="LayoutRoot"
+              Background="{TemplateBinding Background}"
+              BorderThickness="{TemplateBinding BorderThickness}">
             <Grid.Resources>
-                <Style x:Key="BaseContentPresenterStyle" TargetType="ContentPresenter">
+                <Style x:Key="BaseContentPresenterStyle"
+                       TargetType="ContentPresenter">
                     <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
                     <Setter Property="FontWeight" Value="SemiBold" />
                     <Setter Property="TextWrapping" Value="Wrap" />
@@ -1405,10 +1364,29 @@
                     <Setter Property="TextLineBounds" Value="Full" />
                     <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
                 </Style>
-                <Style x:Key="BodyContentPresenterStyle" TargetType="ContentPresenter" BasedOn="{StaticResource BaseContentPresenterStyle}">
+                <Style x:Key="BodyContentPresenterStyle"
+                       BasedOn="{StaticResource BaseContentPresenterStyle}"
+                       TargetType="ContentPresenter">
                     <Setter Property="FontWeight" Value="Normal" />
                 </Style>
             </Grid.Resources>
+            <Rectangle x:Name="PressedBackground"
+                       Height="2"
+                       Margin="4,0,4,2"
+                       VerticalAlignment="Bottom"
+                       Control.IsTemplateFocusTarget="True"
+                       Fill="Transparent"
+                       RadiusX="1"
+                       RadiusY="1" />
+            <ContentPresenter x:Name="ContentPresenter"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                              Style="{StaticResource BodyContentPresenterStyle}"
+                              TextWrapping="NoWrap" />
 
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroup x:Name="CommonStates">
@@ -1417,8 +1395,10 @@
                     <VisualState x:Name="Disabled">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
@@ -1426,11 +1406,15 @@
                     <VisualState x:Name="PointerOver">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListLowBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListLowBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
@@ -1438,11 +1422,15 @@
                     <VisualState x:Name="Pressed">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
@@ -1450,44 +1438,60 @@
                     <VisualState x:Name="Selected">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                     <VisualState x:Name="SelectedUnfocused">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListAccentLowBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                     <VisualState x:Name="SelectedPointerOver">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentMediumBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListAccentMediumBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                     <VisualState x:Name="SelectedPressed">
 
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground" Storyboard.TargetProperty="Fill">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedBackground"
+                                                           Storyboard.TargetProperty="Fill">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
@@ -1495,23 +1499,6 @@
                 </VisualStateGroup>
 
             </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="PressedBackground"
-                                       Fill="Transparent"
-                                       Control.IsTemplateFocusTarget="True"
-                                       Margin="4,0,4,2"
-                                       Height="2"
-                                       RadiusX="1" RadiusY="1"
-                                       VerticalAlignment="Bottom" />
-            <ContentPresenter x:Name="ContentPresenter"
-                                Content="{TemplateBinding Content}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Style="{StaticResource BodyContentPresenterStyle}"
-                                TextWrapping="NoWrap"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Margin="{TemplateBinding Padding}" />
-
         </Grid>
 
     </ControlTemplate>

From 1758a358fbf7ad43a1f82fbc2c6265bd316174ec Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 23 Oct 2020 14:40:24 -0700
Subject: [PATCH 591/595] Fix extra unneeded file references in csproj for
 Controls

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index b71a1cb9ac9..294ac153355 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -11,6 +11,7 @@
         - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
         - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
         - Carousel: Presents items in a carousel control.
+        - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
         - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
         - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
         - Expander: Expander allows user to show/hide content based on a boolean state.
@@ -44,16 +45,6 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="ColorPicker\ColorPicker - Copy.xaml" />
-    <None Remove="ColorPicker\ColorPickerButton.xaml" />
-    <None Remove="ColorPicker\ColorPickerButtonm.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Remove="ColorPicker\ColorPickerButton.xaml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
@@ -67,40 +58,13 @@
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
- 
-  <ItemGroup>
-    <Page Update="ColorPicker\ColorPicker - Copy.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="ImageCropper\ImageCropper.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="ImageCropper\ImageCropperThumb.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-   
-  <ItemGroup>
-     <Page Update="RemoteDevicePicker\RemoteDevicePicker.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-     <Page Update="TokenizingTextBox\TokenizingTextBox.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </Page>
-     <Page Update="TokenizingTextBox\TokenizingTextBoxItem.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </Page>
-  </ItemGroup>
-  
 
   <ItemGroup>
     <PRIResource Include="Strings\en-us\Resources.resw" />
   </ItemGroup>
-  
 
   <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 
-
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
   <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
     <ItemGroup>

From ea75c8a11ff24c9c78b0d4ef0d29964e6d77d44b Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:38:44 -0700
Subject: [PATCH 592/595] Add in ColorPickerButton again to Codebase

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |    8 +
 .../ColorPicker/ColorPickerButtonPage.xaml    |   12 +-
 .../ColorPicker/ColorPickerButtonXaml.bind    |   73 +-
 .../SamplePages/samples.json                  |   26 +-
 .../ColorPicker/ColorPicker.xaml              |    3 +-
 .../ColorPicker/ColorPickerButton.cs          |  130 ++
 .../ColorPicker/ColorPickerButton.xaml        | 1435 ++---------------
 .../Themes/Generic.xaml                       |    2 +-
 8 files changed, 356 insertions(+), 1333 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 058b072324b..e9ad480bf2d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -510,6 +510,9 @@
     <Compile Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorPage.xaml.cs">
       <DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml.cs">
+      <DependentUpon>ColorPickerButtonPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\ColorPicker\ColorPickerPage.xaml.cs">
       <DependentUpon>ColorPickerPage.xaml</DependentUpon>
     </Compile>
@@ -625,6 +628,7 @@
     <Content Include="SamplePages\FocusBehavior\FocusBehaviorXaml.bind" />
     <Content Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorXaml.bind" />
     <Content Include="SamplePages\ColorPicker\ColorPickerXaml.bind" />
+    <Content Include="SamplePages\ColorPicker\ColorPickerButtonXaml.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -998,6 +1002,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SamplePages\ColorPicker\ColorPickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
index b8938de16d6..2593dd56537 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
@@ -1,16 +1,14 @@
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ColorPickerButtonPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      mc:Ignorable="d"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
 
-    <Grid
-        Visibility="Collapsed">
+    <Grid Visibility="Collapsed">
         <controls:ColorPickerButton />
-        <controls:ColorPickerButtonSlider />
+        <controls:ColorPickerSlider />
     </Grid>
-
 </Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
index 027e075addf..c06c3eb8e49 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
@@ -11,17 +11,14 @@
   </Page.Resources>
 
   <Grid>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="*" />
-      <ColumnDefinition Width="*" />
-    </Grid.ColumnDefinitions>
     <Grid.RowDefinitions>
       <RowDefinition Height="*" />
       <RowDefinition Height="*" />
+      <RowDefinition Height="*" />
+      <RowDefinition Height="*" />
     </Grid.RowDefinitions>
     <!-- Example 1 -->
-    <StackPanel Grid.Column="0"
-                Grid.Row="0"
+    <StackPanel Grid.Row="0"
                 Orientation="Vertical"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -38,14 +35,18 @@
         </TextBlock>
       </Border>
       <controls:ColorPickerButton x:Name="ColorPickerButton1"
-                                  Color="Navy"
-                                  ColorSpectrumShape="Box"
-                                  IsAlphaEnabled="False"
-                                  IsHexInputVisible="True" />
+                                  SelectedColor="Navy">
+        <controls:ColorPickerButton.ColorPickerStyle>
+          <Style TargetType="controls:ColorPicker">
+            <Setter Property="ColorSpectrumShape" Value="Box"/>
+            <Setter Property="IsAlphaEnabled" Value="False"/>
+            <Setter Property="IsHexInputVisible" Value="True"/>
+          </Style>
+        </controls:ColorPickerButton.ColorPickerStyle>
+      </controls:ColorPickerButton>
     </StackPanel>
     <!-- Example 2 -->
-    <StackPanel Grid.Column="1"
-                Grid.Row="0"
+    <StackPanel Grid.Row="1"
                 Orientation="Vertical"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -62,14 +63,18 @@
         </TextBlock>
       </Border>
       <controls:ColorPickerButton x:Name="ColorPickerButton2"
-                                  Color="Green"
-                                  ColorSpectrumShape="Box"
-                                  IsAlphaEnabled="True"
-                                  IsHexInputVisible="False" />
+                                  SelectedColor="Green">
+        <controls:ColorPickerButton.ColorPickerStyle>
+          <Style TargetType="controls:ColorPicker">
+            <Setter Property="ColorSpectrumShape" Value="Box"/>
+            <Setter Property="IsAlphaEnabled" Value="True"/>
+            <Setter Property="IsHexInputVisible" Value="False"/>
+          </Style>
+        </controls:ColorPickerButton.ColorPickerStyle>
+      </controls:ColorPickerButton>
     </StackPanel>
     <!-- Example 3 -->
-    <StackPanel Grid.Column="0"
-                Grid.Row="1"
+    <StackPanel Grid.Row="2"
                 Orientation="Vertical"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -86,14 +91,18 @@
         </TextBlock>
       </Border>
       <controls:ColorPickerButton x:Name="ColorPickerButton3"
-                                  Color="Transparent"
-                                  ColorSpectrumShape="Ring"
-                                  IsAlphaEnabled="True"
-                                  IsHexInputVisible="True" />
+                                  SelectedColor="Transparent">
+        <controls:ColorPickerButton.ColorPickerStyle>
+          <Style TargetType="controls:ColorPicker">
+            <Setter Property="ColorSpectrumShape" Value="Ring"/>
+            <Setter Property="IsAlphaEnabled" Value="True"/>
+            <Setter Property="IsHexInputVisible" Value="True"/>
+          </Style>
+        </controls:ColorPickerButton.ColorPickerStyle>
+      </controls:ColorPickerButton>
     </StackPanel>
     <!-- Example 4 -->
-    <StackPanel Grid.Column="1"
-                Grid.Row="1"
+    <StackPanel Grid.Row="3"
                 Orientation="Vertical"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -111,12 +120,16 @@
         </TextBlock>
       </Border>
       <controls:ColorPickerButton x:Name="ColorPickerButton4"
-                                  Color="Maroon"
-                                  ColorSpectrumShape="Ring"
-                                  ColorSpectrumComponents="SaturationValue"
-                                  IsAlphaEnabled="True"
-                                  IsHexInputVisible="True"
-                                  Width="200" />
+                                  SelectedColor="Maroon">
+        <controls:ColorPickerButton.ColorPickerStyle>
+          <Style TargetType="controls:ColorPicker">
+            <Setter Property="ColorSpectrumShape" Value="Ring"/>
+            <Setter Property="ColorSpectrumComponents" Value="SaturationValue"/>
+            <Setter Property="IsAlphaEnabled" Value="True"/>
+            <Setter Property="IsHexInputVisible" Value="True"/>
+          </Style>
+        </controls:ColorPickerButton.ColorPickerStyle>
+      </controls:ColorPickerButton>
     </StackPanel>
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index f623da4311d..83e1adf985d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -39,21 +39,21 @@
         "Type": "ColorPickerPage",
         "Subcategory": "Input",
         "About": "An improved color picker control providing more options to select colors.",
-        "CodeUrl": "TBD",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker",
         "XamlCodeFile": "ColorPickerXaml.bind",
         "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
-        "DocumentationUrl": "TBD"
-      },
-      //{
-      //  "Name": "ColorPickerButton",
-      //  "Type": "ColorPickerButtonPage",
-      //  "Subcategory": "Input",
-      //  "About": "A color picker within a flyout opened by pressing a drop down button containing the selected color.",
-      //  "CodeUrl": "TBD",
-      //  "XamlCodeFile": "ColorPickerButtonXaml.bind",
-      //  "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
-      //  "DocumentationUrl": "TBD"
-      //},
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
+      },
+      {
+        "Name": "ColorPickerButton",
+        "Type": "ColorPickerButtonPage",
+        "Subcategory": "Input",
+        "About": "A color picker within a flyout opened by pressing a drop down button containing the selected color.",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker",
+        "XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerButtonXaml.bind",
+        "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPickerButton.md"
+      },
       {
         "Name": "AdaptiveGridView",
         "Type": "AdaptiveGridViewPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
index 68955118a88..4b2128abc72 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -45,7 +45,7 @@
 
                 <Style x:Key="InputTextBoxStyle"
                        TargetType="TextBox">
-                    <Setter Property="CornerRadius" Value="0,2,2,0" /> 
+                    <Setter Property="CornerRadius" Value="0,2,2,0" />
                     <!--  TODO: Is there a theme resource we can use for this from the system?  -->
                 </Style>
             </Grid.Resources>
@@ -92,6 +92,7 @@
             </ListBox>
             <controls:SwitchPresenter x:Name="ContentContainer"
                                       Grid.Row="1"
+                                      Margin="12"
                                       Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
                 <controls:Case Value="SpectrumListBoxItem">
                     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
new file mode 100644
index 00000000000..cc70b8fcb83
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
@@ -0,0 +1,130 @@
+// 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;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// A <see cref="DropDownButton"/> which displays a color as its <c>Content</c> and it's <c>Flyout</c> is a <see cref="ColorPicker"/>.
+    /// </summary>
+    [TemplatePart(Name = nameof(ColorPicker), Type = typeof(ColorPicker))]
+    public class ColorPickerButton : DropDownButton
+    {
+        /// <summary>
+        /// Gets the <see cref="Controls.ColorPicker"/> instances contained by the <see cref="DropDownButton"/>.
+        /// </summary>
+        public ColorPicker ColorPicker { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Style"/> for the <see cref="Controls.ColorPicker"/> control used in the button.
+        /// </summary>
+        public Style ColorPickerStyle
+        {
+            get
+            {
+                return (Style)GetValue(ColorPickerStyleProperty);
+            }
+
+            set
+            {
+                SetValue(ColorPickerStyleProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="ColorPickerStyle"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ColorPickerStyleProperty = DependencyProperty.Register("ColorPickerStyle", typeof(Style), typeof(ColorPickerButton), new PropertyMetadata(default(Style)));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Style"/> for the <see cref="FlyoutPresenter"/> used within the <see cref="Flyout"/> of the <see cref="DropDownButton"/>.
+        /// </summary>
+        public Style FlyoutPresenterStyle
+        {
+            get
+            {
+                return (Style)GetValue(FlyoutPresenterStyleProperty);
+            }
+
+            set
+            {
+                SetValue(FlyoutPresenterStyleProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="FlyoutPresenterStyle"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty FlyoutPresenterStyleProperty = DependencyProperty.Register("FlyoutPresenterStyle", typeof(Style), typeof(ColorPickerButton), new PropertyMetadata(default(Style)));
+
+        /// <summary>
+        /// Gets or sets the selected <see cref="Windows.UI.Color"/> the user has picked from the <see cref="ColorPicker"/>.
+        /// </summary>
+        public Color SelectedColor
+        {
+            get { return (Color)GetValue(SelectedColorProperty); }
+            set { SetValue(SelectedColorProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="SelectedColor"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty SelectedColorProperty =
+            DependencyProperty.Register(nameof(SelectedColor), typeof(Color), typeof(ColorPickerButton), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorPickerButton"/> class.
+        /// </summary>
+        public ColorPickerButton()
+        {
+            this.DefaultStyleKey = typeof(ColorPickerButton);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate()
+        {
+            if (ColorPicker != null)
+            {
+                // TODO: Unregister
+            }
+
+            base.OnApplyTemplate();
+
+            if (ColorPickerStyle != null)
+            {
+                ColorPicker = new ColorPicker() { Style = ColorPickerStyle };
+            }
+            else
+            {
+                ColorPicker = new ColorPicker();
+            }
+
+            ColorPicker.Color = SelectedColor;
+
+            this.ColorPicker.ColorChanged += (sender, args) =>
+            {
+                SelectedColor = args.NewColor;
+            };
+
+            if (Flyout == null)
+            {
+                Flyout = new Flyout()
+                {
+                    // TODO: Expose Placement
+                    Placement = Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode.BottomEdgeAlignedLeft,
+                    FlyoutPresenterStyle = FlyoutPresenterStyle,
+                    Content = ColorPicker
+                };
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
index 80abd02ecd7..a406e53cc9c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
@@ -1,1286 +1,159 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
-                    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters">
-
-    <!-- The XAML compiler has a serious bug that doesn't allow using conditional XAML on Setters...
-         The work-around is to create multiple styles as condition XAML still works at the style level.
-         This is needed to support CornerRadius properties. -->
-
-    <Style TargetType="controls:ColorPickerButton"
-           x:Key="BaseColorPickerButtonStyle">
-        <Setter Property="Height"
-                Value="32" />
-        <Setter Property="Width"
-                Value="64" />
-        <Setter Property="MinWidth"
-                Value="64" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:ColorPickerButton">
-                    <Border CornerRadius="{TemplateBinding CornerRadius}"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch">
-                        <Border.Resources>
-                            <localconverters:ColorToColorShadeConverter x:Key="ColorToColorShade" />
-                            <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" />
-                            <localconverters:ColorToHexConverter x:Key="ColorToHex" />
-                            <localconverters:ContrastBrushConverter x:Key="ContrastBrush" />
-                            <SolidColorBrush x:Key="CheckerboardColor0">
-                                <SolidColorBrush.Color>
-                                    <Color>Transparent</Color>
-                                </SolidColorBrush.Color>
-                            </SolidColorBrush>
-                            <SolidColorBrush x:Key="CheckerboardColor1">
-                                <SolidColorBrush.Color>
-                                    <Color>#70F5F5F5</Color>
-                                </SolidColorBrush.Color>
-                            </SolidColorBrush>
-                            <SolidColorBrush x:Name="CheckerColorBrush"
-                                             Color="{ThemeResource SystemListLowColor}" />
-                            <contract7NotPresent:Style TargetType="TextBox"
-                                                       x:Key="InputTextBoxStyle">
-                                <!-- Currently not used -->
-                            </contract7NotPresent:Style>
-                            <contract7Present:Style TargetType="TextBox"
-                                                    x:Key="InputTextBoxStyle">
-                                <Setter Property="CornerRadius"
-                                        Value="0,2,2,0" />
-                            </contract7Present:Style>
-                        </Border.Resources>
-                        <VisualStateManager.VisualStateGroups>
-
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundDisabled}" />
-                                        <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushDisabled}" />
-                                        <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundDisabled}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="PointerOver">
-                                    <VisualState.Setters>
-                                        <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundPointerOver}" />
-                                        <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushPointerOver}" />
-                                        <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundPointerOver}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <VisualState.Setters>
-                                        <Setter Target="RootButton.Background"
-                                                Value="{ThemeResource ButtonBackgroundPressed}" />
-                                        <Setter Target="RootButton.BorderBrush"
-                                                Value="{ThemeResource ButtonBorderBrushPressed}" />
-                                        <Setter Target="DropDownGlyph.Foreground"
-                                                Value="{ThemeResource ButtonForegroundPressed}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ColorSpectrumVisibility">
-                                <VisualState x:Name="ColorSpectrumVisible" />
-                                <VisualState x:Name="ColorSpectrumCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="SpectrumPivotItem.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ColorPaletteVisibility">
-                                <VisualState x:Name="ColorPaletteVisible" />
-                                <VisualState x:Name="ColorPaletteCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="PalettePivotItem.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ColorPreviewVisibility">
-                                <VisualState x:Name="ColorPreviewVisible" />
-                                <VisualState x:Name="ColorPreviewCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ColorPreviewGrid.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="PreviousColorVisibility">
-                                <!-- Previous color is not currently supported -->
-                                <VisualState x:Name="PreviousColorCollapsedVertical" />
-                                <VisualState x:Name="PreviousColorVisibleVertical" />
-                                <VisualState x:Name="PreviousColorCollapsedHorizontal" />
-                                <VisualState x:Name="PreviousColorVisibleHorizontal" />
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ThirdDimensionSliderVisibility">
-                                <VisualState x:Name="ThirdDimensionSliderVisible" />
-                                <VisualState x:Name="ThirdDimensionSliderCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ColorSpectrumThirdDimensionSlider.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="AlphaSliderVisibility">
-                                <VisualState x:Name="AlphaSliderVisible" />
-                                <VisualState x:Name="AlphaSliderCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ColorSpectrumAlphaSlider.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelBorder.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelSlider.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="MoreButtonVisibility">
-                                <!-- More button isn't supported -->
-                                <VisualState x:Name="MoreButtonVisible" />
-                                <VisualState x:Name="MoreButtonCollapsed" />
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="TextEntryGridVisibility">
-                                <!-- Text entry grid is not currently supported -->
-                                <VisualState x:Name="TextEntryGridCollapsed" />
-                                <VisualState x:Name="TextEntryGridVisible" />
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ColorChannelTextInputVisibility">
-                                <VisualState x:Name="ColorChannelTextInputVisible" />
-                                <VisualState x:Name="ColorChannelTextInputCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ChannelsPivotItem.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="AlphaTextInputVisibility">
-                                <VisualState x:Name="AlphaTextInputVisible" />
-                                <VisualState x:Name="AlphaTextInputCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ColorRepresentationSelected">
-                                <VisualState x:Name="RgbSelected" />
-                                <VisualState x:Name="HsvSelected">
-                                    <VisualState.Setters>
-                                        <Setter Target="Channel1TextBlock.Text"
-                                                Value="H" />
-                                        <Setter Target="Channel2TextBlock.Text"
-                                                Value="S" />
-                                        <Setter Target="Channel3TextBlock.Text"
-                                                Value="V" />
-                                        <Setter Target="Channel1TextBox.(AutomationProperties.Name)"
-                                                Value="Hue Channel" />
-                                        <Setter Target="Channel2TextBox.(AutomationProperties.Name)"
-                                                Value="Saturation Channel" />
-                                        <Setter Target="Channel3TextBox.(AutomationProperties.Name)"
-                                                Value="Value Channel" />
-                                        <Setter Target="Channel1Slider.(AutomationProperties.Name)"
-                                                Value="Hue Channel" />
-                                        <Setter Target="Channel2Slider.(AutomationProperties.Name)"
-                                                Value="Saturation Channel" />
-                                        <Setter Target="Channel3Slider.(AutomationProperties.Name)"
-                                                Value="Value Channel" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="HexInputVisibility">
-                                <VisualState x:Name="HexInputVisible" />
-                                <VisualState x:Name="HexInputCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="HexInputGrid.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="AlphaEnabledState">
-                                <!-- Not currently supported -->
-                                <VisualState x:Name="AlphaDisabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="ColorSpectrumAlphaSlider.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelBorder.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelTextBox.Visibility"
-                                                Value="Collapsed" />
-                                        <Setter Target="AlphaChannelSlider.Visibility"
-                                                Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="AlphaEnabled" />
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-                        <!-- Must not use layout rounding or the color may not be
-                             correctly centered in the button -->
-                        <Button x:Name="RootButton"
-                                Height="{TemplateBinding Height}"
-                                Width="{TemplateBinding Width}"
-                                Padding="0"
-                                UseLayoutRounding="False"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Stretch">
-                            <Button.Content>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="32" />
-                                    </Grid.ColumnDefinitions>
-                                    <!-- Checkered background to show transparency -->
-                                    <Border x:Name="CheckeredBackground1Border"
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch" />
-                                    <!-- Preview color -->
-                                    <Border Grid.Column="0"
-                                            CornerRadius="2,0,0,2"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <!-- Drop down symbol, ensure this matches in style with DropDownButton/ComboBox -->
-                                    <FontIcon x:Name="DropDownGlyph"
-                                              Grid.Column="1"
-                                              IsHitTestVisible="False"
-                                              Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
-                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                              FontSize="12"
-                                              Glyph="&#xE0E5;"
-                                              HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" />
-                                </Grid>
-                            </Button.Content>
-                            <Button.Flyout>
-                                <Flyout>
-                                    <!-- The Grid removes the Flyout padding using negative margins.
-                                         This is better than restyling the FlyoutPresenter because there is no key for using
-                                         a new style based on the existing one. That would require entirely re-styling the 
-                                         FlyoutPresenter which would soon be out of sync with the system. -->
-                                    <Grid Margin="-12,-11,-12,-12">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-                                        <!-- The whole background of the pivot header is changed here.
-                                             It's much easier to do this than customize the PivotHeaderItem template.
-                                             Remember PivotHeaderItem has a default height of 48px. -->
-                                        <Grid Grid.Row="0"
-                                              CornerRadius="4,4,0,0"
-                                              Height="48"
-                                              Background="{ThemeResource SystemControlAcrylicElementBrush}"
-                                              HorizontalAlignment="Stretch">
-                                        </Grid>
-                                        <Pivot Grid.Row="0"
-                                               Grid.RowSpan="2"
-                                               Height="400"
-                                               Width="400">
-                                            <Pivot.ItemContainerStyle>
-                                                <Style TargetType="PivotItem">
-                                                    <Setter Property="HorizontalContentAlignment"
-                                                            Value="Stretch" />
-                                                    <Setter Property="VerticalContentAlignment"
-                                                            Value="Stretch" />
-                                                    <Setter Property="Margin"
-                                                            Value="12" />
-                                                    <Setter Property="Padding"
-                                                            Value="0" />
-                                                </Style>
-                                            </Pivot.ItemContainerStyle>
-                                            <PivotItem x:Name="SpectrumPivotItem"
-                                                       AutomationProperties.Name="Spectrum">
-                                                <PivotItem.Header>
-                                                    <FontIcon Glyph="&#xE76D;"
-                                                              Width="109" />
-                                                </PivotItem.Header>
-                                                <PivotItem.Content>
-                                                    <Grid>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto" />
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="Auto" />
-                                                            <RowDefinition Height="*" />
-                                                        </Grid.RowDefinitions>
-                                                        <controls:ColorPickerSlider x:Name="ColorSpectrumThirdDimensionSlider"
-                                                                                          Grid.Column="0"
-                                                                                          Grid.Row="1"
-                                                                                          Grid.RowSpan="2"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Orientation="Vertical"
-                                                                                          Width="20"
-                                                                                          HorizontalAlignment="Center"
-                                                                                          VerticalAlignment="Stretch"
-                                                                                          Margin="0,0,12,0" />
-                                                        <!-- Keep in mind the spectrum is always HSV -->
-                                                        <!-- This must also not be named 'ColorSpectrumControl' to differentiate from the base class -->
-                                                        <ColorSpectrum x:Name="ColorSpectrumControl"
-                                                                       AutomationProperties.Name="Third Dimension"
-                                                                       Grid.Column="1"
-                                                                       Grid.Row="0"
-                                                                       Grid.RowSpan="2"
-                                                                       Components="{TemplateBinding ColorSpectrumComponents}"
-                                                                       MinHue="{TemplateBinding MinHue}"
-                                                                       MaxHue="{TemplateBinding MaxHue}"
-                                                                       MinSaturation="{TemplateBinding MinSaturation}"
-                                                                       MaxSaturation="{TemplateBinding MaxSaturation}"
-                                                                       MinValue="{TemplateBinding MinValue}"
-                                                                       MaxValue="{TemplateBinding MaxValue}"
-                                                                       Shape="{TemplateBinding ColorSpectrumShape}"
-                                                                       HorizontalAlignment="Stretch"
-                                                                       VerticalAlignment="Stretch" />
-                                                        <controls:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
-                                                                                          AutomationProperties.Name="Alpha Channel"
-                                                                                          Grid.Column="2"
-                                                                                          Grid.Row="1"
-                                                                                          Grid.RowSpan="2"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Orientation="Vertical"
-                                                                                          Width="20"
-                                                                                          HorizontalAlignment="Center"
-                                                                                          VerticalAlignment="Stretch"
-                                                                                          Margin="12,0,0,0" />
-                                                    </Grid>
-                                                </PivotItem.Content>
-                                            </PivotItem>
-                                            <PivotItem x:Name="PalettePivotItem"
-                                                       AutomationProperties.Name="Palette">
-                                                <PivotItem.Header>
-                                                    <FontIcon Glyph="&#xE790;"
-                                                              Width="109" />
-                                                </PivotItem.Header>
-                                                <PivotItem.Content>
-                                                    <GridView x:Name="PaletteGridView"
-                                                              SelectionMode="Single"
-                                                              SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=TwoWay}"
-                                                              ItemsSource="{TemplateBinding CustomPaletteColors}"
-                                                              Margin="0"
-                                                              Padding="0"
-                                                              Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
-                                                        <GridView.ItemsPanel>
-                                                            <ItemsPanelTemplate>
-                                                                <!-- Would be nice if RelativeSource could find an ancestor of type GridView... like WPF.
-                                                                     This would allow binding the Columns property here instead of in code-behind. -->
-                                                                <controls:UniformGrid />
-                                                            </ItemsPanelTemplate>
-                                                        </GridView.ItemsPanel>
-                                                        <GridView.ItemContainerStyle>
-                                                            <Style TargetType="GridViewItem">
-                                                                <Setter Property="FontFamily"
-                                                                        Value="{ThemeResource ContentControlThemeFontFamily}" />
-                                                                <Setter Property="FontSize"
-                                                                        Value="{ThemeResource ControlContentThemeFontSize}" />
-                                                                <Setter Property="Background"
-                                                                        Value="Transparent" />
-                                                                <Setter Property="Foreground"
-                                                                        Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                <Setter Property="TabNavigation"
-                                                                        Value="Local" />
-                                                                <Setter Property="IsHoldingEnabled"
-                                                                        Value="True" />
-                                                                <Setter Property="HorizontalContentAlignment"
-                                                                        Value="Stretch" />
-                                                                <Setter Property="VerticalContentAlignment"
-                                                                        Value="Stretch" />
-                                                                <Setter Property="Margin"
-                                                                        Value="0" />
-                                                                <Setter Property="Padding"
-                                                                        Value="0" />
-                                                                <Setter Property="MinWidth"
-                                                                        Value="10" />
-                                                                <Setter Property="MinHeight"
-                                                                        Value="10" />
-                                                                <Setter Property="AllowDrop"
-                                                                        Value="False" />
-                                                                <Setter Property="UseSystemFocusVisuals"
-                                                                        Value="{StaticResource UseSystemFocusVisuals}" />
-                                                                <Setter Property="FocusVisualMargin"
-                                                                        Value="-2" />
-                                                                <Setter Property="Template">
-                                                                    <Setter.Value>
-                                                                        <ControlTemplate TargetType="GridViewItem">
-                                                                            <Grid x:Name="ContentBorder"
-                                                                                  Control.IsTemplateFocusTarget="True"
-                                                                                  FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                                                                                  Background="{TemplateBinding Background}"
-                                                                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                                                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                                                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                                                                  RenderTransformOrigin="0.5,0.5">
-
-                                                                                <Grid.RenderTransform>
-                                                                                    <ScaleTransform x:Name="ContentBorderScale" />
-                                                                                </Grid.RenderTransform>
-
-                                                                                <VisualStateManager.VisualStateGroups>
-                                                                                    <VisualStateGroup x:Name="FocusStates">
-                                                                                        <VisualState x:Name="Focused">
-
-                                                                                            <Storyboard>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Visibility">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="Collapsed" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-                                                                                        <VisualState x:Name="Unfocused" />
-
-                                                                                    </VisualStateGroup>
-                                                                                    <VisualStateGroup x:Name="CommonStates">
-                                                                                        <VisualState x:Name="Normal">
-
-                                                                                            <Storyboard>
-                                                                                                <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="PointerOver">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Stroke">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListLowBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListLowBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="2" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="Pressed">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Stroke">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="2" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <PointerDownThemeAnimation TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="Selected">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Stroke">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="2" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                               Storyboard.TargetProperty="Background">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="PointerOverSelected">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Stroke">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="2" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                               Storyboard.TargetProperty="Background">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{Binding Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="PressedSelected">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="BorderRectangle"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderRectangle"
-                                                                                                                               Storyboard.TargetProperty="Stroke">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryBrush">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentBorder"
-                                                                                                                               Storyboard.TargetProperty="FocusVisualSecondaryThickness">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="2" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                               Storyboard.TargetProperty="Background">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="{ThemeResource SystemControlHighlightAccentBrush}" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <PointerDownThemeAnimation TargetName="ContentPresenter" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                    <VisualStateGroup x:Name="DisabledStates">
-                                                                                        <VisualState x:Name="Enabled" />
-
-                                                                                        <VisualState x:Name="Disabled">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="{ThemeResource ListViewItemDisabledThemeOpacity}" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                    <VisualStateGroup x:Name="MultiSelectStates">
-                                                                                        <VisualState x:Name="MultiSelectDisabled">
-
-                                                                                            <Storyboard>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                               Storyboard.TargetProperty="Visibility">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="Visible" />
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0:0:0.333"
-                                                                                                                            Value="Collapsed" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <FadeOutThemeAnimation TargetName="MultiSelectSquare" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="MultiSelectEnabled">
-
-                                                                                            <Storyboard>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                               Storyboard.TargetProperty="Visibility">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="Visible" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <FadeInThemeAnimation TargetName="MultiSelectSquare" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                    <VisualStateGroup x:Name="DataVirtualizationStates">
-                                                                                        <VisualState x:Name="DataAvailable" />
-
-                                                                                        <VisualState x:Name="DataPlaceholder">
-
-                                                                                            <Storyboard>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock"
-                                                                                                                               Storyboard.TargetProperty="Visibility">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="Visible" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderRect"
-                                                                                                                               Storyboard.TargetProperty="Visibility">
-                                                                                                    <DiscreteObjectKeyFrame KeyTime="0"
-                                                                                                                            Value="Visible" />
-                                                                                                </ObjectAnimationUsingKeyFrames>
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                    <VisualStateGroup x:Name="ReorderHintStates">
-                                                                                        <VisualState x:Name="NoReorderHint" />
-
-                                                                                        <VisualState x:Name="BottomReorderHint">
-
-                                                                                            <Storyboard>
-                                                                                                <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                        ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                        Direction="Bottom" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="TopReorderHint">
-
-                                                                                            <Storyboard>
-                                                                                                <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                        ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                        Direction="Top" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="RightReorderHint">
-
-                                                                                            <Storyboard>
-                                                                                                <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                        ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                        Direction="Right" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="LeftReorderHint">
-
-                                                                                            <Storyboard>
-                                                                                                <DragOverThemeAnimation TargetName="ContentBorder"
-                                                                                                                        ToOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                                                                                                                        Direction="Left" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualStateGroup.Transitions>
-                                                                                            <VisualTransition To="NoReorderHint"
-                                                                                                              GeneratedDuration="0:0:0.2" />
-                                                                                        </VisualStateGroup.Transitions>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                    <VisualStateGroup x:Name="DragStates">
-                                                                                        <VisualState x:Name="NotDragging" />
-
-                                                                                        <VisualState x:Name="Dragging">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                                                <DragItemThemeAnimation TargetName="ContentBorder" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="DraggingTarget" />
-
-                                                                                        <VisualState x:Name="MultipleDraggingPrimary">
-
-                                                                                            <Storyboard>
-                                                                                                <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                     on the same elements animate an internal Opacity. -->
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="0" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="0" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                                                <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
-                                                                                                <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
-                                                                                                <DragItemThemeAnimation TargetName="ContentBorder" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="MultipleDraggingSecondary" />
-
-                                                                                        <VisualState x:Name="DraggedPlaceholder" />
-
-                                                                                        <VisualState x:Name="Reordering">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0:0:0.240"
-                                                                                                                 To="{ThemeResource ListViewItemReorderThemeOpacity}" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="ReorderingTarget">
-
-                                                                                            <Storyboard>
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0:0:0.240"
-                                                                                                                 To="{ThemeResource ListViewItemReorderTargetThemeOpacity}" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                                 Storyboard.TargetProperty="ScaleX"
-                                                                                                                 Duration="0:0:0.240"
-                                                                                                                 To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorderScale"
-                                                                                                                 Storyboard.TargetProperty="ScaleY"
-                                                                                                                 Duration="0:0:0.240"
-                                                                                                                 To="{ThemeResource ListViewItemReorderTargetThemeScale}" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="MultipleReorderingPrimary">
-
-                                                                                            <Storyboard>
-                                                                                                <!-- These two Opacity animations are required - the FadeInThemeAnimations
-                                                                                                     on the same elements animate an internal Opacity. -->
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayText"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiArrangeOverlayTextBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="1" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectSquare"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="0" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="MultiSelectCheck"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0"
-                                                                                                                 To="0" />
-                                                                                                <DoubleAnimation Storyboard.TargetName="ContentBorder"
-                                                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                                                 Duration="0:0:0.240"
-                                                                                                                 To="{ThemeResource ListViewItemDragThemeOpacity}" />
-                                                                                                <FadeInThemeAnimation TargetName="MultiArrangeOverlayText" />
-                                                                                                <FadeInThemeAnimation TargetName="MultiArrangeOverlayTextBorder" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="ReorderedPlaceholder">
-
-                                                                                            <Storyboard>
-                                                                                                <FadeOutThemeAnimation TargetName="ContentBorder" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualState x:Name="DragOver">
-
-                                                                                            <Storyboard>
-                                                                                                <DropTargetItemThemeAnimation TargetName="ContentBorder" />
-                                                                                            </Storyboard>
-                                                                                        </VisualState>
-
-                                                                                        <VisualStateGroup.Transitions>
-                                                                                            <VisualTransition To="NotDragging"
-                                                                                                              GeneratedDuration="0:0:0.2" />
-                                                                                        </VisualStateGroup.Transitions>
-
-                                                                                    </VisualStateGroup>
-
-                                                                                </VisualStateManager.VisualStateGroups>
-                                                                                <ContentPresenter x:Name="ContentPresenter"
-                                                                                                  ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                                                  Margin="{TemplateBinding Padding}" />
-                                                                                <!-- The 'Xg' text simulates the amount of space one line of text will occupy.
-                                                                                     In the DataPlaceholder state, the Content is not loaded yet so we
-                                                                                     approximate the size of the item using placeholder text. -->
-                                                                                <TextBlock x:Name="PlaceholderTextBlock"
-                                                                                           Visibility="Collapsed"
-                                                                                           Text="Xg"
-                                                                                           Foreground="{x:Null}"
-                                                                                           Margin="{TemplateBinding Padding}"
-                                                                                           IsHitTestVisible="False"
-                                                                                           AutomationProperties.AccessibilityView="Raw" />
-                                                                                <Rectangle x:Name="PlaceholderRect"
-                                                                                           Visibility="Collapsed"
-                                                                                           Fill="{ThemeResource ListViewItemPlaceholderBackground}" />
-                                                                                <Rectangle x:Name="BorderRectangle"
-                                                                                           IsHitTestVisible="False"
-                                                                                           Stroke="{ThemeResource SystemControlHighlightListAccentLowBrush}"
-                                                                                           StrokeThickness="2"
-                                                                                           Opacity="0" />
-                                                                                <Border x:Name="MultiSelectSquare"
-                                                                                        Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
-                                                                                        Width="20"
-                                                                                        Height="20"
-                                                                                        Margin="0,2,2,0"
-                                                                                        VerticalAlignment="Top"
-                                                                                        HorizontalAlignment="Right"
-                                                                                        Visibility="Collapsed">
-                                                                                    <FontIcon x:Name="MultiSelectCheck"
-                                                                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                                                              Glyph="&#xE73E;"
-                                                                                              FontSize="16"
-                                                                                              Foreground="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
-                                                                                              Opacity="0" />
-                                                                                </Border>
-                                                                                <Border x:Name="MultiArrangeOverlayTextBorder"
-                                                                                        Opacity="0"
-                                                                                        IsHitTestVisible="False"
-                                                                                        MinWidth="20"
-                                                                                        Height="20"
-                                                                                        VerticalAlignment="Center"
-                                                                                        HorizontalAlignment="Center"
-                                                                                        Background="{ThemeResource SystemControlBackgroundAccentBrush}"
-                                                                                        BorderThickness="2"
-                                                                                        BorderBrush="{ThemeResource SystemControlBackgroundChromeWhiteBrush}">
-                                                                                    <TextBlock x:Name="MultiArrangeOverlayText"
-                                                                                               Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
-                                                                                               Style="{ThemeResource CaptionTextBlockStyle}"
-                                                                                               IsHitTestVisible="False"
-                                                                                               Opacity="0"
-                                                                                               VerticalAlignment="Center"
-                                                                                               HorizontalAlignment="Center"
-                                                                                               AutomationProperties.AccessibilityView="Raw" />
-                                                                                </Border>
-
-                                                                            </Grid>
-
-                                                                        </ControlTemplate>
-                                                                    </Setter.Value>
-                                                                </Setter>
-                                                            </Style>
-                                                        </GridView.ItemContainerStyle>
-                                                        <GridView.ItemTemplate>
-                                                            <DataTemplate>
-                                                                <Border AutomationProperties.Name="{Binding Converter={StaticResource ColorToDisplayName}}"
-                                                                        HorizontalAlignment="Stretch"
-                                                                        VerticalAlignment="Stretch">
-                                                                    <Border.Background>
-                                                                        <SolidColorBrush Color="{Binding}" />
-                                                                    </Border.Background>
-                                                                </Border>
-                                                            </DataTemplate>
-                                                        </GridView.ItemTemplate>
-                                                    </GridView>
-                                                </PivotItem.Content>
-                                            </PivotItem>
-                                            <PivotItem x:Name="ChannelsPivotItem"
-                                                       AutomationProperties.Name="Channels">
-                                                <PivotItem.Header>
-                                                    <FontIcon Glyph="&#xE9E9;"
-                                                              Width="109" />
-                                                </PivotItem.Header>
-                                                <PivotItem.Content>
-                                                    <Grid>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="30" />
-                                                            <ColumnDefinition Width="80" />
-                                                            <ColumnDefinition Width="*" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="Auto" />
-                                                            <RowDefinition Height="24" />
-                                                            <RowDefinition Height="1*" />
-                                                            <RowDefinition Height="1*" />
-                                                            <RowDefinition Height="1*" />
-                                                            <RowDefinition Height="1*" />
-                                                            <!-- Note that there is an additional 12px added by the PivotItem -->
-                                                            <RowDefinition Height="12" />
-                                                        </Grid.RowDefinitions>
-                                                        <!-- Top color model & Hex input -->
-                                                        <Grid Grid.Column="0"
-                                                              Grid.ColumnSpan="3"
-                                                              Grid.Row="0">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="1*" />
-                                                                <ColumnDefinition Width="1*" />
-                                                                <ColumnDefinition Width="12" />
-                                                                <ColumnDefinition Width="2*" />
-                                                            </Grid.ColumnDefinitions>
-                                                            <!-- Content RGB/HSV names are hard-coded in ColorPicker as well -->
-                                                            <!-- ToggleButtons are styled to look like a 'SegmentedControl' or 'ButtonGroup' -->
-                                                            <ToggleButton x:Name="RgbToggleButton"
-                                                                          Grid.Column="0"
-                                                                          Content="RGB"
-                                                                          BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                          BorderThickness="1"
-                                                                          Background="Transparent"
-                                                                          HorizontalAlignment="Stretch"
-                                                                          IsThreeState="False"
-                                                                          contract7Present:CornerRadius="2,0,0,2"/>
-                                                            <ToggleButton x:Name="HsvToggleButton"
-                                                                          Grid.Column="1"
-                                                                          Content="HSV"
-                                                                          BorderBrush="{ThemeResource ToggleButtonBackgroundChecked}"
-                                                                          BorderThickness="1"
-                                                                          Background="Transparent"
-                                                                          HorizontalAlignment="Stretch"
-                                                                          IsThreeState="False"
-                                                                          contract7Present:CornerRadius="0,2,2,0" />
-                                                            <Grid x:Name="HexInputGrid"
-                                                                  Grid.Column="3">
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="30" />
-                                                                    <ColumnDefinition Width="*" />
-                                                                </Grid.ColumnDefinitions>
-                                                                <Border Grid.Column="0"
-                                                                        Height="32"
-                                                                        Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                        BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                        BorderThickness="1,1,0,1"
-                                                                        CornerRadius="2,0,0,2">
-                                                                    <TextBlock Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                               FontWeight="SemiBold"
-                                                                               Text="#"
-                                                                               HorizontalAlignment="Center"
-                                                                               VerticalAlignment="Center" />
-                                                                </Border>
-                                                                <!-- Name must NOT match what is in ColorPicker 'HexTextBox' -->
-                                                                <TextBox x:Name="HexInputTextBox"
-                                                                         Style="{StaticResource InputTextBoxStyle}"
-                                                                         AutomationProperties.Name="Hexadecimal Color Input"
-                                                                         Height="32"
-                                                                         Grid.Column="1"
-                                                                         HorizontalAlignment="Stretch" />
-                                                            </Grid>
-                                                        </Grid>
-                                                        <!-- Color channel editing controls -->
-                                                        <!-- Channel 1 RGB:Red HSV:Hue -->
-                                                        <Border Grid.Column="0"
-                                                                Grid.Row="2"
-                                                                Height="{Binding ElementName=Channel1TextBox, Path=ActualHeight}"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2"
-                                                                VerticalAlignment="Center">
-                                                            <TextBlock x:Name="Channel1TextBlock"
-                                                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                       FontWeight="SemiBold"
-                                                                       Text="R"
-                                                                       HorizontalAlignment="Center"
-                                                                       VerticalAlignment="Center" />
-                                                        </Border>
-                                                        <TextBox x:Name="Channel1TextBox"
-                                                                 Grid.Column="1"
-                                                                 Grid.Row="2"
-                                                                 Style="{StaticResource InputTextBoxStyle}"
-                                                                 AutomationProperties.Name="Red Channel"
-                                                                 VerticalAlignment="Center" />
-                                                        <controls:ColorPickerButtonSlider x:Name="Channel1Slider"
-                                                                                          Grid.Column="2"
-                                                                                          Grid.Row="2"
-                                                                                          AutomationProperties.Name="Red Channel"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Margin="12,0,0,0"
-                                                                                          HorizontalAlignment="Stretch"
-                                                                                          VerticalAlignment="Center" />
-                                                        <!-- Channel 2 RGB:Green HSV:Saturation -->
-                                                        <Border Grid.Column="0"
-                                                                Grid.Row="3"
-                                                                Height="{Binding ElementName=Channel2TextBox, Path=ActualHeight}"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2"
-                                                                VerticalAlignment="Center">
-                                                            <TextBlock x:Name="Channel2TextBlock"
-                                                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                       FontWeight="SemiBold"
-                                                                       Text="G"
-                                                                       HorizontalAlignment="Center"
-                                                                       VerticalAlignment="Center" />
-                                                        </Border>
-                                                        <TextBox x:Name="Channel2TextBox"
-                                                                 Grid.Column="1"
-                                                                 Grid.Row="3"
-                                                                 Style="{StaticResource InputTextBoxStyle}"
-                                                                 AutomationProperties.Name="Green Channel"
-                                                                 VerticalAlignment="Center" />
-                                                        <controls:ColorPickerButtonSlider x:Name="Channel2Slider"
-                                                                                          Grid.Column="2"
-                                                                                          Grid.Row="3"
-                                                                                          AutomationProperties.Name="Green Channel"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Margin="12,0,0,0"
-                                                                                          HorizontalAlignment="Stretch"
-                                                                                          VerticalAlignment="Center" />
-                                                        <!-- Channel 3 RGB:Blue HSV:Value -->
-                                                        <Border Grid.Column="0"
-                                                                Grid.Row="4"
-                                                                Height="{Binding ElementName=Channel3TextBox, Path=ActualHeight}"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2"
-                                                                VerticalAlignment="Center">
-                                                            <TextBlock x:Name="Channel3TextBlock"
-                                                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                       FontWeight="SemiBold"
-                                                                       Text="B"
-                                                                       HorizontalAlignment="Center"
-                                                                       VerticalAlignment="Center" />
-                                                        </Border>
-                                                        <TextBox x:Name="Channel3TextBox"
-                                                                 Grid.Column="1"
-                                                                 Grid.Row="4"
-                                                                 Style="{StaticResource InputTextBoxStyle}"
-                                                                 AutomationProperties.Name="Blue Channel"
-                                                                 VerticalAlignment="Center" />
-                                                        <controls:ColorPickerButtonSlider x:Name="Channel3Slider"
-                                                                                          Grid.Column="2"
-                                                                                          Grid.Row="4"
-                                                                                          AutomationProperties.Name="Blue Channel"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Margin="12,0,0,0"
-                                                                                          HorizontalAlignment="Stretch"
-                                                                                          VerticalAlignment="Center" />
-                                                        <!-- Alpha channel -->
-                                                        <Border x:Name="AlphaChannelBorder"
-                                                                Grid.Column="0"
-                                                                Grid.Row="5"
-                                                                Height="{Binding ElementName=AlphaChannelTextBox, Path=ActualHeight}"
-                                                                Background="{ThemeResource TextBoxDisabledBackgroundThemeBrush}"
-                                                                BorderBrush="{ThemeResource TextControlBorderBrush}"
-                                                                BorderThickness="1,1,0,1"
-                                                                CornerRadius="2,0,0,2"
-                                                                VerticalAlignment="Center">
-                                                            <TextBlock x:Name="AlphaChannelTextBlock"
-                                                                       Foreground="{ThemeResource TextBoxDisabledForegroundThemeBrush}"
-                                                                       FontWeight="SemiBold"
-                                                                       Text="A"
-                                                                       HorizontalAlignment="Center"
-                                                                       VerticalAlignment="Center" />
-                                                        </Border>
-                                                        <TextBox x:Name="AlphaChannelTextBox"
-                                                                 Grid.Column="1"
-                                                                 Grid.Row="5"
-                                                                 Style="{StaticResource InputTextBoxStyle}"
-                                                                 AutomationProperties.Name="Alpha Channel"
-                                                                 VerticalAlignment="Center" />
-                                                        <controls:ColorPickerButtonSlider x:Name="AlphaChannelSlider"
-                                                                                          Grid.Column="2"
-                                                                                          Grid.Row="5"
-                                                                                          AutomationProperties.Name="Alpha Channel"
-                                                                                          Style="{StaticResource ColorPickerButtonSliderStyle}"
-                                                                                          BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ContrastBrush}, ConverterParameter={ThemeResource TextControlForeground}}"
-                                                                                          Margin="12,0,0,0"
-                                                                                          HorizontalAlignment="Stretch"
-                                                                                          VerticalAlignment="Center" />
-                                                    </Grid>
-                                                </PivotItem.Content>
-                                            </PivotItem>
-                                        </Pivot>
-                                        <Grid x:Name="ColorPreviewGrid"
-                                              Grid.Row="2"
-                                              Height="50"
-                                              Margin="12,0,12,12">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-                                            <Grid Grid.Column="0"
-                                                  Height="40"
-                                                  Width="100"
-                                                  VerticalAlignment="Center">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <Border x:Name="CheckeredBackground2Border"
-                                                        Grid.Column="0"
-                                                        Grid.ColumnSpan="2"
-                                                        HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Stretch" />
-                                                <Border x:Name="N2PreviewBorder"
-                                                        Grid.Column="0"
-                                                        CornerRadius="2,0,0,2">
-                                                    <Border.Background>
-                                                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-2'}" />
-                                                    </Border.Background>
-                                                </Border>
-                                                <!-- The -1 and +1 accent preview originally had a drop shadow as well.
-                                                     However, due to Z-order issues with the checkered background,
-                                                     shadow and preview border, it would have required it's own
-                                                     checkered background. This was judged not worth the performance 
-                                                     trade-off so shadows were removed. -->
-                                                <Border x:Name="N1PreviewBorder"
-                                                        Grid.Column="1">
-                                                    <Border.Background>
-                                                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='-1'}" />
-                                                    </Border.Background>
-                                                </Border>
-                                            </Grid>
-                                            <Grid Grid.Column="2"
-                                                  Height="40"
-                                                  Width="100"
-                                                  VerticalAlignment="Center">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <Border x:Name="CheckeredBackground4Border"
-                                                        Grid.Column="0"
-                                                        Grid.ColumnSpan="2"
-                                                        HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Stretch" />
-                                                <Border x:Name="P1PreviewBorder"
-                                                        Grid.Column="0">
-                                                    <Border.Background>
-                                                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='1'}" />
-                                                    </Border.Background>
-                                                </Border>
-                                                <Border x:Name="P2PreviewBorder"
-                                                        Grid.Column="1"
-                                                        CornerRadius="0,2,2,0">
-                                                    <Border.Background>
-                                                        <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource ColorToColorShade}, ConverterParameter='2'}" />
-                                                    </Border.Background>
-                                                </Border>
-                                            </Grid>
-                                            <!-- Must be last for drop shadow Z-index -->
-                                            <controls:DropShadowPanel Grid.Column="1"
-                                                                      BlurRadius="10.0"
-                                                                      ShadowOpacity="0.75"
-                                                                      OffsetX="0.0"
-                                                                      OffsetY="0.0"
-                                                                      Color="Black"
-                                                                      HorizontalContentAlignment="Stretch"
-                                                                      VerticalContentAlignment="Stretch">
-                                                <Grid>
-                                                    <Border Background="{ThemeResource FlyoutPresenterBackground}"
-                                                            CornerRadius="2"
-                                                            HorizontalAlignment="Stretch"
-                                                            VerticalAlignment="Stretch" />
-                                                    <Border x:Name="CheckeredBackground3Border"
-                                                            CornerRadius="2"
-                                                            HorizontalAlignment="Stretch"
-                                                            VerticalAlignment="Stretch" />
-                                                    <Border x:Name="PreviewBorder"
-                                                            CornerRadius="2">
-                                                        <Border.Background>
-                                                            <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
-                                                        </Border.Background>
-                                                    </Border>
-                                                </Grid>
-                                            </controls:DropShadowPanel>
-                                        </Grid>
-                                    </Grid>
-                                </Flyout>
-                            </Button.Flyout>
-                        </Button>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+
+    <Style BasedOn="{StaticResource DefaultColorPickerButtonStyle}"
+           TargetType="controls:ColorPickerButton" />
+
+    <!--  Copy of WinUI 2 style  -->
+    <Style x:Key="DefaultColorPickerButtonStyle"
+           TargetType="controls:ColorPickerButton">
+        <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="0,0,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <Setter Property="CornerRadius" Value="2" />
+        <!--  {ThemeResource ControlCornerRadius}  -->
+        <Setter Property="SelectedColor" Value="White" />
+        <Setter Property="FlyoutPresenterStyle" Value="{StaticResource ColorPickerButtonFlyoutPresenterStyle}" />
+        <Setter Property="Template" Value="{StaticResource ColorPickerButtonTemplate}" />
     </Style>
 
-    <contract7NotPresent:Style TargetType="controls:ColorPickerButton"
-                               BasedOn="{StaticResource BaseColorPickerButtonStyle}">
-        <!-- Currently not used -->
-    </contract7NotPresent:Style>
-
-    <contract7Present:Style TargetType="controls:ColorPickerButton"
-                            BasedOn="{StaticResource BaseColorPickerButtonStyle}">
-        <Setter Property="CornerRadius"
-                Value="2" />
-    </contract7Present:Style>
-
+    <ControlTemplate x:Key="ColorPickerButtonTemplate"
+                     TargetType="controls:ColorPickerButton">
+        <!--  Default Template Mostly Unchanged  -->
+        <Grid x:Name="RootGrid"
+              Background="{TemplateBinding Background}"
+              CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid x:Name="InnerGrid"
+                  Padding="{TemplateBinding Padding}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Border MinWidth="24"
+                        MinHeight="24"
+                        Margin="0,0,2,0"
+                        CornerRadius="2,0,0,2">
+                    <Border.Background> 
+                        <!--  TODO: Incorporate Transparency  -->
+                        <SolidColorBrush Color="{Binding SelectedColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                    </Border.Background>
+                    <ContentPresenter x:Name="ContentPresenter"
+                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      ContentTransitions="{TemplateBinding ContentTransitions}" />
+                </Border>
+
+                <TextBlock x:Name="ChevronTextBlock"
+                           Grid.Column="1"
+                           Margin="6,0,0,0"
+                           VerticalAlignment="Center"
+                           AutomationProperties.AccessibilityView="Raw"
+                           FontFamily="Segoe MDL2 Assets"
+                           FontSize="12"
+                           IsTextScaleFactorEnabled="False"
+                           Text="&#xE70D;" />
+            </Grid>
+
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <Storyboard>
+                            <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="PointerOver">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBackgroundPointerOver}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerGrid"
+                                                           Storyboard.TargetProperty="BorderBrush">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBorderBrushPointerOver}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonForegroundPointerOver}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="Pressed">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBackgroundPressed}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerGrid"
+                                                           Storyboard.TargetProperty="BorderBrush">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBorderBrushPressed}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonForegroundPressed}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
+                        </Storyboard>
+                    </VisualState>
+
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                           Storyboard.TargetProperty="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBackgroundDisabled}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerGrid"
+                                                           Storyboard.TargetProperty="BorderBrush">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonBorderBrushDisabled}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonForegroundDisabled}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronTextBlock"
+                                                           Storyboard.TargetProperty="Foreground">
+                                <DiscreteObjectKeyFrame KeyTime="0"
+                                                        Value="{ThemeResource ButtonForegroundDisabled}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+
+            </VisualStateManager.VisualStateGroups>
+        </Grid>
+    </ControlTemplate>
+
+    <Style x:Key="ColorPickerButtonFlyoutPresenterStyle"
+           TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="0" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index c7c9ede9f94..2b9d86e9c2f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -5,7 +5,7 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml" />
-        <!--<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPickerButton/ColorPickerButton.xaml" />-->
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />

From 9b561de7b845fd6fdd56f4922db046eac0df1da3 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:01:05 -0700
Subject: [PATCH 593/595] Add Transparency to the ColorPickerButton Preview

---
 .../ColorPicker/ColorChannel.cs               | 36 ++++++++
 .../ColorPicker/ColorPicker.cs                | 84 ++++---------------
 .../ColorPicker/ColorPickerButton.cs          | 26 +++++-
 .../ColorPicker/ColorPickerButton.xaml        |  9 +-
 ...ring.cs => ColorPickerRenderingHelpers.cs} | 29 +++++--
 .../ColorPicker/ColorRepresentation.cs        | 26 ++++++
 6 files changed, 131 insertions(+), 79 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
 rename Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/{ColorPicker.Rendering.cs => ColorPickerRenderingHelpers.cs} (95%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
new file mode 100644
index 00000000000..02d2711c0ca
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Defines a specific channel within a color representation.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    public enum ColorChannel
+    {
+        /// <summary>
+        /// Represents the alpha channel.
+        /// </summary>
+        Alpha,
+
+        /// <summary>
+        /// Represents the first color channel which is Red when RGB or Hue when HSV.
+        /// </summary>
+        Channel1,
+
+        /// <summary>
+        /// Represents the second color channel which is Green when RGB or Saturation when HSV.
+        /// </summary>
+        Channel2,
+
+        /// <summary>
+        /// Represents the third color channel which is Blue when RGB or Value when HSV.
+        /// </summary>
+        Channel3
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
index 6b25acdb40c..2065a620935 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
@@ -62,55 +62,13 @@ public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
         /// </summary>
         private const int ColorUpdateInterval = 30; // Milliseconds
 
-        /// <summary>
-        /// Defines how colors are represented.
-        /// </summary>
-        private enum ColorRepresentation
-        {
-            /// <summary>
-            /// Color is represented by hue, saturation, value and alpha channels.
-            /// </summary>
-            Hsva,
-
-            /// <summary>
-            /// Color is represented by red, green, blue and alpha channels.
-            /// </summary>
-            Rgba
-        }
-
-        /// <summary>
-        /// Defines a specific channel within a color representation.
-        /// </summary>
-        private enum ColorChannel
-        {
-            /// <summary>
-            /// Represents the alpha channel.
-            /// </summary>
-            Alpha,
-
-            /// <summary>
-            /// Represents the first color channel which is Red when RGB or Hue when HSV.
-            /// </summary>
-            Channel1,
-
-            /// <summary>
-            /// Represents the second color channel which is Green when RGB or Saturation when HSV.
-            /// </summary>
-            Channel2,
-
-            /// <summary>
-            /// Represents the third color channel which is Blue when RGB or Value when HSV.
-            /// </summary>
-            Channel3
-        }
-
         private long tokenColor;
         private long tokenCustomPalette;
         private long tokenIsColorPaletteVisible;
 
         private Dictionary<Slider, Size> cachedSliderSizes      = new Dictionary<Slider, Size>();
         private bool                     callbacksConnected     = false;
-        private Color                    checkerBackgroundColor = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
+        internal Color                    checkerBackgroundColor = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
         private bool                     eventsConnected        = false;
         private bool                     isInitialized          = false;
 
@@ -215,6 +173,8 @@ private static bool IsColorEmpty(Color color)
         /// </summary>
         protected override void OnApplyTemplate()
         {
+            // TODO: We need to disconnect old events first.
+
             this.ColorSpectrumControl              = this.GetTemplateChild<ColorSpectrum>(nameof(ColorSpectrumControl));
             this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<Slider>(nameof(ColorSpectrumAlphaSlider));
             this.ColorSpectrumThirdDimensionSlider = this.GetTemplateChild<Slider>(nameof(ColorSpectrumThirdDimensionSlider));
@@ -256,7 +216,7 @@ protected override void OnApplyTemplate()
             this.UpdateVisualState(false);
             this.isInitialized = true;
             this.SetActiveColorRepresentation(ColorRepresentation.Rgba);
-            this.UpdateColorControlValues();
+            this.UpdateColorControlValues(); // TODO: This will also connect events after, can we optimize vs. doing it twice with the ConnectEvents above?
         }
 
         /// <summary>
@@ -1101,7 +1061,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
 
             if (object.ReferenceEquals(slider, this.Channel1Slider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Horizontal,
@@ -1112,7 +1072,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
             }
             else if (object.ReferenceEquals(slider, this.Channel2Slider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Horizontal,
@@ -1123,7 +1083,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
             }
             else if (object.ReferenceEquals(slider, this.Channel3Slider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Horizontal,
@@ -1134,7 +1094,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
             }
             else if (object.ReferenceEquals(slider, this.AlphaChannelSlider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Horizontal,
@@ -1145,7 +1105,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
             }
             else if (object.ReferenceEquals(slider, this.ColorSpectrumAlphaSlider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Vertical,
@@ -1156,7 +1116,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
             }
             else if (object.ReferenceEquals(slider, this.ColorSpectrumThirdDimensionSlider))
             {
-                bitmap = await this.CreateChannelBitmapAsync(
+                bitmap = await ColorPickerRenderingHelpers.CreateChannelBitmapAsync(
                     width,
                     height,
                     Orientation.Vertical,
@@ -1168,7 +1128,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
 
             if (bitmap != null)
             {
-                slider.Background = await this.BitmapToBrushAsync(bitmap, width, height);
+                slider.Background = await ColorPickerRenderingHelpers.BitmapToBrushAsync(bitmap, width, height);
             }
 
             return;
@@ -1331,25 +1291,9 @@ private void ChannelSlider_Loaded(object sender, RoutedEventArgs e)
         /// </summary>
         private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventArgs e)
         {
-            Border border = sender as Border;
-
-            if (border != null)
-            {
-                int width = Convert.ToInt32(border.ActualWidth);
-                int height = Convert.ToInt32(border.ActualHeight);
-
-                var bitmap = await this.CreateCheckeredBitmapAsync(
-                    width,
-                    height,
-                    this.checkerBackgroundColor);
-
-                if (bitmap != null)
-                {
-                    border.Background = await this.BitmapToBrushAsync(bitmap, width, height);
-                }
-            }
-
-            return;
+            await ColorPickerRenderingHelpers.UpdateBorderBackgroundWithCheckerAsync(
+                sender as Border,
+                checkerBackgroundColor);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
index cc70b8fcb83..3843057b866 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// A <see cref="DropDownButton"/> which displays a color as its <c>Content</c> and it's <c>Flyout</c> is a <see cref="ColorPicker"/>.
     /// </summary>
-    [TemplatePart(Name = nameof(ColorPicker), Type = typeof(ColorPicker))]
+    [TemplatePart(Name = nameof(CheckeredBackgroundBorder), Type = typeof(Border))]
     public class ColorPickerButton : DropDownButton
     {
         /// <summary>
@@ -81,6 +81,11 @@ public Color SelectedColor
         public static readonly DependencyProperty SelectedColorProperty =
             DependencyProperty.Register(nameof(SelectedColor), typeof(Color), typeof(ColorPickerButton), new PropertyMetadata(null));
 
+        #pragma warning disable SA1306 // Field names should begin with lower-case letter
+        //// Template Parts
+        private Border CheckeredBackgroundBorder;
+        #pragma warning restore SA1306 // Field names should begin with lower-case letter
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ColorPickerButton"/> class.
         /// </summary>
@@ -125,6 +130,25 @@ protected override void OnApplyTemplate()
                     Content = ColorPicker
                 };
             }
+
+            if (CheckeredBackgroundBorder != null)
+            {
+                CheckeredBackgroundBorder.Loaded -= this.CheckeredBackgroundBorder_Loaded;
+            }
+
+            CheckeredBackgroundBorder = GetTemplateChild(nameof(CheckeredBackgroundBorder)) as Border;
+
+            if (CheckeredBackgroundBorder != null)
+            {
+                CheckeredBackgroundBorder.Loaded += this.CheckeredBackgroundBorder_Loaded;
+            }
+        }
+
+        private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventArgs e)
+        {
+            await ColorPickerRenderingHelpers.UpdateBorderBackgroundWithCheckerAsync(
+                sender as Border,
+                ColorPicker.checkerBackgroundColor); // TODO: Check initialization
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
index a406e53cc9c..566115dfb52 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
@@ -44,12 +44,15 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
-                <Border MinWidth="24"
+                <!--  Modification to Template here to provide Border within the DropDown, Checker/Color set in Codebehind as generated image  -->
+                <Border x:Name="CheckeredBackgroundBorder"
+                        MinWidth="24"
                         MinHeight="24"
                         Margin="0,0,2,0"
+                        CornerRadius="2,0,0,2" />
+                <Border x:Name="PreviewBorder"
                         CornerRadius="2,0,0,2">
-                    <Border.Background> 
-                        <!--  TODO: Incorporate Transparency  -->
+                    <Border.Background>
                         <SolidColorBrush Color="{Binding SelectedColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
                     </Border.Background>
                     <ContentPresenter x:Name="ContentPresenter"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
index 271c9179e0f..cb50eaf4d15 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Rendering.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Contains the rendering methods used within <see cref="ColorPicker"/>.
     /// </summary>
-    public partial class ColorPicker
+    internal class ColorPickerRenderingHelpers
     {
         /// <summary>
         /// Generates a new bitmap of the specified size by changing a specific color channel.
@@ -31,7 +31,7 @@ public partial class ColorPicker
         /// <param name="baseRgbColor">The base RGB color used for channels not being changed.</param>
         /// <param name="checkerColor">The color of the checker background square.</param>
         /// <returns>A new bitmap representing a gradient of color channel values.</returns>
-        private async Task<byte[]> CreateChannelBitmapAsync(
+        public static async Task<byte[]> CreateChannelBitmapAsync(
             int width,
             int height,
             Orientation orientation,
@@ -75,7 +75,7 @@ private async Task<byte[]> CreateChannelBitmapAsync(
                 // Create a checkered background
                 if (checkerColor != null)
                 {
-                    bgraCheckeredPixelData = await this.CreateCheckeredBitmapAsync(
+                    bgraCheckeredPixelData = await CreateCheckeredBitmapAsync(
                         width,
                         height,
                         checkerColor.Value);
@@ -358,7 +358,7 @@ Color GetColor(double channelValue)
         /// <param name="height">The pixel height (Y, vertical) of the checkered bitmap.</param>
         /// <param name="checkerColor">The color of the checker square.</param>
         /// <returns>A new checkered bitmap of the specified size.</returns>
-        private async Task<byte[]> CreateCheckeredBitmapAsync(
+        public static async Task<byte[]> CreateCheckeredBitmapAsync(
             int width,
             int height,
             Color checkerColor)
@@ -426,7 +426,7 @@ private async Task<byte[]> CreateCheckeredBitmapAsync(
         /// <param name="width">The pixel width of the bitmap.</param>
         /// <param name="height">The pixel height of the bitmap.</param>
         /// <returns>A new ImageBrush.</returns>
-        private async Task<ImageBrush> BitmapToBrushAsync(
+        public static async Task<ImageBrush> BitmapToBrushAsync(
             byte[] bitmap,
             int width,
             int height)
@@ -445,5 +445,24 @@ private async Task<ImageBrush> BitmapToBrushAsync(
 
             return brush;
         }
+
+        public static async Task UpdateBorderBackgroundWithCheckerAsync(Border border, Color color)
+        {
+            if (border != null)
+            {
+                int width = Convert.ToInt32(border.ActualWidth);
+                int height = Convert.ToInt32(border.ActualHeight);
+
+                var bitmap = await ColorPickerRenderingHelpers.CreateCheckeredBitmapAsync(
+                    width,
+                    height,
+                    color);
+
+                if (bitmap != null)
+                {
+                    border.Background = await ColorPickerRenderingHelpers.BitmapToBrushAsync(bitmap, width, height);
+                }
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
new file mode 100644
index 00000000000..9011a1b0d8a
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Defines how colors are represented.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    public enum ColorRepresentation
+    {
+        /// <summary>
+        /// Color is represented by hue, saturation, value and alpha channels.
+        /// </summary>
+        Hsva,
+
+        /// <summary>
+        /// Color is represented by red, green, blue and alpha channels.
+        /// </summary>
+        Rgba
+    }
+}

From 5767df45fe3377ca08ee3d5c0d045dcdfde568cb Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:10:00 -0700
Subject: [PATCH 594/595] Fix ColorPickerButton Event Registration

---
 .../ColorPicker/ColorPickerButton.cs                | 13 +++++++------
 .../ColorPicker/ColorPickerRenderingHelpers.cs      |  6 ++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
index 3843057b866..efdd02bebec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
@@ -99,7 +99,7 @@ protected override void OnApplyTemplate()
         {
             if (ColorPicker != null)
             {
-                // TODO: Unregister
+                ColorPicker.ColorChanged -= ColorPicker_ColorChanged;
             }
 
             base.OnApplyTemplate();
@@ -114,11 +114,7 @@ protected override void OnApplyTemplate()
             }
 
             ColorPicker.Color = SelectedColor;
-
-            this.ColorPicker.ColorChanged += (sender, args) =>
-            {
-                SelectedColor = args.NewColor;
-            };
+            ColorPicker.ColorChanged += ColorPicker_ColorChanged;
 
             if (Flyout == null)
             {
@@ -144,6 +140,11 @@ protected override void OnApplyTemplate()
             }
         }
 
+        private void ColorPicker_ColorChanged(Windows.UI.Xaml.Controls.ColorPicker sender, ColorChangedEventArgs args)
+        {
+            SelectedColor = args.NewColor;
+        }
+
         private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventArgs e)
         {
             await ColorPickerRenderingHelpers.UpdateBorderBackgroundWithCheckerAsync(
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
index cb50eaf4d15..deaf9a7448b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
@@ -446,6 +446,12 @@ public static async Task<ImageBrush> BitmapToBrushAsync(
             return brush;
         }
 
+        /// <summary>
+        /// Centralizes code to create a checker brush for a <see cref="Border"/>.
+        /// </summary>
+        /// <param name="border">Border which will have its Background modified.</param>
+        /// <param name="color">Color to use for transparent checkerboard.</param>
+        /// <returns>Task</returns>
         public static async Task UpdateBorderBackgroundWithCheckerAsync(Border border, Color color)
         {
             if (border != null)

From 288a0ccafc0e069bc1429fef2fd9efca29ec61b0 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:15:31 -0800
Subject: [PATCH 595/595] Fix Style-Cop Issues

---
 .../ColorPicker/ColorChannel.cs               |  6 +++++-
 .../ColorPicker/ColorPicker.cs                | 21 ++++++++++---------
 .../ColorPicker/ColorPickerButton.cs          |  4 +++-
 .../ColorPicker/ColorPickerSlider.cs          |  4 +++-
 .../ColorPicker/ColorRepresentation.cs        |  6 +++++-
 .../SwitchPresenter/CaseCollection.cs         |  3 +++
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
index 02d2711c0ca..77df7b01c24 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.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.ComponentModel;
 using System.Linq;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
index 2065a620935..d8450eff1b5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
@@ -55,6 +55,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Only template parts start with a capital letter. This differentiates them from other fields.")]
     public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
     {
+        internal Color CheckerBackgroundColor { get; set; } = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
+
         /// <summary>
         /// The period that scheduled color updates will be applied.
         /// This is only used when updating colors using the ScheduleColorUpdate() method.
@@ -68,7 +70,6 @@ public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
 
         private Dictionary<Slider, Size> cachedSliderSizes      = new Dictionary<Slider, Size>();
         private bool                     callbacksConnected     = false;
-        internal Color                    checkerBackgroundColor = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
         private bool                     eventsConnected        = false;
         private bool                     isInitialized          = false;
 
@@ -132,7 +133,7 @@ public ColorPicker()
 
             // Checkered background color is found only one time for performance
             // This may need to change in the future if theme changes should be supported
-            this.checkerBackgroundColor = (Color)Application.Current.Resources["SystemListLowColor"];
+            this.CheckerBackgroundColor = (Color)Application.Current.Resources["SystemListLowColor"];
 
             this.ConnectCallbacks(true);
             this.SetDefaultPalette();
@@ -173,7 +174,7 @@ private static bool IsColorEmpty(Color color)
         /// </summary>
         protected override void OnApplyTemplate()
         {
-            // TODO: We need to disconnect old events first.
+            //// TODO: We need to disconnect old events first.
 
             this.ColorSpectrumControl              = this.GetTemplateChild<ColorSpectrum>(nameof(ColorSpectrumControl));
             this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<Slider>(nameof(ColorSpectrumAlphaSlider));
@@ -1068,7 +1069,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     this.GetActiveColorRepresentation(),
                     ColorChannel.Channel1,
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
             else if (object.ReferenceEquals(slider, this.Channel2Slider))
             {
@@ -1079,7 +1080,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     this.GetActiveColorRepresentation(),
                     ColorChannel.Channel2,
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
             else if (object.ReferenceEquals(slider, this.Channel3Slider))
             {
@@ -1090,7 +1091,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     this.GetActiveColorRepresentation(),
                     ColorChannel.Channel3,
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
             else if (object.ReferenceEquals(slider, this.AlphaChannelSlider))
             {
@@ -1101,7 +1102,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     this.GetActiveColorRepresentation(),
                     ColorChannel.Alpha,
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
             else if (object.ReferenceEquals(slider, this.ColorSpectrumAlphaSlider))
             {
@@ -1112,7 +1113,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     this.GetActiveColorRepresentation(),
                     ColorChannel.Alpha,
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
             else if (object.ReferenceEquals(slider, this.ColorSpectrumThirdDimensionSlider))
             {
@@ -1123,7 +1124,7 @@ private async void UpdateChannelSliderBackground(Slider slider)
                     ColorRepresentation.Hsva, // Always HSV
                     this.GetActiveColorSpectrumThirdDimension(),
                     baseColor,
-                    this.checkerBackgroundColor);
+                    this.CheckerBackgroundColor);
             }
 
             if (bitmap != null)
@@ -1293,7 +1294,7 @@ private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventAr
         {
             await ColorPickerRenderingHelpers.UpdateBorderBackgroundWithCheckerAsync(
                 sender as Border,
-                checkerBackgroundColor);
+                CheckerBackgroundColor);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
index efdd02bebec..eb6b25f228b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
@@ -66,9 +66,11 @@ public Style FlyoutPresenterStyle
         /// </summary>
         public static readonly DependencyProperty FlyoutPresenterStyleProperty = DependencyProperty.Register("FlyoutPresenterStyle", typeof(Style), typeof(ColorPickerButton), new PropertyMetadata(default(Style)));
 
+        #pragma warning disable CS0419 // Ambiguous reference in cref attribute
         /// <summary>
         /// Gets or sets the selected <see cref="Windows.UI.Color"/> the user has picked from the <see cref="ColorPicker"/>.
         /// </summary>
+        #pragma warning restore CS0419 // Ambiguous reference in cref attribute
         public Color SelectedColor
         {
             get { return (Color)GetValue(SelectedColorProperty); }
@@ -149,7 +151,7 @@ private async void CheckeredBackgroundBorder_Loaded(object sender, RoutedEventAr
         {
             await ColorPickerRenderingHelpers.UpdateBorderBackgroundWithCheckerAsync(
                 sender as Border,
-                ColorPicker.checkerBackgroundColor); // TODO: Check initialization
+                ColorPicker.CheckerBackgroundColor); // TODO: Check initialization
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
index a6cb9fb13ee..f5aaf88c23b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
@@ -28,7 +28,9 @@ public class ColorPickerSlider : Slider
         private Size oldSize;
         private Size measuredSize;
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorPickerSlider"/> class.
+        /// </summary>
         public ColorPickerSlider()
             : base()
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
index 9011a1b0d8a..39823709620 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.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.ComponentModel;
 using System.Linq;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
index 26051720ad7..d1f3ee96187 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
@@ -36,6 +36,9 @@ private void ValueChanged(object sender, EventArgs e)
             CaseCollectionChanged?.Invoke(this, EventArgs.Empty);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CaseCollection"/> class.
+        /// </summary>
         public CaseCollection()
         {
         }